atheros: clean up the patches some more

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31626 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 725d579..d3060da 100644 (file)
--- 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 ba33fc5..206d274 100644 (file)
--- 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 (file)
index 15dcfe9..0000000
--- 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 (file)
index bad20e3..0000000
--- 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,
- };