diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2008-12-03 22:10:10 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-03 22:10:10 -0800 |
| commit | 5618f0d1193d6b051da9b59b0e32ad24397f06a4 (patch) | |
| tree | dd2f8a354650e03edd5abeee31cf655a09e9aaee | |
| parent | b6114794a1c394534659f4a17420e48cf23aa922 (diff) | |
hydra: convert to net_device_ops
Another device using 8390 library that needs converting.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/hydra.c | 23 |
2 files changed, 18 insertions, 7 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index a1fc8a1b50d..1a758dc4394 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -202,7 +202,7 @@ obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o obj-$(CONFIG_DECLANCE) += declance.o obj-$(CONFIG_ATARILANCE) += atarilance.o obj-$(CONFIG_A2065) += a2065.o -obj-$(CONFIG_HYDRA) += hydra.o +obj-$(CONFIG_HYDRA) += hydra.o 8390.o obj-$(CONFIG_ARIADNE) += ariadne.o obj-$(CONFIG_CS89x0) += cs89x0.o obj-$(CONFIG_MACSONIC) += macsonic.o diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c index b0ae0766ea4..b9198023f62 100644 --- a/drivers/net/hydra.c +++ b/drivers/net/hydra.c @@ -94,6 +94,21 @@ static int __devinit hydra_init_one(struct zorro_dev *z, return 0; } +static const struct net_device_ops etherh_netdev_ops = { + .ndo_open = hydra_open, + .ndo_stop = hydra_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 __devinit hydra_init(struct zorro_dev *z) { struct net_device *dev; @@ -109,7 +124,7 @@ static int __devinit hydra_init(struct zorro_dev *z) 0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e, }; - dev = ____alloc_ei_netdev(0); + dev = alloc_ei_netdev(); if (!dev) return -ENOMEM; @@ -144,12 +159,8 @@ static int __devinit hydra_init(struct zorro_dev *z) ei_status.block_output = &hydra_block_output; ei_status.get_8390_hdr = &hydra_get_8390_hdr; ei_status.reg_offset = hydra_offsets; - dev->open = &hydra_open; - dev->stop = &hydra_close; -#ifdef CONFIG_NET_POLL_CONTROLLER - dev->poll_controller = __ei_poll; -#endif + dev->netdev_ops = &hydra_netdev_ops; __NS8390_init(dev, 0); err = register_netdev(dev); |