diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2008-11-20 23:14:53 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-20 23:14:53 -0500 |
commit | 008298231abbeb91bc7be9e8b078607b816d1a4a (patch) | |
tree | 8cb0c17720086ef97c614b96241f06aa63ce8511 /drivers/net/ixgb | |
parent | 6ab33d51713d6d60c7677c0d020910a8cb37e513 (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/ixgb')
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index 3ca9daa70b38..a04e3892ddf4 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
@@ -324,6 +324,7 @@ ixgb_reset(struct ixgb_adapter *adapter) | |||
324 | static const struct net_device_ops ixgb_netdev_ops = { | 324 | static const struct net_device_ops ixgb_netdev_ops = { |
325 | .ndo_open = ixgb_open, | 325 | .ndo_open = ixgb_open, |
326 | .ndo_stop = ixgb_close, | 326 | .ndo_stop = ixgb_close, |
327 | .ndo_start_xmit = ixgb_xmit_frame, | ||
327 | .ndo_get_stats = ixgb_get_stats, | 328 | .ndo_get_stats = ixgb_get_stats, |
328 | .ndo_set_multicast_list = ixgb_set_multi, | 329 | .ndo_set_multicast_list = ixgb_set_multi, |
329 | .ndo_validate_addr = eth_validate_addr, | 330 | .ndo_validate_addr = eth_validate_addr, |
@@ -414,7 +415,6 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
414 | } | 415 | } |
415 | 416 | ||
416 | netdev->netdev_ops = &ixgb_netdev_ops; | 417 | netdev->netdev_ops = &ixgb_netdev_ops; |
417 | netdev->hard_start_xmit = &ixgb_xmit_frame; | ||
418 | ixgb_set_ethtool_ops(netdev); | 418 | ixgb_set_ethtool_ops(netdev); |
419 | netdev->watchdog_timeo = 5 * HZ; | 419 | netdev->watchdog_timeo = 5 * HZ; |
420 | netif_napi_add(netdev, &adapter->napi, ixgb_clean, 64); | 420 | netif_napi_add(netdev, &adapter->napi, ixgb_clean, 64); |