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

starfire: 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
4fc8006e e287157f

+22 -12
+22 -12
drivers/net/starfire.c
··· 648 648 #endif /* VLAN_SUPPORT */ 649 649 650 650 651 + static const struct net_device_ops netdev_ops = { 652 + .ndo_open = netdev_open, 653 + .ndo_stop = netdev_close, 654 + .ndo_start_xmit = start_tx, 655 + .ndo_tx_timeout = tx_timeout, 656 + .ndo_get_stats = get_stats, 657 + .ndo_set_multicast_list = &set_rx_mode, 658 + .ndo_do_ioctl = netdev_ioctl, 659 + .ndo_change_mtu = eth_change_mtu, 660 + .ndo_set_mac_address = eth_mac_addr, 661 + .ndo_validate_addr = eth_validate_addr, 662 + #ifdef VLAN_SUPPORT 663 + .ndo_vlan_rx_register = netdev_vlan_rx_register, 664 + .ndo_vlan_rx_add_vid = netdev_vlan_rx_add_vid, 665 + .ndo_vlan_rx_kill_vid = netdev_vlan_rx_kill_vid, 666 + #endif 667 + }; 668 + 651 669 static int __devinit starfire_init_one(struct pci_dev *pdev, 652 670 const struct pci_device_id *ent) 653 671 { ··· 728 710 if (enable_hw_cksum) 729 711 dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG; 730 712 #endif /* ZEROCOPY */ 713 + 731 714 #ifdef VLAN_SUPPORT 732 715 dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER; 733 - dev->vlan_rx_register = netdev_vlan_rx_register; 734 - dev->vlan_rx_add_vid = netdev_vlan_rx_add_vid; 735 - dev->vlan_rx_kill_vid = netdev_vlan_rx_kill_vid; 736 716 #endif /* VLAN_RX_KILL_VID */ 737 717 #ifdef ADDR_64BITS 738 718 dev->features |= NETIF_F_HIGHDMA; ··· 826 810 } 827 811 } 828 812 829 - /* The chip-specific entries in the device structure. */ 830 - dev->open = &netdev_open; 831 - dev->hard_start_xmit = &start_tx; 832 - dev->tx_timeout = tx_timeout; 813 + dev->netdev_ops = &netdev_ops; 833 814 dev->watchdog_timeo = TX_TIMEOUT; 834 - netif_napi_add(dev, &np->napi, netdev_poll, max_interrupt_work); 835 - dev->stop = &netdev_close; 836 - dev->get_stats = &get_stats; 837 - dev->set_multicast_list = &set_rx_mode; 838 - dev->do_ioctl = &netdev_ioctl; 839 815 SET_ETHTOOL_OPS(dev, &ethtool_ops); 816 + 817 + netif_napi_add(dev, &np->napi, netdev_poll, max_interrupt_work); 840 818 841 819 if (mtu) 842 820 dev->mtu = mtu;