aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-01-07 20:28:35 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-07 20:28:35 -0500
commit2f89d12e98c9248ce967f4c6a86b06dbbcf013cd (patch)
tree6ed637cca8857c53f728f343de63fdc7b61ec6cd
parent805524cbcf8d756ec1969b6e16b945103cd4c94e (diff)
sunhme: update to net_device_ops
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/sunhme.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index b22d3355fb45..7a72a3112f0a 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2607,6 +2607,18 @@ static struct quattro * __devinit quattro_pci_find(struct pci_dev *pdev)
2607} 2607}
2608#endif /* CONFIG_PCI */ 2608#endif /* CONFIG_PCI */
2609 2609
2610static const struct net_device_ops hme_netdev_ops = {
2611 .ndo_open = happy_meal_open,
2612 .ndo_stop = happy_meal_close,
2613 .ndo_start_xmit = happy_meal_start_xmit,
2614 .ndo_tx_timeout = happy_meal_tx_timeout,
2615 .ndo_get_stats = happy_meal_get_stats,
2616 .ndo_set_multicast_list = happy_meal_set_multicast,
2617 .ndo_change_mtu = eth_change_mtu,
2618 .ndo_set_mac_address = eth_mac_addr,
2619 .ndo_validate_addr = eth_validate_addr,
2620};
2621
2610#ifdef CONFIG_SBUS 2622#ifdef CONFIG_SBUS
2611static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe) 2623static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)
2612{ 2624{
@@ -2750,12 +2762,7 @@ static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)
2750 init_timer(&hp->happy_timer); 2762 init_timer(&hp->happy_timer);
2751 2763
2752 hp->dev = dev; 2764 hp->dev = dev;
2753 dev->open = &happy_meal_open; 2765 dev->netdev_ops = &hme_netdev_ops;
2754 dev->stop = &happy_meal_close;
2755 dev->hard_start_xmit = &happy_meal_start_xmit;
2756 dev->get_stats = &happy_meal_get_stats;
2757 dev->set_multicast_list = &happy_meal_set_multicast;
2758 dev->tx_timeout = &happy_meal_tx_timeout;
2759 dev->watchdog_timeo = 5*HZ; 2766 dev->watchdog_timeo = 5*HZ;
2760 dev->ethtool_ops = &hme_ethtool_ops; 2767 dev->ethtool_ops = &hme_ethtool_ops;
2761 2768
@@ -3076,12 +3083,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
3076 init_timer(&hp->happy_timer); 3083 init_timer(&hp->happy_timer);
3077 3084
3078 hp->dev = dev; 3085 hp->dev = dev;
3079 dev->open = &happy_meal_open; 3086 dev->netdev_ops = &hme_netdev_ops;
3080 dev->stop = &happy_meal_close;
3081 dev->hard_start_xmit = &happy_meal_start_xmit;
3082 dev->get_stats = &happy_meal_get_stats;
3083 dev->set_multicast_list = &happy_meal_set_multicast;
3084 dev->tx_timeout = &happy_meal_tx_timeout;
3085 dev->watchdog_timeo = 5*HZ; 3087 dev->watchdog_timeo = 5*HZ;
3086 dev->ethtool_ops = &hme_ethtool_ops; 3088 dev->ethtool_ops = &hme_ethtool_ops;
3087 dev->irq = pdev->irq; 3089 dev->irq = pdev->irq;