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/8139cp.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/8139cp.c')
-rw-r--r-- | drivers/net/8139cp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 13f75b67872d..f6d9d1353dd5 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c | |||
@@ -1824,6 +1824,7 @@ static const struct net_device_ops cp_netdev_ops = { | |||
1824 | .ndo_set_multicast_list = cp_set_rx_mode, | 1824 | .ndo_set_multicast_list = cp_set_rx_mode, |
1825 | .ndo_get_stats = cp_get_stats, | 1825 | .ndo_get_stats = cp_get_stats, |
1826 | .ndo_do_ioctl = cp_ioctl, | 1826 | .ndo_do_ioctl = cp_ioctl, |
1827 | .ndo_start_xmit = cp_start_xmit, | ||
1827 | .ndo_tx_timeout = cp_tx_timeout, | 1828 | .ndo_tx_timeout = cp_tx_timeout, |
1828 | #if CP_VLAN_TAG_USED | 1829 | #if CP_VLAN_TAG_USED |
1829 | .ndo_vlan_rx_register = cp_vlan_rx_register, | 1830 | .ndo_vlan_rx_register = cp_vlan_rx_register, |
@@ -1949,7 +1950,6 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1949 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | 1950 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); |
1950 | 1951 | ||
1951 | dev->netdev_ops = &cp_netdev_ops; | 1952 | dev->netdev_ops = &cp_netdev_ops; |
1952 | dev->hard_start_xmit = cp_start_xmit; | ||
1953 | netif_napi_add(dev, &cp->napi, cp_rx_poll, 16); | 1953 | netif_napi_add(dev, &cp->napi, cp_rx_poll, 16); |
1954 | dev->ethtool_ops = &cp_ethtool_ops; | 1954 | dev->ethtool_ops = &cp_ethtool_ops; |
1955 | dev->watchdog_timeo = TX_TIMEOUT; | 1955 | dev->watchdog_timeo = TX_TIMEOUT; |