diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2009-03-26 11:11:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-27 03:46:47 -0400 |
commit | 5f352f9a1c8d53270970f4efcf5496cb9b01c4a8 (patch) | |
tree | 6873e59aaeba18980eb4d756bb9b2cf68c01b857 | |
parent | 32670c36d0222e2fdfa9673bb878e0f347411cd4 (diff) |
netdev: smc-ultra32 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/smc-ultra32.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c index cb6c097a2e0a..7a554adc70fb 100644 --- a/drivers/net/smc-ultra32.c +++ b/drivers/net/smc-ultra32.c | |||
@@ -153,6 +153,22 @@ out: | |||
153 | return ERR_PTR(err); | 153 | return ERR_PTR(err); |
154 | } | 154 | } |
155 | 155 | ||
156 | |||
157 | static const struct net_device_ops ultra32_netdev_ops = { | ||
158 | .ndo_open = ultra32_open, | ||
159 | .ndo_stop = ultra32_close, | ||
160 | .ndo_start_xmit = ei_start_xmit, | ||
161 | .ndo_tx_timeout = ei_tx_timeout, | ||
162 | .ndo_get_stats = ei_get_stats, | ||
163 | .ndo_set_multicast_list = ei_set_multicast_list, | ||
164 | .ndo_validate_addr = eth_validate_addr, | ||
165 | .ndo_set_mac_address = eth_mac_addr, | ||
166 | .ndo_change_mtu = eth_change_mtu, | ||
167 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
168 | .ndo_poll_controller = ei_poll, | ||
169 | #endif | ||
170 | }; | ||
171 | |||
156 | static int __init ultra32_probe1(struct net_device *dev, int ioaddr) | 172 | static int __init ultra32_probe1(struct net_device *dev, int ioaddr) |
157 | { | 173 | { |
158 | int i, edge, media, retval; | 174 | int i, edge, media, retval; |
@@ -273,11 +289,8 @@ static int __init ultra32_probe1(struct net_device *dev, int ioaddr) | |||
273 | ei_status.block_output = &ultra32_block_output; | 289 | ei_status.block_output = &ultra32_block_output; |
274 | ei_status.get_8390_hdr = &ultra32_get_8390_hdr; | 290 | ei_status.get_8390_hdr = &ultra32_get_8390_hdr; |
275 | ei_status.reset_8390 = &ultra32_reset_8390; | 291 | ei_status.reset_8390 = &ultra32_reset_8390; |
276 | dev->open = &ultra32_open; | 292 | |
277 | dev->stop = &ultra32_close; | 293 | dev->netdev_ops = &ultra32_netdev_ops; |
278 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
279 | dev->poll_controller = ei_poll; | ||
280 | #endif | ||
281 | NS8390_init(dev, 0); | 294 | NS8390_init(dev, 0); |
282 | 295 | ||
283 | return 0; | 296 | return 0; |