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>

1 files changed, 19 insertions, 3 deletions

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index dd2e1f670b0d..0d7e5750245a 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5412,6 +5412,23 @@ static const struct net_device_ops nv_netdev_ops = {
         .ndo_open               = nv_open,
         .ndo_stop               = nv_close,
         .ndo_get_stats          = nv_get_stats,
+        .ndo_start_xmit         = nv_start_xmit,
+        .ndo_tx_timeout         = nv_tx_timeout,
+        .ndo_change_mtu         = nv_change_mtu,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_set_mac_address    = nv_set_mac_address,
+        .ndo_set_multicast_list = nv_set_multicast,
+        .ndo_vlan_rx_register   = nv_vlan_rx_register,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller    = nv_poll_controller,
+#endif
+};
+
+static const struct net_device_ops nv_netdev_ops_optimized = {
+        .ndo_open               = nv_open,
+        .ndo_stop               = nv_close,
+        .ndo_get_stats          = nv_get_stats,
+        .ndo_start_xmit         = nv_start_xmit_optimized,
         .ndo_tx_timeout         = nv_tx_timeout,
         .ndo_change_mtu         = nv_change_mtu,
         .ndo_validate_addr      = eth_validate_addr,
@@ -5592,11 +5609,10 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                 goto out_freering;
 
         if (!nv_optimized(np))
-                dev->hard_start_xmit = nv_start_xmit;
+                dev->netdev_ops = &nv_netdev_ops;
         else
-                dev->hard_start_xmit = nv_start_xmit_optimized;
+                dev->netdev_ops = &nv_netdev_ops_optimized;
 
-        dev->netdev_ops = &nv_netdev_ops;
 #ifdef CONFIG_FORCEDETH_NAPI
         netif_napi_add(dev, &np->napi, nv_napi_poll, RX_WORK_PER_LOOP);
 #endif