diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-03-19 23:58:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-19 23:58:01 -0700 |
| commit | 5ed0102fbf36f58091089907213b4bd191ca2e0c (patch) | |
| tree | 918ec5b810e6d0675425c562ef01e151a0313c16 | |
| parent | 1ab1ab7543de53c945ea24140409ef67ed173eb4 (diff) | |
| download | op-kernel-dev-5ed0102fbf36f58091089907213b4bd191ca2e0c.zip op-kernel-dev-5ed0102fbf36f58091089907213b4bd191ca2e0c.tar.gz | |
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>
| -rw-r--r-- | drivers/net/sungem.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 0fcb750..c9c7650 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -2998,8 +2998,11 @@ static const struct net_device_ops gem_netdev_ops = { .ndo_do_ioctl = gem_ioctl, .ndo_tx_timeout = gem_tx_timeout, .ndo_change_mtu = gem_change_mtu, - .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = gem_set_mac_address, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = gem_poll_controller, +#endif }; static int __devinit gem_init_one(struct pci_dev *pdev, @@ -3161,10 +3164,6 @@ static int __devinit gem_init_one(struct pci_dev *pdev, dev->watchdog_timeo = 5 * HZ; dev->irq = pdev->irq; dev->dma = 0; - dev->set_mac_address = gem_set_mac_address; -#ifdef CONFIG_NET_POLL_CONTROLLER - dev->poll_controller = gem_poll_controller; -#endif /* Set that now, in case PM kicks in now */ pci_set_drvdata(pdev, dev); |
