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

mlx4: convert to net_device_ops

Convert driver to new net_device_ops. Compile tested only.

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
3addc568 8126089f

+19 -15
+19 -15
drivers/net/mlx4/en_netdev.c
··· 953 953 return 0; 954 954 } 955 955 956 + static const struct net_device_ops mlx4_netdev_ops = { 957 + .ndo_open = mlx4_en_open, 958 + .ndo_stop = mlx4_en_close, 959 + .ndo_start_xmit = mlx4_en_xmit, 960 + .ndo_get_stats = mlx4_en_get_stats, 961 + .ndo_set_multicast_list = mlx4_en_set_multicast, 962 + .ndo_set_mac_address = mlx4_en_set_mac, 963 + .ndo_change_mtu = mlx4_en_change_mtu, 964 + .ndo_tx_timeout = mlx4_en_tx_timeout, 965 + .ndo_vlan_rx_register = mlx4_en_vlan_rx_register, 966 + .ndo_vlan_rx_add_vid = mlx4_en_vlan_rx_add_vid, 967 + .ndo_vlan_rx_kill_vid = mlx4_en_vlan_rx_kill_vid, 968 + #ifdef CONFIG_NET_POLL_CONTROLLER 969 + .ndo_poll_controller = mlx4_en_netpoll, 970 + #endif 971 + }; 972 + 956 973 int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, 957 974 struct mlx4_en_port_profile *prof) 958 975 { ··· 1046 1029 /* 1047 1030 * Initialize netdev entry points 1048 1031 */ 1049 - 1050 - dev->open = &mlx4_en_open; 1051 - dev->stop = &mlx4_en_close; 1052 - dev->hard_start_xmit = &mlx4_en_xmit; 1053 - dev->get_stats = &mlx4_en_get_stats; 1054 - dev->set_multicast_list = &mlx4_en_set_multicast; 1055 - dev->set_mac_address = &mlx4_en_set_mac; 1056 - dev->change_mtu = &mlx4_en_change_mtu; 1057 - dev->tx_timeout = &mlx4_en_tx_timeout; 1032 + dev->netdev_ops = &mlx4_netdev_ops; 1058 1033 dev->watchdog_timeo = MLX4_EN_WATCHDOG_TIMEOUT; 1059 - dev->vlan_rx_register = mlx4_en_vlan_rx_register; 1060 - dev->vlan_rx_add_vid = mlx4_en_vlan_rx_add_vid; 1061 - dev->vlan_rx_kill_vid = mlx4_en_vlan_rx_kill_vid; 1062 - #ifdef CONFIG_NET_POLL_CONTROLLER 1063 - dev->poll_controller = mlx4_en_netpoll; 1064 - #endif 1034 + 1065 1035 SET_ETHTOOL_OPS(dev, &mlx4_en_ethtool_ops); 1066 1036 1067 1037 /* Set defualt MAC */