aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/epic100.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index f9b37c80dda6..a539bc3163cf 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -308,7 +308,18 @@ static int epic_close(struct net_device *dev);
308static struct net_device_stats *epic_get_stats(struct net_device *dev); 308static struct net_device_stats *epic_get_stats(struct net_device *dev);
309static void set_rx_mode(struct net_device *dev); 309static void set_rx_mode(struct net_device *dev);
310 310
311 311static const struct net_device_ops epic_netdev_ops = {
312 .ndo_open = epic_open,
313 .ndo_stop = epic_close,
314 .ndo_start_xmit = epic_start_xmit,
315 .ndo_tx_timeout = epic_tx_timeout,
316 .ndo_get_stats = epic_get_stats,
317 .ndo_set_multicast_list = set_rx_mode,
318 .ndo_do_ioctl = netdev_ioctl,
319 .ndo_change_mtu = eth_change_mtu,
320 .ndo_set_mac_address = eth_mac_addr,
321 .ndo_validate_addr = eth_validate_addr,
322};
312 323
313static int __devinit epic_init_one (struct pci_dev *pdev, 324static int __devinit epic_init_one (struct pci_dev *pdev,
314 const struct pci_device_id *ent) 325 const struct pci_device_id *ent)
@@ -483,15 +494,9 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
483 dev->if_port = ep->default_port = option; 494 dev->if_port = ep->default_port = option;
484 495
485 /* The Epic-specific entries in the device structure. */ 496 /* The Epic-specific entries in the device structure. */
486 dev->open = &epic_open; 497 dev->netdev_ops = &epic_netdev_ops;
487 dev->hard_start_xmit = &epic_start_xmit;
488 dev->stop = &epic_close;
489 dev->get_stats = &epic_get_stats;
490 dev->set_multicast_list = &set_rx_mode;
491 dev->do_ioctl = &netdev_ioctl;
492 dev->ethtool_ops = &netdev_ethtool_ops; 498 dev->ethtool_ops = &netdev_ethtool_ops;
493 dev->watchdog_timeo = TX_TIMEOUT; 499 dev->watchdog_timeo = TX_TIMEOUT;
494 dev->tx_timeout = &epic_tx_timeout;
495 netif_napi_add(dev, &ep->napi, epic_poll, 64); 500 netif_napi_add(dev, &ep->napi, epic_poll, 64);
496 501
497 ret = register_netdev(dev); 502 ret = register_netdev(dev);