diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-03-20 15:36:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-22 01:43:59 -0400 |
commit | 9db0ba0a8b8bb0fd6606b4ac17073b2984b2d797 (patch) | |
tree | e2f334b22b091557f9fa57c02ed28f3e93c0ef94 /drivers/net/wireless/wavelan_cs.c | |
parent | 385e63fb1e469739e90b32f4c07fed48baf2721a (diff) |
wavelan: 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/net/wireless/wavelan_cs.c')
-rw-r--r-- | drivers/net/wireless/wavelan_cs.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index 90235fb3d862..e55b33961aeb 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c | |||
@@ -4436,6 +4436,19 @@ wavelan_close(struct net_device * dev) | |||
4436 | return 0; | 4436 | return 0; |
4437 | } | 4437 | } |
4438 | 4438 | ||
4439 | static const struct net_device_ops wavelan_netdev_ops = { | ||
4440 | .ndo_open = wavelan_open, | ||
4441 | .ndo_stop = wavelan_close, | ||
4442 | .ndo_start_xmit = wavelan_packet_xmit, | ||
4443 | .ndo_set_multicast_list = wavelan_set_multicast_list, | ||
4444 | #ifdef SET_MAC_ADDRESS | ||
4445 | .ndo_set_mac_address = wavelan_set_mac_address, | ||
4446 | #endif | ||
4447 | .ndo_tx_timeout = wavelan_watchdog, | ||
4448 | .ndo_change_mtu = eth_change_mtu, | ||
4449 | .ndo_validate_addr = eth_validate_addr, | ||
4450 | }; | ||
4451 | |||
4439 | /*------------------------------------------------------------------*/ | 4452 | /*------------------------------------------------------------------*/ |
4440 | /* | 4453 | /* |
4441 | * wavelan_attach() creates an "instance" of the driver, allocating | 4454 | * wavelan_attach() creates an "instance" of the driver, allocating |
@@ -4496,16 +4509,7 @@ wavelan_probe(struct pcmcia_device *p_dev) | |||
4496 | lp->dev = dev; | 4509 | lp->dev = dev; |
4497 | 4510 | ||
4498 | /* wavelan NET3 callbacks */ | 4511 | /* wavelan NET3 callbacks */ |
4499 | dev->open = &wavelan_open; | 4512 | dev->netdev_ops = &wavelan_netdev_ops; |
4500 | dev->stop = &wavelan_close; | ||
4501 | dev->hard_start_xmit = &wavelan_packet_xmit; | ||
4502 | dev->set_multicast_list = &wavelan_set_multicast_list; | ||
4503 | #ifdef SET_MAC_ADDRESS | ||
4504 | dev->set_mac_address = &wavelan_set_mac_address; | ||
4505 | #endif /* SET_MAC_ADDRESS */ | ||
4506 | |||
4507 | /* Set the watchdog timer */ | ||
4508 | dev->tx_timeout = &wavelan_watchdog; | ||
4509 | dev->watchdog_timeo = WATCHDOG_JIFFIES; | 4513 | dev->watchdog_timeo = WATCHDOG_JIFFIES; |
4510 | SET_ETHTOOL_OPS(dev, &ops); | 4514 | SET_ETHTOOL_OPS(dev, &ops); |
4511 | 4515 | ||