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/ixgbe | |
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/ixgbe')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 7ad07a00680a..40108523377f 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -3728,6 +3728,7 @@ static int ixgbe_link_config(struct ixgbe_hw *hw) | |||
3728 | static const struct net_device_ops ixgbe_netdev_ops = { | 3728 | static const struct net_device_ops ixgbe_netdev_ops = { |
3729 | .ndo_open = ixgbe_open, | 3729 | .ndo_open = ixgbe_open, |
3730 | .ndo_stop = ixgbe_close, | 3730 | .ndo_stop = ixgbe_close, |
3731 | .ndo_start_xmit = ixgbe_xmit_frame, | ||
3731 | .ndo_get_stats = ixgbe_get_stats, | 3732 | .ndo_get_stats = ixgbe_get_stats, |
3732 | .ndo_set_multicast_list = ixgbe_set_rx_mode, | 3733 | .ndo_set_multicast_list = ixgbe_set_rx_mode, |
3733 | .ndo_validate_addr = eth_validate_addr, | 3734 | .ndo_validate_addr = eth_validate_addr, |
@@ -3824,7 +3825,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
3824 | } | 3825 | } |
3825 | 3826 | ||
3826 | netdev->netdev_ops = &ixgbe_netdev_ops; | 3827 | netdev->netdev_ops = &ixgbe_netdev_ops; |
3827 | netdev->hard_start_xmit = &ixgbe_xmit_frame; | ||
3828 | ixgbe_set_ethtool_ops(netdev); | 3828 | ixgbe_set_ethtool_ops(netdev); |
3829 | netdev->watchdog_timeo = 5 * HZ; | 3829 | netdev->watchdog_timeo = 5 * HZ; |
3830 | strcpy(netdev->name, pci_name(pdev)); | 3830 | strcpy(netdev->name, pci_name(pdev)); |