Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

epic100: update to net_device_ops

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Stephen Hemminger and committed by
David S. Miller
805524cb 391c5e6e

+13 -8
+13 -8
drivers/net/epic100.c
··· 308 308 static struct net_device_stats *epic_get_stats(struct net_device *dev); 309 309 static void set_rx_mode(struct net_device *dev); 310 310 311 - 311 + static 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 313 324 static int __devinit epic_init_one (struct pci_dev *pdev, 314 325 const struct pci_device_id *ent) ··· 494 483 dev->if_port = ep->default_port = option; 495 484 496 485 /* The Epic-specific entries in the device structure. */ 497 - dev->open = &epic_open; 498 - dev->hard_start_xmit = &epic_start_xmit; 499 - dev->stop = &epic_close; 500 - dev->get_stats = &epic_get_stats; 501 - dev->set_multicast_list = &set_rx_mode; 502 - dev->do_ioctl = &netdev_ioctl; 486 + dev->netdev_ops = &epic_netdev_ops; 503 487 dev->ethtool_ops = &netdev_ethtool_ops; 504 488 dev->watchdog_timeo = TX_TIMEOUT; 505 - dev->tx_timeout = &epic_tx_timeout; 506 489 netif_napi_add(dev, &ep->napi, epic_poll, 64); 507 490 508 491 ret = register_netdev(dev);