Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d562f74 authored by Alexander Beregalov's avatar Alexander Beregalov Committed by Greg Kroah-Hartman
Browse files

Staging: rt2870: convert to netdev_ops 



Signed-off-by: default avatarAlexander Beregalov <a.beregalov@gmail.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ca7d2dbb

drivers/staging/rt2870/rt_main_dev.c

+15 −13
Original line number Original line Diff line number Diff line
@@ -855,6 +855,20 @@ err: 
	return (-1);

	return (-1);

} /* End of rt28xx_open */

} /* 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 */

/* 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)
@@ -866,12 +880,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
@@ -895,16 +903,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 = &rt2870_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++)

	{

	{