aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-05-06 17:15:00 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-05-06 17:15:00 +0000
commit7799c88aa45b01e9456ed93d15c7a4a2b14136c2 (patch)
tree6e4c213a4495d0868db58a65cd26b0cfa7d8ec88 /target/linux
parent9b20187ad5a2055bcabb3ee905afade92aaa3be2 (diff)
downloadupstream-7799c88aa45b01e9456ed93d15c7a4a2b14136c2.tar.gz
upstream-7799c88aa45b01e9456ed93d15c7a4a2b14136c2.tar.bz2
upstream-7799c88aa45b01e9456ed93d15c7a4a2b14136c2.zip
atheros: clean up the patches some more
SVN-Revision: 31626
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/atheros/patches-3.3/110-ar2313_ethernet.patch2
-rw-r--r--target/linux/atheros/patches-3.3/130-watchdog.patch2
-rw-r--r--target/linux/atheros/patches-3.3/201-multicast_list.patch11
-rw-r--r--target/linux/atheros/patches-3.3/209_watchdog_fix.patch11
4 files changed, 2 insertions, 24 deletions
diff --git a/target/linux/atheros/patches-3.3/110-ar2313_ethernet.patch b/target/linux/atheros/patches-3.3/110-ar2313_ethernet.patch
index 725d579a3d..d3060da447 100644
--- a/target/linux/atheros/patches-3.3/110-ar2313_ethernet.patch
+++ b/target/linux/atheros/patches-3.3/110-ar2313_ethernet.patch
@@ -207,7 +207,7 @@
+ .ndo_open = ar231x_open,
+ .ndo_stop = ar231x_close,
+ .ndo_start_xmit = ar231x_start_xmit,
-+ .ndo_set_multicast_list = ar231x_multicast_list,
++ .ndo_set_rx_mode = ar231x_multicast_list,
+ .ndo_do_ioctl = ar231x_ioctl,
+ .ndo_change_mtu = eth_change_mtu,
+ .ndo_validate_addr = eth_validate_addr,
diff --git a/target/linux/atheros/patches-3.3/130-watchdog.patch b/target/linux/atheros/patches-3.3/130-watchdog.patch
index ba33fc59f7..206d274758 100644
--- a/target/linux/atheros/patches-3.3/130-watchdog.patch
+++ b/target/linux/atheros/patches-3.3/130-watchdog.patch
@@ -135,7 +135,7 @@
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .write = ar2315_wdt_write,
-+ .ioctl = ar2315_wdt_ioctl,
++ .unlocked_ioctl = ar2315_wdt_ioctl,
+ .open = ar2315_wdt_open,
+ .release = ar2315_wdt_release,
+};
diff --git a/target/linux/atheros/patches-3.3/201-multicast_list.patch b/target/linux/atheros/patches-3.3/201-multicast_list.patch
deleted file mode 100644
index 15dcfe9ea0..0000000000
--- a/target/linux/atheros/patches-3.3/201-multicast_list.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/net/ethernet/ar231x/ar231x.c
-+++ b/drivers/net/ethernet/ar231x/ar231x.c
-@@ -172,7 +172,7 @@ static const struct net_device_ops ar231
- .ndo_open = ar231x_open,
- .ndo_stop = ar231x_close,
- .ndo_start_xmit = ar231x_start_xmit,
-- .ndo_set_multicast_list = ar231x_multicast_list,
-+ .ndo_set_rx_mode = ar231x_multicast_list,
- .ndo_do_ioctl = ar231x_ioctl,
- .ndo_change_mtu = eth_change_mtu,
- .ndo_validate_addr = eth_validate_addr,
diff --git a/target/linux/atheros/patches-3.3/209_watchdog_fix.patch b/target/linux/atheros/patches-3.3/209_watchdog_fix.patch
deleted file mode 100644
index bad20e387a..0000000000
--- a/target/linux/atheros/patches-3.3/209_watchdog_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/watchdog/ar2315-wtd.c
-+++ b/drivers/watchdog/ar2315-wtd.c
-@@ -132,7 +132,7 @@ static struct file_operations ar2315_wdt
- .owner = THIS_MODULE,
- .llseek = no_llseek,
- .write = ar2315_wdt_write,
-- .ioctl = ar2315_wdt_ioctl,
-+ .unlocked_ioctl = ar2315_wdt_ioctl,
- .open = ar2315_wdt_open,
- .release = ar2315_wdt_release,
- };