diff options
Diffstat (limited to 'drivers/net/atlx/atl1.c')
-rw-r--r-- | drivers/net/atlx/atl1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 7a0fb04e3480..aef7e47fdd24 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
@@ -2883,12 +2883,13 @@ static void atl1_poll_controller(struct net_device *netdev) | |||
2883 | static const struct net_device_ops atl1_netdev_ops = { | 2883 | static const struct net_device_ops atl1_netdev_ops = { |
2884 | .ndo_open = atl1_open, | 2884 | .ndo_open = atl1_open, |
2885 | .ndo_stop = atl1_close, | 2885 | .ndo_stop = atl1_close, |
2886 | .ndo_start_xmit = atl1_xmit_frame, | ||
2886 | .ndo_set_multicast_list = atlx_set_multi, | 2887 | .ndo_set_multicast_list = atlx_set_multi, |
2887 | .ndo_validate_addr = eth_validate_addr, | 2888 | .ndo_validate_addr = eth_validate_addr, |
2888 | .ndo_set_mac_address = atl1_set_mac, | 2889 | .ndo_set_mac_address = atl1_set_mac, |
2889 | .ndo_change_mtu = atl1_change_mtu, | 2890 | .ndo_change_mtu = atl1_change_mtu, |
2890 | .ndo_do_ioctl = atlx_ioctl, | 2891 | .ndo_do_ioctl = atlx_ioctl, |
2891 | .ndo_tx_timeout = atlx_tx_timeout, | 2892 | .ndo_tx_timeout = atlx_tx_timeout, |
2892 | .ndo_vlan_rx_register = atlx_vlan_rx_register, | 2893 | .ndo_vlan_rx_register = atlx_vlan_rx_register, |
2893 | #ifdef CONFIG_NET_POLL_CONTROLLER | 2894 | #ifdef CONFIG_NET_POLL_CONTROLLER |
2894 | .ndo_poll_controller = atl1_poll_controller, | 2895 | .ndo_poll_controller = atl1_poll_controller, |
@@ -2983,7 +2984,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev, | |||
2983 | adapter->mii.reg_num_mask = 0x1f; | 2984 | adapter->mii.reg_num_mask = 0x1f; |
2984 | 2985 | ||
2985 | netdev->netdev_ops = &atl1_netdev_ops; | 2986 | netdev->netdev_ops = &atl1_netdev_ops; |
2986 | netdev->hard_start_xmit = &atl1_xmit_frame; | ||
2987 | netdev->watchdog_timeo = 5 * HZ; | 2987 | netdev->watchdog_timeo = 5 * HZ; |
2988 | 2988 | ||
2989 | netdev->ethtool_ops = &atl1_ethtool_ops; | 2989 | netdev->ethtool_ops = &atl1_ethtool_ops; |