| Submitter | stephen hemminger |
|---|---|
| Date | March 20, 2009, 6:53 a.m. |
| Message ID | <20090319235313.300e51a9@nehalam> |
| Download | mbox | patch |
| Permalink | /patch/24724/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
From: Stephen Hemminger <shemminger@vyatta.com> Date: Thu, 19 Mar 2009 23:53:13 -0700 > 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> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
--- a/drivers/net/sungem.c 2009-03-19 23:42:39.988903014 -0700 +++ b/drivers/net/sungem.c 2009-03-19 23:43:47.282840042 -0700 @@ -2998,8 +2998,11 @@ static const struct net_device_ops gem_n .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 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);
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> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html