Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f89d12e authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

sunhme: update to net_device_ops 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 805524cb

drivers/net/sunhme.c

+14 −12
Original line number Diff line number Diff line
@@ -2607,6 +2607,18 @@ static struct quattro * __devinit quattro_pci_find(struct pci_dev *pdev) 
}

#endif /* CONFIG_PCI */



static const struct net_device_ops hme_netdev_ops = {

	.ndo_open		= happy_meal_open,

	.ndo_stop		= happy_meal_close,

	.ndo_start_xmit		= happy_meal_start_xmit,

	.ndo_tx_timeout		= happy_meal_tx_timeout,

	.ndo_get_stats		= happy_meal_get_stats,

	.ndo_set_multicast_list = happy_meal_set_multicast,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

};



#ifdef CONFIG_SBUS

static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)

{
@@ -2750,12 +2762,7 @@ static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe) 
	init_timer(&hp->happy_timer);



	hp->dev = dev;

	dev->open = &happy_meal_open;

	dev->stop = &happy_meal_close;

	dev->hard_start_xmit = &happy_meal_start_xmit;

	dev->get_stats = &happy_meal_get_stats;

	dev->set_multicast_list = &happy_meal_set_multicast;

	dev->tx_timeout = &happy_meal_tx_timeout;

	dev->netdev_ops = &hme_netdev_ops;

	dev->watchdog_timeo = 5*HZ;

	dev->ethtool_ops = &hme_ethtool_ops;
@@ -3076,12 +3083,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, 
	init_timer(&hp->happy_timer);



	hp->dev = dev;

	dev->open = &happy_meal_open;

	dev->stop = &happy_meal_close;

	dev->hard_start_xmit = &happy_meal_start_xmit;

	dev->get_stats = &happy_meal_get_stats;

	dev->set_multicast_list = &happy_meal_set_multicast;

	dev->tx_timeout = &happy_meal_tx_timeout;

	dev->netdev_ops = &hme_netdev_ops;

	dev->watchdog_timeo = 5*HZ;

	dev->ethtool_ops = &hme_ethtool_ops;

	dev->irq = pdev->irq;