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/enic | |
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/enic')
-rw-r--r-- | drivers/net/enic/enic_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 40f8c88b166d..1c409df735d4 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c | |||
@@ -1593,6 +1593,7 @@ static void enic_iounmap(struct enic *enic) | |||
1593 | static const struct net_device_ops enic_netdev_ops = { | 1593 | static const struct net_device_ops enic_netdev_ops = { |
1594 | .ndo_open = enic_open, | 1594 | .ndo_open = enic_open, |
1595 | .ndo_stop = enic_stop, | 1595 | .ndo_stop = enic_stop, |
1596 | .ndo_start_xmit = enic_hard_start_xmit, | ||
1596 | .ndo_get_stats = enic_get_stats, | 1597 | .ndo_get_stats = enic_get_stats, |
1597 | .ndo_validate_addr = eth_validate_addr, | 1598 | .ndo_validate_addr = eth_validate_addr, |
1598 | .ndo_set_multicast_list = enic_set_multicast_list, | 1599 | .ndo_set_multicast_list = enic_set_multicast_list, |
@@ -1830,7 +1831,6 @@ static int __devinit enic_probe(struct pci_dev *pdev, | |||
1830 | } | 1831 | } |
1831 | 1832 | ||
1832 | netdev->netdev_ops = &enic_netdev_ops; | 1833 | netdev->netdev_ops = &enic_netdev_ops; |
1833 | netdev->hard_start_xmit = enic_hard_start_xmit; | ||
1834 | netdev->watchdog_timeo = 2 * HZ; | 1834 | netdev->watchdog_timeo = 2 * HZ; |
1835 | netdev->ethtool_ops = &enic_ethtool_ops; | 1835 | netdev->ethtool_ops = &enic_ethtool_ops; |
1836 | 1836 | ||