Staging: rt2870: convert to netdev_ops

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 15 insertions, 13 deletions

diff --git a/drivers/staging/rt2870/rt_main_dev.c b/drivers/staging/rt2870/rt_main_dev.c
index 313ecea0bfa8..48ad41136d0f 100644
--- a/drivers/staging/rt2870/rt_main_dev.c
+++ b/drivers/staging/rt2870/rt_main_dev.c
@@ -855,6 +855,20 @@ err:
         return (-1);
 } /* End of rt28xx_open */
 
+static const struct net_device_ops rt2870_netdev_ops = {
+        .ndo_open               = MainVirtualIF_open,
+        .ndo_stop               = MainVirtualIF_close,
+        .ndo_do_ioctl           = rt28xx_ioctl,
+        .ndo_get_stats          = RT28xx_get_ether_stats,
+        .ndo_validate_addr      = NULL,
+        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_change_mtu         = eth_change_mtu,
+#ifdef IKANOS_VX_1X0
+        .ndo_start_xmit         = IKANOS_DataFramesTx,
+#else
+        .ndo_start_xmit         = rt28xx_send_packets,
+#endif
+};
 
 /* Must not be called for mdev and apdev */
 static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER pAd)
@@ -866,12 +880,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
 
 
         //ether_setup(dev);
-        dev->hard_start_xmit = rt28xx_send_packets;
-
-#ifdef IKANOS_VX_1X0
-        dev->hard_start_xmit = IKANOS_DataFramesTx;
-#endif // IKANOS_VX_1X0 //
-
 //      dev->set_multicast_list = ieee80211_set_multicast_list;
 //      dev->change_mtu = ieee80211_change_mtu;
 #ifdef CONFIG_STA_SUPPORT
@@ -895,16 +903,10 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
 #if WIRELESS_EXT < 21
                 dev->get_wireless_stats = rt28xx_get_wireless_stats;
 #endif
-        dev->get_stats = RT28xx_get_ether_stats;
-        dev->open = MainVirtualIF_open; //rt28xx_open;
-        dev->stop = MainVirtualIF_close; //rt28xx_close;
 //      dev->uninit = ieee80211_if_reinit;
 //      dev->destructor = ieee80211_if_free;
         dev->priv_flags = INT_MAIN;
-        dev->do_ioctl = rt28xx_ioctl;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
-    dev->validate_addr = NULL;
-#endif
+        dev->netdev_ops = &rt2870_netdev_ops;
         // find available device name
         for (i = 0; i < 8; i++)
         {