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/via-velocity.c | |
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/via-velocity.c')
-rw-r--r-- | drivers/net/via-velocity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 033e63a68436..58e25d090ae0 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
@@ -852,6 +852,7 @@ static int velocity_soft_reset(struct velocity_info *vptr) | |||
852 | static const struct net_device_ops velocity_netdev_ops = { | 852 | static const struct net_device_ops velocity_netdev_ops = { |
853 | .ndo_open = velocity_open, | 853 | .ndo_open = velocity_open, |
854 | .ndo_stop = velocity_close, | 854 | .ndo_stop = velocity_close, |
855 | .ndo_start_xmit = velocity_xmit, | ||
855 | .ndo_get_stats = velocity_get_stats, | 856 | .ndo_get_stats = velocity_get_stats, |
856 | .ndo_validate_addr = eth_validate_addr, | 857 | .ndo_validate_addr = eth_validate_addr, |
857 | .ndo_set_multicast_list = velocity_set_multi, | 858 | .ndo_set_multicast_list = velocity_set_multi, |
@@ -971,7 +972,6 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi | |||
971 | vptr->phy_id = MII_GET_PHY_ID(vptr->mac_regs); | 972 | vptr->phy_id = MII_GET_PHY_ID(vptr->mac_regs); |
972 | 973 | ||
973 | dev->irq = pdev->irq; | 974 | dev->irq = pdev->irq; |
974 | dev->hard_start_xmit = velocity_xmit; | ||
975 | dev->netdev_ops = &velocity_netdev_ops; | 975 | dev->netdev_ops = &velocity_netdev_ops; |
976 | dev->ethtool_ops = &velocity_ethtool_ops; | 976 | dev->ethtool_ops = &velocity_ethtool_ops; |
977 | 977 | ||