summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAmerigo Wang <amwang@redhat.com>2012-09-18 00:16:31 +0400
committerDavid S. Miller <davem@davemloft.net>2012-09-20 01:19:09 +0400
commit8c4c49df5cfeb8d56e5b85a430c8cbcb86c2ac37 (patch)
treef57cd83822deb6f675dce888f86d007f2b9e3998 /include
parent6b6e27255f29a6191ef8ad96bfcc392ab2ef6c71 (diff)
downloadlinux-8c4c49df5cfeb8d56e5b85a430c8cbcb86c2ac37.tar.xz
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 'include')
-rw-r--r--include/linux/netdevice.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 82264e717e53..6c131f055ab0 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1403,6 +1403,9 @@ static inline void netdev_for_each_tx_queue(struct net_device *dev,
f(dev, &dev->_tx[i], arg);
}
+extern struct netdev_queue *netdev_pick_tx(struct net_device *dev,
+ struct sk_buff *skb);
+
/*
* Net namespace inlines
*/