+ .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,
+ .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,
+};
+++ /dev/null
---- 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,
+++ /dev/null
---- 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,
- };