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

pcnet32: 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
3bc124dd d9a811d5

+17 -11
+17 -11
drivers/net/pcnet32.c
··· 1568 1568 return err; 1569 1569 } 1570 1570 1571 + static const struct net_device_ops pcnet32_netdev_ops = { 1572 + .ndo_open = pcnet32_open, 1573 + .ndo_stop = pcnet32_close, 1574 + .ndo_start_xmit = pcnet32_start_xmit, 1575 + .ndo_tx_timeout = pcnet32_tx_timeout, 1576 + .ndo_get_stats = pcnet32_get_stats, 1577 + .ndo_set_multicast_list = pcnet32_set_multicast_list, 1578 + .ndo_do_ioctl = pcnet32_ioctl, 1579 + .ndo_change_mtu = eth_change_mtu, 1580 + .ndo_set_mac_address = eth_mac_addr, 1581 + .ndo_validate_addr = eth_validate_addr, 1582 + #ifdef CONFIG_NET_POLL_CONTROLLER 1583 + .ndo_poll_controller = pcnet32_poll_controller, 1584 + #endif 1585 + }; 1586 + 1571 1587 /* pcnet32_probe1 1572 1588 * Called from both pcnet32_probe_vlbus and pcnet_probe_pci. 1573 1589 * pdev will be NULL when called from pcnet32_probe_vlbus. ··· 1950 1934 lp->watchdog_timer.function = (void *)&pcnet32_watchdog; 1951 1935 1952 1936 /* The PCNET32-specific entries in the device structure. */ 1953 - dev->open = &pcnet32_open; 1954 - dev->hard_start_xmit = &pcnet32_start_xmit; 1955 - dev->stop = &pcnet32_close; 1956 - dev->get_stats = &pcnet32_get_stats; 1957 - dev->set_multicast_list = &pcnet32_set_multicast_list; 1958 - dev->do_ioctl = &pcnet32_ioctl; 1937 + dev->netdev_ops = &pcnet32_netdev_ops; 1959 1938 dev->ethtool_ops = &pcnet32_ethtool_ops; 1960 - dev->tx_timeout = pcnet32_tx_timeout; 1961 1939 dev->watchdog_timeo = (5 * HZ); 1962 - 1963 - #ifdef CONFIG_NET_POLL_CONTROLLER 1964 - dev->poll_controller = pcnet32_poll_controller; 1965 - #endif 1966 1940 1967 1941 /* Fill in the generic fields of the device structure. */ 1968 1942 if (register_netdev(dev))