aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-03-20 15:36:40 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-22 01:55:32 -0400
commit3e47fcea201ba7b08f9f13cead6e3045a80fb279 (patch)
tree5ead034227c68d3e3da6c16f81a1e3ca6c778986 /drivers
parentd5b3b9ae065d093fe0e1588a07f3ebd71c815f0b (diff)
ipw2100: convert to net_device_ops
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2100.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 425ba8b0b0f1..115b70487502 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -6008,6 +6008,17 @@ static void ipw2100_rf_kill(struct work_struct *work)
6008 6008
6009static void ipw2100_irq_tasklet(struct ipw2100_priv *priv); 6009static void ipw2100_irq_tasklet(struct ipw2100_priv *priv);
6010 6010
6011static const struct net_device_ops ipw2100_netdev_ops = {
6012 .ndo_open = ipw2100_open,
6013 .ndo_stop = ipw2100_close,
6014 .ndo_start_xmit = ieee80211_xmit,
6015 .ndo_change_mtu = ieee80211_change_mtu,
6016 .ndo_init = ipw2100_net_init,
6017 .ndo_tx_timeout = ipw2100_tx_timeout,
6018 .ndo_set_mac_address = ipw2100_set_address,
6019 .ndo_validate_addr = eth_validate_addr,
6020};
6021
6011/* Look into using netdev destructor to shutdown ieee80211? */ 6022/* Look into using netdev destructor to shutdown ieee80211? */
6012 6023
6013static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev, 6024static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
@@ -6032,15 +6043,11 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
6032 priv->ieee->perfect_rssi = -20; 6043 priv->ieee->perfect_rssi = -20;
6033 priv->ieee->worst_rssi = -85; 6044 priv->ieee->worst_rssi = -85;
6034 6045
6035 dev->open = ipw2100_open; 6046 dev->netdev_ops = &ipw2100_netdev_ops;
6036 dev->stop = ipw2100_close;
6037 dev->init = ipw2100_net_init;
6038 dev->ethtool_ops = &ipw2100_ethtool_ops; 6047 dev->ethtool_ops = &ipw2100_ethtool_ops;
6039 dev->tx_timeout = ipw2100_tx_timeout;
6040 dev->wireless_handlers = &ipw2100_wx_handler_def; 6048 dev->wireless_handlers = &ipw2100_wx_handler_def;
6041 priv->wireless_data.ieee80211 = priv->ieee; 6049 priv->wireless_data.ieee80211 = priv->ieee;
6042 dev->wireless_data = &priv->wireless_data; 6050 dev->wireless_data = &priv->wireless_data;
6043 dev->set_mac_address = ipw2100_set_address;
6044 dev->watchdog_timeo = 3 * HZ; 6051 dev->watchdog_timeo = 3 * HZ;
6045 dev->irq = 0; 6052 dev->irq = 0;
6046 6053