netdev: add more functions to netdevice ops

This patch moves neigh_setup and hard_start_xmit into the network device ops
structure. For bisection, fix all the previously converted drivers as well.
Bonding driver took the biggest hit on this.

Added a prefetch of the hard_start_xmit in the fast path to try and reduce
any impact this would have.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 3 insertions, 3 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)
 static const struct net_device_ops atl1_netdev_ops = {
         .ndo_open               = atl1_open,
         .ndo_stop               = atl1_close,
+        .ndo_start_xmit         = atl1_xmit_frame,
         .ndo_set_multicast_list = atlx_set_multi,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_set_mac_address    = atl1_set_mac,
         .ndo_change_mtu         = atl1_change_mtu,
         .ndo_do_ioctl           = atlx_ioctl,
-        .ndo_tx_timeout = atlx_tx_timeout,
+        .ndo_tx_timeout         = atlx_tx_timeout,
         .ndo_vlan_rx_register   = atlx_vlan_rx_register,
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = atl1_poll_controller,
@@ -2983,7 +2984,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
         adapter->mii.reg_num_mask = 0x1f;
 
         netdev->netdev_ops = &atl1_netdev_ops;
-        netdev->hard_start_xmit = &atl1_xmit_frame;
         netdev->watchdog_timeo = 5 * HZ;
 
         netdev->ethtool_ops = &atl1_ethtool_ops;
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index b8d585722e1a..0326a84503e3 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -1315,6 +1315,7 @@ static void atl2_poll_controller(struct net_device *netdev)
 static const struct net_device_ops atl2_netdev_ops = {
         .ndo_open               = atl2_open,
         .ndo_stop               = atl2_close,
+        .ndo_start_xmit         = atl2_xmit_frame,
         .ndo_set_multicast_list = atl2_set_multi,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_set_mac_address    = atl2_set_mac,
@@ -1400,7 +1401,6 @@ static int __devinit atl2_probe(struct pci_dev *pdev,
 
         atl2_setup_pcicmd(pdev);
 
-        netdev->hard_start_xmit = &atl2_xmit_frame;
         netdev->netdev_ops = &atl2_netdev_ops;
         atl2_set_ethtool_ops(netdev);
         netdev->watchdog_timeo = 5 * HZ;