aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/acenic.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 109eb7ccff30..309a90ea9211 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -450,6 +450,17 @@ static const struct ethtool_ops ace_ethtool_ops = {
450 450
451static void ace_watchdog(struct net_device *dev); 451static void ace_watchdog(struct net_device *dev);
452 452
453static const struct net_device_ops ace_netdev_ops = {
454 .ndo_open = ace_open,
455 .ndo_stop = ace_close,
456 .ndo_tx_timeout = ace_watchdog,
457 .ndo_get_stats = ace_get_stats,
458 .ndo_set_multicast_list = ace_set_multicast_list,
459 .ndo_set_mac_address = ace_set_mac_addr,
460 .ndo_change_mtu = ace_change_mtu,
461 .ndo_vlan_rx_register = ace_vlan_rx_register,
462};
463
453static int __devinit acenic_probe_one(struct pci_dev *pdev, 464static int __devinit acenic_probe_one(struct pci_dev *pdev,
454 const struct pci_device_id *id) 465 const struct pci_device_id *id)
455{ 466{
@@ -473,20 +484,13 @@ static int __devinit acenic_probe_one(struct pci_dev *pdev,
473 dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM; 484 dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
474#if ACENIC_DO_VLAN 485#if ACENIC_DO_VLAN
475 dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; 486 dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
476 dev->vlan_rx_register = ace_vlan_rx_register;
477#endif 487#endif
478 488
479 dev->tx_timeout = &ace_watchdog;
480 dev->watchdog_timeo = 5*HZ; 489 dev->watchdog_timeo = 5*HZ;
481 490
482 dev->open = &ace_open; 491 dev->netdev_ops = &ace_netdev_ops;
483 dev->stop = &ace_close;
484 dev->hard_start_xmit = &ace_start_xmit; 492 dev->hard_start_xmit = &ace_start_xmit;
485 dev->get_stats = &ace_get_stats;
486 dev->set_multicast_list = &ace_set_multicast_list;
487 SET_ETHTOOL_OPS(dev, &ace_ethtool_ops); 493 SET_ETHTOOL_OPS(dev, &ace_ethtool_ops);
488 dev->set_mac_address = &ace_set_mac_addr;
489 dev->change_mtu = &ace_change_mtu;
490 494
491 /* we only display this string ONCE */ 495 /* we only display this string ONCE */
492 if (!boards_found) 496 if (!boards_found)