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/e100.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/e100.c')
-rw-r--r-- | drivers/net/e100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 5894716de19f..2001a63794f5 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -2615,6 +2615,7 @@ static int e100_close(struct net_device *netdev) | |||
2615 | static const struct net_device_ops e100_netdev_ops = { | 2615 | static const struct net_device_ops e100_netdev_ops = { |
2616 | .ndo_open = e100_open, | 2616 | .ndo_open = e100_open, |
2617 | .ndo_stop = e100_close, | 2617 | .ndo_stop = e100_close, |
2618 | .ndo_start_xmit = e100_xmit_frame, | ||
2618 | .ndo_validate_addr = eth_validate_addr, | 2619 | .ndo_validate_addr = eth_validate_addr, |
2619 | .ndo_set_multicast_list = e100_set_multicast_list, | 2620 | .ndo_set_multicast_list = e100_set_multicast_list, |
2620 | .ndo_set_mac_address = e100_set_mac_address, | 2621 | .ndo_set_mac_address = e100_set_mac_address, |
@@ -2640,7 +2641,6 @@ static int __devinit e100_probe(struct pci_dev *pdev, | |||
2640 | } | 2641 | } |
2641 | 2642 | ||
2642 | netdev->netdev_ops = &e100_netdev_ops; | 2643 | netdev->netdev_ops = &e100_netdev_ops; |
2643 | netdev->hard_start_xmit = e100_xmit_frame; | ||
2644 | SET_ETHTOOL_OPS(netdev, &e100_ethtool_ops); | 2644 | SET_ETHTOOL_OPS(netdev, &e100_ethtool_ops); |
2645 | netdev->watchdog_timeo = E100_WATCHDOG_PERIOD; | 2645 | netdev->watchdog_timeo = E100_WATCHDOG_PERIOD; |
2646 | strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); | 2646 | strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); |