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/skge.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/skge.c')
-rw-r--r-- | drivers/net/skge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 93c1b1d92962..f73ee7974003 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
@@ -3805,6 +3805,7 @@ static __exit void skge_debug_cleanup(void) | |||
3805 | static const struct net_device_ops skge_netdev_ops = { | 3805 | static const struct net_device_ops skge_netdev_ops = { |
3806 | .ndo_open = skge_up, | 3806 | .ndo_open = skge_up, |
3807 | .ndo_stop = skge_down, | 3807 | .ndo_stop = skge_down, |
3808 | .ndo_start_xmit = skge_xmit_frame, | ||
3808 | .ndo_do_ioctl = skge_ioctl, | 3809 | .ndo_do_ioctl = skge_ioctl, |
3809 | .ndo_get_stats = skge_get_stats, | 3810 | .ndo_get_stats = skge_get_stats, |
3810 | .ndo_tx_timeout = skge_tx_timeout, | 3811 | .ndo_tx_timeout = skge_tx_timeout, |
@@ -3831,7 +3832,6 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port, | |||
3831 | } | 3832 | } |
3832 | 3833 | ||
3833 | SET_NETDEV_DEV(dev, &hw->pdev->dev); | 3834 | SET_NETDEV_DEV(dev, &hw->pdev->dev); |
3834 | dev->hard_start_xmit = skge_xmit_frame; | ||
3835 | dev->netdev_ops = &skge_netdev_ops; | 3835 | dev->netdev_ops = &skge_netdev_ops; |
3836 | dev->ethtool_ops = &skge_ethtool_ops; | 3836 | dev->ethtool_ops = &skge_ethtool_ops; |
3837 | dev->watchdog_timeo = TX_WATCHDOG; | 3837 | dev->watchdog_timeo = TX_WATCHDOG; |