Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Staging: rt3070: convert to netdev_ops

Also remove unused variable.

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>

authored by

Alexander Beregalov and committed by
Greg Kroah-Hartman
d39efb24 4d562f74

+15 -14
+15 -14
drivers/staging/rt3070/rt_main_dev.c
··· 436 436 // OID_SET_HT_PHYMODE SetHT; 437 437 // WPDMA_GLO_CFG_STRUC GloCfg; 438 438 UINT32 MacCsr0 = 0; 439 - UINT32 MacValue = 0; 440 439 441 440 #ifdef RT2870 442 441 #ifdef INF_AMAZON_SE ··· 848 849 return (-1); 849 850 } /* End of rt28xx_open */ 850 851 852 + static const struct net_device_ops rt3070_netdev_ops = { 853 + .ndo_open = MainVirtualIF_open, 854 + .ndo_stop = MainVirtualIF_close, 855 + .ndo_do_ioctl = rt28xx_ioctl, 856 + .ndo_get_stats = RT28xx_get_ether_stats, 857 + .ndo_validate_addr = NULL, 858 + .ndo_set_mac_address = eth_mac_addr, 859 + .ndo_change_mtu = eth_change_mtu, 860 + #ifdef IKANOS_VX_1X0 861 + .ndo_start_xmit = IKANOS_DataFramesTx, 862 + #else 863 + .ndo_start_xmit = rt28xx_send_packets, 864 + #endif 865 + }; 851 866 852 867 /* Must not be called for mdev and apdev */ 853 868 static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER pAd) ··· 873 860 874 861 875 862 //ether_setup(dev); 876 - dev->hard_start_xmit = rt28xx_send_packets; 877 - 878 - #ifdef IKANOS_VX_1X0 879 - dev->hard_start_xmit = IKANOS_DataFramesTx; 880 - #endif // IKANOS_VX_1X0 // 881 - 882 863 // dev->set_multicast_list = ieee80211_set_multicast_list; 883 864 // dev->change_mtu = ieee80211_change_mtu; 884 865 #ifdef CONFIG_STA_SUPPORT ··· 896 889 #if WIRELESS_EXT < 21 897 890 dev->get_wireless_stats = rt28xx_get_wireless_stats; 898 891 #endif 899 - dev->get_stats = RT28xx_get_ether_stats; 900 - dev->open = MainVirtualIF_open; //rt28xx_open; 901 - dev->stop = MainVirtualIF_close; //rt28xx_close; 902 892 // dev->uninit = ieee80211_if_reinit; 903 893 // dev->destructor = ieee80211_if_free; 904 894 dev->priv_flags = INT_MAIN; 905 - dev->do_ioctl = rt28xx_ioctl; 906 - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) 907 - dev->validate_addr = NULL; 908 - #endif 895 + dev->netdev_ops = &rt3070_netdev_ops; 909 896 // find available device name 910 897 for (i = 0; i < 8; i++) 911 898 {