aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorAmerigo Wang <amwang@redhat.com>2012-09-17 16:16:31 -0400
committerDavid S. Miller <davem@davemloft.net>2012-09-19 17:19:09 -0400
commit8c4c49df5cfeb8d56e5b85a430c8cbcb86c2ac37 (patch)
treef57cd83822deb6f675dce888f86d007f2b9e3998 /net/core/dev.c
parent6b6e27255f29a6191ef8ad96bfcc392ab2ef6c71 (diff)
netpoll: call ->ndo_select_queue() in tx path
In netpoll tx path, we miss the chance of calling ->ndo_select_queue(), thus could cause problems when bonding is involved. This patch makes dev_pick_tx() extern (and rename it to netdev_pick_tx()) to let netpoll call it in netpoll_send_skb_on_dev(). Reported-by: Sylvain Munaut <s.munaut@whatever-company.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Signed-off-by: Cong Wang <amwang@redhat.com> Tested-by: Sylvain Munaut <s.munaut@whatever-company.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index bbda81997f4f..707b12425a79 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2396,8 +2396,8 @@ static inline int get_xps_queue(struct net_device *dev, struct sk_buff *skb)
2396#endif 2396#endif
2397} 2397}
2398 2398
2399static struct netdev_queue *dev_pick_tx(struct net_device *dev, 2399struct netdev_queue *netdev_pick_tx(struct net_device *dev,
2400 struct sk_buff *skb) 2400 struct sk_buff *skb)
2401{ 2401{
2402 int queue_index; 2402 int queue_index;
2403 const struct net_device_ops *ops = dev->netdev_ops; 2403 const struct net_device_ops *ops = dev->netdev_ops;
@@ -2571,7 +2571,7 @@ int dev_queue_xmit(struct sk_buff *skb)
2571 2571
2572 skb_update_prio(skb); 2572 skb_update_prio(skb);
2573 2573
2574 txq = dev_pick_tx(dev, skb); 2574 txq = netdev_pick_tx(dev, skb);
2575 q = rcu_dereference_bh(txq->qdisc); 2575 q = rcu_dereference_bh(txq->qdisc);
2576 2576
2577#ifdef CONFIG_NET_CLS_ACT 2577#ifdef CONFIG_NET_CLS_ACT