Commit 5ed0102f authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

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: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ab1ab75

drivers/net/sungem.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -2998,8 +2998,11 @@ static const struct net_device_ops gem_netdev_ops = { 
	.ndo_do_ioctl		= gem_ioctl,

	.ndo_do_ioctl		= gem_ioctl,

	.ndo_tx_timeout		= gem_tx_timeout,

	.ndo_tx_timeout		= gem_tx_timeout,

	.ndo_change_mtu		= gem_change_mtu,

	.ndo_change_mtu		= gem_change_mtu,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_validate_addr	= eth_validate_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,

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->watchdog_timeo = 5 * HZ;

	dev->irq = pdev->irq;

	dev->irq = pdev->irq;

	dev->dma = 0;

	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 */

	/* Set that now, in case PM kicks in now */

	pci_set_drvdata(pdev, dev);

	pci_set_drvdata(pdev, dev);