diff options
Diffstat (limited to 'drivers/net/wireless/orinoco/orinoco.c')
-rw-r--r-- | drivers/net/wireless/orinoco/orinoco.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco.c b/drivers/net/wireless/orinoco/orinoco.c index 41aa51bc49a..05c157698db 100644 --- a/drivers/net/wireless/orinoco/orinoco.c +++ b/drivers/net/wireless/orinoco/orinoco.c | |||
@@ -3583,6 +3583,17 @@ static int orinoco_init(struct net_device *dev) | |||
3583 | return err; | 3583 | return err; |
3584 | } | 3584 | } |
3585 | 3585 | ||
3586 | static const struct net_device_ops orinoco_netdev_ops = { | ||
3587 | .ndo_init = orinoco_init, | ||
3588 | .ndo_open = orinoco_open, | ||
3589 | .ndo_stop = orinoco_stop, | ||
3590 | .ndo_start_xmit = orinoco_xmit, | ||
3591 | .ndo_set_multicast_list = orinoco_set_multicast_list, | ||
3592 | .ndo_change_mtu = orinoco_change_mtu, | ||
3593 | .ndo_tx_timeout = orinoco_tx_timeout, | ||
3594 | .ndo_get_stats = orinoco_get_stats, | ||
3595 | }; | ||
3596 | |||
3586 | struct net_device | 3597 | struct net_device |
3587 | *alloc_orinocodev(int sizeof_card, | 3598 | *alloc_orinocodev(int sizeof_card, |
3588 | struct device *device, | 3599 | struct device *device, |
@@ -3605,27 +3616,20 @@ struct net_device | |||
3605 | priv->dev = device; | 3616 | priv->dev = device; |
3606 | 3617 | ||
3607 | /* Setup / override net_device fields */ | 3618 | /* Setup / override net_device fields */ |
3608 | dev->init = orinoco_init; | 3619 | dev->netdev_ops = &orinoco_netdev_ops; |
3609 | dev->hard_start_xmit = orinoco_xmit; | ||
3610 | dev->tx_timeout = orinoco_tx_timeout; | ||
3611 | dev->watchdog_timeo = HZ; /* 1 second timeout */ | 3620 | dev->watchdog_timeo = HZ; /* 1 second timeout */ |
3612 | dev->get_stats = orinoco_get_stats; | ||
3613 | dev->ethtool_ops = &orinoco_ethtool_ops; | 3621 | dev->ethtool_ops = &orinoco_ethtool_ops; |
3614 | dev->wireless_handlers = (struct iw_handler_def *)&orinoco_handler_def; | 3622 | dev->wireless_handlers = (struct iw_handler_def *)&orinoco_handler_def; |
3615 | #ifdef WIRELESS_SPY | 3623 | #ifdef WIRELESS_SPY |
3616 | priv->wireless_data.spy_data = &priv->spy_data; | 3624 | priv->wireless_data.spy_data = &priv->spy_data; |
3617 | dev->wireless_data = &priv->wireless_data; | 3625 | dev->wireless_data = &priv->wireless_data; |
3618 | #endif | 3626 | #endif |
3619 | dev->change_mtu = orinoco_change_mtu; | ||
3620 | dev->set_multicast_list = orinoco_set_multicast_list; | ||
3621 | /* we use the default eth_mac_addr for setting the MAC addr */ | 3627 | /* we use the default eth_mac_addr for setting the MAC addr */ |
3622 | 3628 | ||
3623 | /* Reserve space in skb for the SNAP header */ | 3629 | /* Reserve space in skb for the SNAP header */ |
3624 | dev->hard_header_len += ENCAPS_OVERHEAD; | 3630 | dev->hard_header_len += ENCAPS_OVERHEAD; |
3625 | 3631 | ||
3626 | /* Set up default callbacks */ | 3632 | /* Set up default callbacks */ |
3627 | dev->open = orinoco_open; | ||
3628 | dev->stop = orinoco_stop; | ||
3629 | priv->hard_reset = hard_reset; | 3633 | priv->hard_reset = hard_reset; |
3630 | priv->stop_fw = stop_fw; | 3634 | priv->stop_fw = stop_fw; |
3631 | 3635 | ||