atheros: clean up the patches some more

SVN-Revision: 31626
This commit is contained in:
Felix Fietkau 2012-05-06 17:15:00 +00:00
parent 9b20187ad5
commit 7799c88aa4
4 changed files with 2 additions and 24 deletions

View File

@ -207,7 +207,7 @@
+ .ndo_open = ar231x_open, + .ndo_open = ar231x_open,
+ .ndo_stop = ar231x_close, + .ndo_stop = ar231x_close,
+ .ndo_start_xmit = ar231x_start_xmit, + .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_do_ioctl = ar231x_ioctl,
+ .ndo_change_mtu = eth_change_mtu, + .ndo_change_mtu = eth_change_mtu,
+ .ndo_validate_addr = eth_validate_addr, + .ndo_validate_addr = eth_validate_addr,

View File

@ -135,7 +135,7 @@
+ .owner = THIS_MODULE, + .owner = THIS_MODULE,
+ .llseek = no_llseek, + .llseek = no_llseek,
+ .write = ar2315_wdt_write, + .write = ar2315_wdt_write,
+ .ioctl = ar2315_wdt_ioctl, + .unlocked_ioctl = ar2315_wdt_ioctl,
+ .open = ar2315_wdt_open, + .open = ar2315_wdt_open,
+ .release = ar2315_wdt_release, + .release = ar2315_wdt_release,
+}; +};

View File

@ -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,

View File

@ -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,
};