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/ppp_generic.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/ppp_generic.c')
-rw-r--r-- | drivers/net/ppp_generic.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index bad99e8cac33..1b15a088a3ba 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c | |||
@@ -972,7 +972,8 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
972 | } | 972 | } |
973 | 973 | ||
974 | static const struct net_device_ops ppp_netdev_ops = { | 974 | static const struct net_device_ops ppp_netdev_ops = { |
975 | .ndo_do_ioctl = ppp_net_ioctl, | 975 | .ndo_start_xmit = ppp_start_xmit, |
976 | .ndo_do_ioctl = ppp_net_ioctl, | ||
976 | }; | 977 | }; |
977 | 978 | ||
978 | static void ppp_setup(struct net_device *dev) | 979 | static void ppp_setup(struct net_device *dev) |
@@ -2437,8 +2438,6 @@ ppp_create_interface(int unit, int *retp) | |||
2437 | skb_queue_head_init(&ppp->mrq); | 2438 | skb_queue_head_init(&ppp->mrq); |
2438 | #endif /* CONFIG_PPP_MULTILINK */ | 2439 | #endif /* CONFIG_PPP_MULTILINK */ |
2439 | 2440 | ||
2440 | dev->hard_start_xmit = ppp_start_xmit; | ||
2441 | |||
2442 | ret = -EEXIST; | 2441 | ret = -EEXIST; |
2443 | mutex_lock(&all_ppp_mutex); | 2442 | mutex_lock(&all_ppp_mutex); |
2444 | if (unit < 0) | 2443 | if (unit < 0) |