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

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

ipw2200: 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 3e47fcea

drivers/net/wireless/ipw2x00/ipw2200.c

+22 −8
Original line number Diff line number Diff line
@@ -11529,6 +11529,15 @@ static int ipw_prom_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	return -EOPNOTSUPP;

}



static const struct net_device_ops ipw_prom_netdev_ops = {

	.ndo_open 		= ipw_prom_open,

	.ndo_stop		= ipw_prom_stop,

	.ndo_start_xmit		= ipw_prom_hard_start_xmit,

	.ndo_change_mtu		= ieee80211_change_mtu,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

};



static int ipw_prom_alloc(struct ipw_priv *priv)

{

	int rc = 0;
@@ -11548,9 +11557,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv) 
	memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN);



	priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;

	priv->prom_net_dev->open = ipw_prom_open;

	priv->prom_net_dev->stop = ipw_prom_stop;

	priv->prom_net_dev->hard_start_xmit = ipw_prom_hard_start_xmit;

	priv->prom_net_dev->netdev_ops = &ipw_prom_netdev_ops;



	priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR;

	SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev);
@@ -11578,6 +11585,17 @@ static void ipw_prom_free(struct ipw_priv *priv) 


#endif



static const struct net_device_ops ipw_netdev_ops = {

	.ndo_init		= ipw_net_init,

	.ndo_open		= ipw_net_open,

	.ndo_stop		= ipw_net_stop,

	.ndo_set_multicast_list	= ipw_net_set_multicast_list,

	.ndo_set_mac_address	= ipw_net_set_mac_address,

	.ndo_start_xmit		= ieee80211_xmit,

	.ndo_change_mtu		= ieee80211_change_mtu,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

};



static int __devinit ipw_pci_probe(struct pci_dev *pdev,

				   const struct pci_device_id *ent)
@@ -11679,11 +11697,7 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev, 
	priv->ieee->perfect_rssi = -20;

	priv->ieee->worst_rssi = -85;



	net_dev->open = ipw_net_open;

	net_dev->stop = ipw_net_stop;

	net_dev->init = ipw_net_init;

	net_dev->set_multicast_list = ipw_net_set_multicast_list;

	net_dev->set_mac_address = ipw_net_set_mac_address;

	net_dev->netdev_ops = &ipw_netdev_ops;

	priv->wireless_data.spy_data = &priv->ieee->spy_data;

	net_dev->wireless_data = &priv->wireless_data;

	net_dev->wireless_handlers = &ipw_wx_handler_def;