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

natsemi: 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
2b7d0c70 d49d19c9

+17 -12
+17 -12
drivers/net/natsemi.c
··· 779 779 780 780 } 781 781 782 + static const struct net_device_ops natsemi_netdev_ops = { 783 + .ndo_open = netdev_open, 784 + .ndo_stop = netdev_close, 785 + .ndo_start_xmit = start_tx, 786 + .ndo_get_stats = get_stats, 787 + .ndo_set_multicast_list = set_rx_mode, 788 + .ndo_change_mtu = natsemi_change_mtu, 789 + .ndo_do_ioctl = netdev_ioctl, 790 + .ndo_tx_timeout = ns_tx_timeout, 791 + .ndo_set_mac_address = eth_mac_addr, 792 + .ndo_validate_addr = eth_validate_addr, 793 + #ifdef CONFIG_NET_POLL_CONTROLLER 794 + .ndo_poll_controller = natsemi_poll_controller, 795 + #endif 796 + }; 797 + 782 798 static int __devinit natsemi_probe1 (struct pci_dev *pdev, 783 799 const struct pci_device_id *ent) 784 800 { ··· 927 911 if (find_cnt < MAX_UNITS && full_duplex[find_cnt]) 928 912 np->full_duplex = 1; 929 913 930 - /* The chip-specific entries in the device structure. */ 931 - dev->open = &netdev_open; 932 - dev->hard_start_xmit = &start_tx; 933 - dev->stop = &netdev_close; 934 - dev->get_stats = &get_stats; 935 - dev->set_multicast_list = &set_rx_mode; 936 - dev->change_mtu = &natsemi_change_mtu; 937 - dev->do_ioctl = &netdev_ioctl; 938 - dev->tx_timeout = &ns_tx_timeout; 914 + dev->netdev_ops = &natsemi_netdev_ops; 939 915 dev->watchdog_timeo = TX_TIMEOUT; 940 916 941 - #ifdef CONFIG_NET_POLL_CONTROLLER 942 - dev->poll_controller = &natsemi_poll_controller; 943 - #endif 944 917 SET_ETHTOOL_OPS(dev, &ethtool_ops); 945 918 946 919 if (mtu)