diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-03-20 15:36:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-22 01:51:19 -0400 |
commit | 32f5a330090fdf7d4d663ff5bd979e186fe6aab6 (patch) | |
tree | fbdfa249d8265dd1bfb50a092fd2784f456d11e4 | |
parent | 824f1dfdbef72578272e9303dd9515399da57f28 (diff) |
raylan: convert to net_device_ops
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 7370edb4e0ce..fa90d1d8d82e 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -298,6 +298,19 @@ static char hop_pattern_length[] = { 1, | |||
298 | static char rcsid[] = | 298 | static char rcsid[] = |
299 | "Raylink/WebGear wireless LAN - Corey <Thomas corey@world.std.com>"; | 299 | "Raylink/WebGear wireless LAN - Corey <Thomas corey@world.std.com>"; |
300 | 300 | ||
301 | static const struct net_device_ops ray_netdev_ops = { | ||
302 | .ndo_init = ray_dev_init, | ||
303 | .ndo_open = ray_open, | ||
304 | .ndo_stop = ray_dev_close, | ||
305 | .ndo_start_xmit = ray_dev_start_xmit, | ||
306 | .ndo_set_config = ray_dev_config, | ||
307 | .ndo_get_stats = ray_get_stats, | ||
308 | .ndo_set_multicast_list = set_multicast_list, | ||
309 | .ndo_change_mtu = eth_change_mtu, | ||
310 | .ndo_set_mac_address = eth_mac_addr, | ||
311 | .ndo_validate_addr = eth_validate_addr, | ||
312 | }; | ||
313 | |||
301 | /*============================================================================= | 314 | /*============================================================================= |
302 | ray_attach() creates an "instance" of the driver, allocating | 315 | ray_attach() creates an "instance" of the driver, allocating |
303 | local data structures for one device. The device is registered | 316 | local data structures for one device. The device is registered |
@@ -347,9 +360,7 @@ static int ray_probe(struct pcmcia_device *p_dev) | |||
347 | p_dev, dev, local, &ray_interrupt); | 360 | p_dev, dev, local, &ray_interrupt); |
348 | 361 | ||
349 | /* Raylink entries in the device structure */ | 362 | /* Raylink entries in the device structure */ |
350 | dev->hard_start_xmit = &ray_dev_start_xmit; | 363 | dev->netdev_ops = &ray_netdev_ops; |
351 | dev->set_config = &ray_dev_config; | ||
352 | dev->get_stats = &ray_get_stats; | ||
353 | SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); | 364 | SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); |
354 | dev->wireless_handlers = &ray_handler_def; | 365 | dev->wireless_handlers = &ray_handler_def; |
355 | #ifdef WIRELESS_SPY | 366 | #ifdef WIRELESS_SPY |
@@ -357,12 +368,8 @@ static int ray_probe(struct pcmcia_device *p_dev) | |||
357 | dev->wireless_data = &local->wireless_data; | 368 | dev->wireless_data = &local->wireless_data; |
358 | #endif /* WIRELESS_SPY */ | 369 | #endif /* WIRELESS_SPY */ |
359 | 370 | ||
360 | dev->set_multicast_list = &set_multicast_list; | ||
361 | 371 | ||
362 | DEBUG(2, "ray_cs ray_attach calling ether_setup.)\n"); | 372 | DEBUG(2, "ray_cs ray_attach calling ether_setup.)\n"); |
363 | dev->init = &ray_dev_init; | ||
364 | dev->open = &ray_open; | ||
365 | dev->stop = &ray_dev_close; | ||
366 | netif_stop_queue(dev); | 373 | netif_stop_queue(dev); |
367 | 374 | ||
368 | init_timer(&local->timer); | 375 | init_timer(&local->timer); |