Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5ed0102fbf36f58091089907213b4bd191ca2e0c

Authored by Stephen Hemminger
Committed by David S. Miller
1 parent 1ab1ab7543
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

sungem: missing net_device_ops 

Sungem driver only got partially converted to net_device_ops.
Since this could cause bugs, please push this to 2.6.29

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

drivers/net/sungem.c
Diff comments   View file @ 5ed0102
... ... @@ -2998,8 +2998,11 @@
2998 2998 .ndo_do_ioctl = gem_ioctl,
2999 2999 .ndo_tx_timeout = gem_tx_timeout,
3000 3000 .ndo_change_mtu = gem_change_mtu,
3001   - .ndo_set_mac_address = eth_mac_addr,
3002 3001 .ndo_validate_addr = eth_validate_addr,
  3002 + .ndo_set_mac_address = gem_set_mac_address,
  3003 +#ifdef CONFIG_NET_POLL_CONTROLLER
  3004 + .ndo_poll_controller = gem_poll_controller,
  3005 +#endif
3003 3006 };
3004 3007  
3005 3008 static int __devinit gem_init_one(struct pci_dev *pdev,
... ... @@ -3161,10 +3164,6 @@
3161 3164 dev->watchdog_timeo = 5 * HZ;
3162 3165 dev->irq = pdev->irq;
3163 3166 dev->dma = 0;
3164   - dev->set_mac_address = gem_set_mac_address;
3165   -#ifdef CONFIG_NET_POLL_CONTROLLER
3166   - dev->poll_controller = gem_poll_controller;
3167   -#endif
3168 3167  
3169 3168 /* Set that now, in case PM kicks in now */
3170 3169 pci_set_drvdata(pdev, dev);