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/igb | |
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/igb')
-rw-r--r-- | drivers/net/igb/igb_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index ceb0a0458796..eca5684d5655 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -953,6 +953,7 @@ static int igb_is_need_ioport(struct pci_dev *pdev) | |||
953 | static const struct net_device_ops igb_netdev_ops = { | 953 | static const struct net_device_ops igb_netdev_ops = { |
954 | .ndo_open = igb_open, | 954 | .ndo_open = igb_open, |
955 | .ndo_stop = igb_close, | 955 | .ndo_stop = igb_close, |
956 | .ndo_start_xmit = igb_xmit_frame_adv, | ||
956 | .ndo_get_stats = igb_get_stats, | 957 | .ndo_get_stats = igb_get_stats, |
957 | .ndo_set_multicast_list = igb_set_multi, | 958 | .ndo_set_multicast_list = igb_set_multi, |
958 | .ndo_set_mac_address = igb_set_mac, | 959 | .ndo_set_mac_address = igb_set_mac, |
@@ -1080,7 +1081,6 @@ static int __devinit igb_probe(struct pci_dev *pdev, | |||
1080 | netdev->netdev_ops = &igb_netdev_ops; | 1081 | netdev->netdev_ops = &igb_netdev_ops; |
1081 | igb_set_ethtool_ops(netdev); | 1082 | igb_set_ethtool_ops(netdev); |
1082 | netdev->watchdog_timeo = 5 * HZ; | 1083 | netdev->watchdog_timeo = 5 * HZ; |
1083 | netdev->hard_start_xmit = &igb_xmit_frame_adv; | ||
1084 | 1084 | ||
1085 | strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); | 1085 | strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); |
1086 | 1086 | ||