aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2008-11-20 23:14:53 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-20 23:14:53 -0500
commit008298231abbeb91bc7be9e8b078607b816d1a4a (patch)
tree8cb0c17720086ef97c614b96241f06aa63ce8511 /drivers/net/e1000
parent6ab33d51713d6d60c7677c0d020910a8cb37e513 (diff)
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>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index debbba390d40..5c098c9d584e 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -891,6 +891,7 @@ static int e1000_is_need_ioport(struct pci_dev *pdev)
891static const struct net_device_ops e1000_netdev_ops = { 891static const struct net_device_ops e1000_netdev_ops = {
892 .ndo_open = e1000_open, 892 .ndo_open = e1000_open,
893 .ndo_stop = e1000_close, 893 .ndo_stop = e1000_close,
894 .ndo_start_xmit = e1000_xmit_frame,
894 .ndo_get_stats = e1000_get_stats, 895 .ndo_get_stats = e1000_get_stats,
895 .ndo_set_rx_mode = e1000_set_rx_mode, 896 .ndo_set_rx_mode = e1000_set_rx_mode,
896 .ndo_set_mac_address = e1000_set_mac, 897 .ndo_set_mac_address = e1000_set_mac,
@@ -1001,7 +1002,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
1001 } 1002 }
1002 1003
1003 netdev->netdev_ops = &e1000_netdev_ops; 1004 netdev->netdev_ops = &e1000_netdev_ops;
1004 netdev->hard_start_xmit = &e1000_xmit_frame;
1005 e1000_set_ethtool_ops(netdev); 1005 e1000_set_ethtool_ops(netdev);
1006 netdev->watchdog_timeo = 5 * HZ; 1006 netdev->watchdog_timeo = 5 * HZ;
1007 netif_napi_add(netdev, &adapter->napi, e1000_clean, 64); 1007 netif_napi_add(netdev, &adapter->napi, e1000_clean, 64);