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/e1000e | |
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/e1000e')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index ced839e4cae8..cc0502bbb9ff 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -4707,6 +4707,7 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter) | |||
4707 | static const struct net_device_ops e1000e_netdev_ops = { | 4707 | static const struct net_device_ops e1000e_netdev_ops = { |
4708 | .ndo_open = e1000_open, | 4708 | .ndo_open = e1000_open, |
4709 | .ndo_stop = e1000_close, | 4709 | .ndo_stop = e1000_close, |
4710 | .ndo_start_xmit = e1000_xmit_frame, | ||
4710 | .ndo_get_stats = e1000_get_stats, | 4711 | .ndo_get_stats = e1000_get_stats, |
4711 | .ndo_set_multicast_list = e1000_set_multi, | 4712 | .ndo_set_multicast_list = e1000_set_multi, |
4712 | .ndo_set_mac_address = e1000_set_mac, | 4713 | .ndo_set_mac_address = e1000_set_mac, |
@@ -4822,7 +4823,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev, | |||
4822 | 4823 | ||
4823 | /* construct the net_device struct */ | 4824 | /* construct the net_device struct */ |
4824 | netdev->netdev_ops = &e1000e_netdev_ops; | 4825 | netdev->netdev_ops = &e1000e_netdev_ops; |
4825 | netdev->hard_start_xmit = &e1000_xmit_frame; | ||
4826 | e1000e_set_ethtool_ops(netdev); | 4826 | e1000e_set_ethtool_ops(netdev); |
4827 | netdev->watchdog_timeo = 5 * HZ; | 4827 | netdev->watchdog_timeo = 5 * HZ; |
4828 | netif_napi_add(netdev, &adapter->napi, e1000_clean, 64); | 4828 | netif_napi_add(netdev, &adapter->napi, e1000_clean, 64); |