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/8139too.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/8139too.c')
-rw-r--r-- | drivers/net/8139too.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index f8866552386a..445a479db79d 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
@@ -921,6 +921,7 @@ static const struct net_device_ops rtl8139_netdev_ops = { | |||
921 | .ndo_stop = rtl8139_close, | 921 | .ndo_stop = rtl8139_close, |
922 | .ndo_get_stats = rtl8139_get_stats, | 922 | .ndo_get_stats = rtl8139_get_stats, |
923 | .ndo_validate_addr = eth_validate_addr, | 923 | .ndo_validate_addr = eth_validate_addr, |
924 | .ndo_start_xmit = rtl8139_start_xmit, | ||
924 | .ndo_set_multicast_list = rtl8139_set_rx_mode, | 925 | .ndo_set_multicast_list = rtl8139_set_rx_mode, |
925 | .ndo_do_ioctl = netdev_ioctl, | 926 | .ndo_do_ioctl = netdev_ioctl, |
926 | .ndo_tx_timeout = rtl8139_tx_timeout, | 927 | .ndo_tx_timeout = rtl8139_tx_timeout, |
@@ -992,7 +993,6 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev, | |||
992 | dev->netdev_ops = &rtl8139_netdev_ops; | 993 | dev->netdev_ops = &rtl8139_netdev_ops; |
993 | dev->ethtool_ops = &rtl8139_ethtool_ops; | 994 | dev->ethtool_ops = &rtl8139_ethtool_ops; |
994 | dev->watchdog_timeo = TX_TIMEOUT; | 995 | dev->watchdog_timeo = TX_TIMEOUT; |
995 | dev->hard_start_xmit = rtl8139_start_xmit; | ||
996 | netif_napi_add(dev, &tp->napi, rtl8139_poll, 64); | 996 | netif_napi_add(dev, &tp->napi, rtl8139_poll, 64); |
997 | 997 | ||
998 | /* note: the hardware is not capable of sg/csum/highdma, however | 998 | /* note: the hardware is not capable of sg/csum/highdma, however |