Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5f352f9a1c8d53270970f4efcf5496cb9b01c4a8

Authored by Stephen Hemminger
Committed by David S. Miller
1 parent 32670c36d0
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 18 additions and 5 deletions Side-by-side Diff

drivers/net/smc-ultra32.c
Diff comments   View file @ 5f352f9
... ... @@ -153,6 +153,22 @@
153 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 172 static int __init ultra32_probe1(struct net_device *dev, int ioaddr)
157 173 {
158 174 int i, edge, media, retval;
... ... @@ -273,11 +289,8 @@
273 289 ei_status.block_output = &ultra32_block_output;
274 290 ei_status.get_8390_hdr = &ultra32_get_8390_hdr;
275 291 ei_status.reset_8390 = &ultra32_reset_8390;
276   - dev->open = &ultra32_open;
277   - dev->stop = &ultra32_close;
278   -#ifdef CONFIG_NET_POLL_CONTROLLER
279   - dev->poll_controller = ei_poll;
280   -#endif
  292 +
  293 + dev->netdev_ops = &ultra32_netdev_ops;
281 294 NS8390_init(dev, 0);
282 295  
283 296 return 0;