diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2008-11-26 03:21:56 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-26 03:21:56 +0100 |
| commit | 458228bc4c1370de1dae4ba0f78469092ca21d75 (patch) | |
| tree | 28e65c0db3672fff45afdd8efa9d5d0641548788 /drivers/net/wd.c | |
| parent | 8390: add common net_device ops (diff) | |
| download | linux-458228bc4c1370de1dae4ba0f78469092ca21d75.tar.xz linux-458228bc4c1370de1dae4ba0f78469092ca21d75.zip | |
wd: use net_device_ops
Another driver converted to net_device_ops; Compile tested only.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wd.c')
| -rw-r--r-- | drivers/net/wd.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/drivers/net/wd.c b/drivers/net/wd.c index 6d96ed472119..3c1edda08d3d 100644 --- a/drivers/net/wd.c +++ b/drivers/net/wd.c @@ -147,6 +147,20 @@ out: } #endif +static const struct net_device_ops wd_netdev_ops = { + .ndo_open = wd_open, + .ndo_stop = wd_close, + .ndo_start_xmit = ei_start_xmit, + .ndo_tx_timeout = ei_tx_timeout, + .ndo_get_stats = ei_get_stats, + .ndo_set_multicast_list = ei_set_multicast_list, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = ei_poll, +#endif +}; + static int __init wd_probe1(struct net_device *dev, int ioaddr) { int i; @@ -331,11 +345,8 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr) ei_status.block_input = &wd_block_input; ei_status.block_output = &wd_block_output; ei_status.get_8390_hdr = &wd_get_8390_hdr; - dev->open = &wd_open; - dev->stop = &wd_close; -#ifdef CONFIG_NET_POLL_CONTROLLER - dev->poll_controller = ei_poll; -#endif + + dev->netdev_ops = &wd_netdev_ops; NS8390_init(dev, 0); #if 1 @@ -365,8 +376,7 @@ wd_open(struct net_device *dev) outb(ei_status.reg5, ioaddr+WD_CMDREG5); outb(ei_status.reg0, ioaddr); /* WD_CMDREG */ - ei_open(dev); - return 0; + return ei_open(dev); } static void |