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

Commit f02abf10 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

libertas: convert to net_device_ops 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bbfc6b78

drivers/net/wireless/libertas/main.c

+29 −16
Original line number Original line Diff line number Diff line
@@ -1148,6 +1148,17 @@ static void lbs_free_adapter(struct lbs_private *priv) 
	lbs_deb_leave(LBS_DEB_MAIN);

	lbs_deb_leave(LBS_DEB_MAIN);

}

}





static const struct net_device_ops lbs_netdev_ops = {

	.ndo_open 		= lbs_dev_open,

	.ndo_stop		= lbs_eth_stop,

	.ndo_start_xmit		= lbs_hard_start_xmit,

	.ndo_set_mac_address	= lbs_set_mac_address,

	.ndo_tx_timeout 	= lbs_tx_timeout,

	.ndo_set_multicast_list = lbs_set_multicast_list,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_validate_addr	= eth_validate_addr,

};



/**

/**

 * @brief This function adds the card. it will probe the

 * @brief This function adds the card. it will probe the

 * card, allocate the lbs_priv and initialize the device.

 * card, allocate the lbs_priv and initialize the device.
@@ -1182,19 +1193,13 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev) 
	priv->infra_open = 0;

	priv->infra_open = 0;





	/* Setup the OS Interface to our functions */

	/* Setup the OS Interface to our functions */

	dev->open = lbs_dev_open;

 	dev->netdev_ops = &lbs_netdev_ops;

	dev->hard_start_xmit = lbs_hard_start_xmit;

	dev->stop = lbs_eth_stop;

	dev->set_mac_address = lbs_set_mac_address;

	dev->tx_timeout = lbs_tx_timeout;



	dev->watchdog_timeo = 5 * HZ;

	dev->watchdog_timeo = 5 * HZ;

	dev->ethtool_ops = &lbs_ethtool_ops;

	dev->ethtool_ops = &lbs_ethtool_ops;

#ifdef	WIRELESS_EXT

#ifdef	WIRELESS_EXT

	dev->wireless_handlers = (struct iw_handler_def *)&lbs_handler_def;

	dev->wireless_handlers = &lbs_handler_def;

#endif

#endif

	dev->flags |= IFF_BROADCAST | IFF_MULTICAST;

	dev->flags |= IFF_BROADCAST | IFF_MULTICAST;

	dev->set_multicast_list = lbs_set_multicast_list;





	SET_NETDEV_DEV(dev, dmdev);

	SET_NETDEV_DEV(dev, dmdev);
@@ -1404,6 +1409,14 @@ void lbs_stop_card(struct lbs_private *priv) 
EXPORT_SYMBOL_GPL(lbs_stop_card);

EXPORT_SYMBOL_GPL(lbs_stop_card);









static const struct net_device_ops mesh_netdev_ops = {

	.ndo_open		= lbs_dev_open,

	.ndo_stop 		= lbs_mesh_stop,

	.ndo_start_xmit		= lbs_hard_start_xmit,

	.ndo_set_mac_address	= lbs_set_mac_address,

	.ndo_set_multicast_list = lbs_set_multicast_list,

};



/**

/**

 * @brief This function adds mshX interface

 * @brief This function adds mshX interface

 *

 *
@@ -1426,10 +1439,7 @@ static int lbs_add_mesh(struct lbs_private *priv) 
	mesh_dev->ml_priv = priv;

	mesh_dev->ml_priv = priv;

	priv->mesh_dev = mesh_dev;

	priv->mesh_dev = mesh_dev;





	mesh_dev->open = lbs_dev_open;

	mesh_dev->netdev_ops = &mesh_netdev_ops;

	mesh_dev->hard_start_xmit = lbs_hard_start_xmit;

	mesh_dev->stop = lbs_mesh_stop;

	mesh_dev->set_mac_address = lbs_set_mac_address;

	mesh_dev->ethtool_ops = &lbs_ethtool_ops;

	mesh_dev->ethtool_ops = &lbs_ethtool_ops;

	memcpy(mesh_dev->dev_addr, priv->dev->dev_addr,

	memcpy(mesh_dev->dev_addr, priv->dev->dev_addr,

			sizeof(priv->dev->dev_addr));

			sizeof(priv->dev->dev_addr));
@@ -1440,7 +1450,6 @@ static int lbs_add_mesh(struct lbs_private *priv) 
	mesh_dev->wireless_handlers = (struct iw_handler_def *)&mesh_handler_def;

	mesh_dev->wireless_handlers = (struct iw_handler_def *)&mesh_handler_def;

#endif

#endif

	mesh_dev->flags |= IFF_BROADCAST | IFF_MULTICAST;

	mesh_dev->flags |= IFF_BROADCAST | IFF_MULTICAST;

	mesh_dev->set_multicast_list = lbs_set_multicast_list;

	/* Register virtual mesh interface */

	/* Register virtual mesh interface */

	ret = register_netdev(mesh_dev);

	ret = register_netdev(mesh_dev);

	if (ret) {

	if (ret) {
@@ -1645,6 +1654,12 @@ static void lbs_remove_rtap(struct lbs_private *priv) 
	lbs_deb_leave(LBS_DEB_MAIN);

	lbs_deb_leave(LBS_DEB_MAIN);

}

}





static const struct net_device_ops rtap_netdev_ops = {

	.ndo_open = lbs_rtap_open,

	.ndo_stop = lbs_rtap_stop,

	.ndo_start_xmit = lbs_rtap_hard_start_xmit,

};



static int lbs_add_rtap(struct lbs_private *priv)

static int lbs_add_rtap(struct lbs_private *priv)

{

{

	int ret = 0;

	int ret = 0;
@@ -1664,9 +1679,7 @@ static int lbs_add_rtap(struct lbs_private *priv) 




	memcpy(rtap_dev->dev_addr, priv->current_addr, ETH_ALEN);

	memcpy(rtap_dev->dev_addr, priv->current_addr, ETH_ALEN);

	rtap_dev->type = ARPHRD_IEEE80211_RADIOTAP;

	rtap_dev->type = ARPHRD_IEEE80211_RADIOTAP;

	rtap_dev->open = lbs_rtap_open;

	rtap_dev->netdev_ops = &rtap_netdev_ops;

	rtap_dev->stop = lbs_rtap_stop;

	rtap_dev->hard_start_xmit = lbs_rtap_hard_start_xmit;

	rtap_dev->ml_priv = priv;

	rtap_dev->ml_priv = priv;

	SET_NETDEV_DEV(rtap_dev, priv->dev->dev.parent);

	SET_NETDEV_DEV(rtap_dev, priv->dev->dev.parent);