UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Alexander Beregalov 2009-03-29 19:29:18 +04:00 committed by Greg Kroah-Hartman
parent 4d562f74ec
commit d39efb24ea
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/staging/rt3070/rt_main_dev.c
View File

@ -436,7 +436,6 @@ static int rt28xx_init(IN struct net_device *net_dev)
// OID_SET_HT_PHYMODE SetHT; // OID_SET_HT_PHYMODE SetHT;
// WPDMA_GLO_CFG_STRUC GloCfg; // WPDMA_GLO_CFG_STRUC GloCfg;
UINT32 MacCsr0 = 0; UINT32 MacCsr0 = 0;
UINT32 MacValue = 0;
#ifdef RT2870 #ifdef RT2870
#ifdef INF_AMAZON_SE #ifdef INF_AMAZON_SE
@ -849,6 +848,20 @@ err:
return (-1); return (-1);
} /* End of rt28xx_open */ } /* End of rt28xx_open */
static const struct net_device_ops rt3070_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 */ /* Must not be called for mdev and apdev */
static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER pAd) static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER pAd)
@ -860,12 +873,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
//ether_setup(dev); //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->set_multicast_list = ieee80211_set_multicast_list;
// dev->change_mtu = ieee80211_change_mtu; // dev->change_mtu = ieee80211_change_mtu;
#ifdef CONFIG_STA_SUPPORT #ifdef CONFIG_STA_SUPPORT
@ -889,16 +896,10 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
#if WIRELESS_EXT < 21 #if WIRELESS_EXT < 21
dev->get_wireless_stats = rt28xx_get_wireless_stats; dev->get_wireless_stats = rt28xx_get_wireless_stats;
#endif #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->uninit = ieee80211_if_reinit;
// dev->destructor = ieee80211_if_free; // dev->destructor = ieee80211_if_free;
dev->priv_flags = INT_MAIN; dev->priv_flags = INT_MAIN;
dev->do_ioctl = rt28xx_ioctl; dev->netdev_ops = &rt3070_netdev_ops;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
dev->validate_addr = NULL;
#endif
// find available device name // find available device name
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
{ {