diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2008-11-25 21:24:20 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 21:24:20 -0500 |
commit | 8284abea9b49f9d8eae5b3ed36a9ea76a26388ca (patch) | |
tree | 72acae60caa463d74934c1842e2f2fca796698ec | |
parent | 9a9aa14a74d49f88e2c2a126b035c22bd1ab0d53 (diff) |
e2100: 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/e2100.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/drivers/net/e2100.c b/drivers/net/e2100.c index 6390f51ea6fb..20eb05cddb83 100644 --- a/drivers/net/e2100.c +++ b/drivers/net/e2100.c | |||
@@ -107,7 +107,7 @@ static void e21_block_output(struct net_device *dev, int count, | |||
107 | const unsigned char *buf, int start_page); | 107 | const unsigned char *buf, int start_page); |
108 | static void e21_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, | 108 | static void e21_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, |
109 | int ring_page); | 109 | int ring_page); |
110 | 110 | static int e21_open(struct net_device *dev); | |
111 | static int e21_close(struct net_device *dev); | 111 | static int e21_close(struct net_device *dev); |
112 | 112 | ||
113 | 113 | ||
@@ -160,6 +160,21 @@ out: | |||
160 | } | 160 | } |
161 | #endif | 161 | #endif |
162 | 162 | ||
163 | static const struct net_device_ops e21_netdev_ops = { | ||
164 | .ndo_open = e21_open, | ||
165 | .ndo_stop = e21_close, | ||
166 | |||
167 | .ndo_start_xmit = ei_start_xmit, | ||
168 | .ndo_tx_timeout = ei_tx_timeout, | ||
169 | .ndo_get_stats = ei_get_stats, | ||
170 | .ndo_set_multicast_list = ei_set_multicast_list, | ||
171 | .ndo_validate_addr = eth_validate_addr, | ||
172 | .ndo_change_mtu = eth_change_mtu, | ||
173 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
174 | .ndo_poll_controller = ei_poll, | ||
175 | #endif | ||
176 | }; | ||
177 | |||
163 | static int __init e21_probe1(struct net_device *dev, int ioaddr) | 178 | static int __init e21_probe1(struct net_device *dev, int ioaddr) |
164 | { | 179 | { |
165 | int i, status, retval; | 180 | int i, status, retval; |
@@ -265,11 +280,8 @@ static int __init e21_probe1(struct net_device *dev, int ioaddr) | |||
265 | ei_status.block_input = &e21_block_input; | 280 | ei_status.block_input = &e21_block_input; |
266 | ei_status.block_output = &e21_block_output; | 281 | ei_status.block_output = &e21_block_output; |
267 | ei_status.get_8390_hdr = &e21_get_8390_hdr; | 282 | ei_status.get_8390_hdr = &e21_get_8390_hdr; |
268 | dev->open = &e21_open; | 283 | |
269 | dev->stop = &e21_close; | 284 | dev->netdev_ops = &e21_netdev_ops; |
270 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
271 | dev->poll_controller = ei_poll; | ||
272 | #endif | ||
273 | NS8390_init(dev, 0); | 285 | NS8390_init(dev, 0); |
274 | 286 | ||
275 | retval = register_netdev(dev); | 287 | retval = register_netdev(dev); |