From ec7ba6231263da67a1fe9296dda2fd93b7f3390b Mon Sep 17 00:00:00 2001
From: Amerigo Wang <amwang@redhat.com>
Date: Mon, 17 Sep 2012 20:16:31 +0000
Subject: [PATCH] --- yaml --- r: 328001 b: refs/heads/master c:
 8c4c49df5cfeb8d56e5b85a430c8cbcb86c2ac37 h: refs/heads/master i:   327999:
 519c6eb4fe2d28cda8d4b182597e44abe5f8df5d v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/netdevice.h | 3 +++
 trunk/net/core/dev.c            | 6 +++---
 trunk/net/core/netpoll.c        | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f4c1d0b2df75..c1249c9a358e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b6e27255f29a6191ef8ad96bfcc392ab2ef6c71
+refs/heads/master: 8c4c49df5cfeb8d56e5b85a430c8cbcb86c2ac37
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 82264e717e53..6c131f055ab0 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/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
  */
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index bbda81997f4f..707b12425a79 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2396,8 +2396,8 @@ static inline int get_xps_queue(struct net_device *dev, struct sk_buff *skb)
 #endif
 }
 
-static struct netdev_queue *dev_pick_tx(struct net_device *dev,
-					struct sk_buff *skb)
+struct netdev_queue *netdev_pick_tx(struct net_device *dev,
+				    struct sk_buff *skb)
 {
 	int queue_index;
 	const struct net_device_ops *ops = dev->netdev_ops;
@@ -2571,7 +2571,7 @@ int dev_queue_xmit(struct sk_buff *skb)
 
 	skb_update_prio(skb);
 
-	txq = dev_pick_tx(dev, skb);
+	txq = netdev_pick_tx(dev, skb);
 	q = rcu_dereference_bh(txq->qdisc);
 
 #ifdef CONFIG_NET_CLS_ACT
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
index dd67818025d1..77a0388fc3be 100644
--- a/trunk/net/core/netpoll.c
+++ b/trunk/net/core/netpoll.c
@@ -328,7 +328,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
 	if (skb_queue_len(&npinfo->txq) == 0 && !netpoll_owner_active(dev)) {
 		struct netdev_queue *txq;
 
-		txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb));
+		txq = netdev_pick_tx(dev, skb);
 
 		/* try until next clock tick */
 		for (tries = jiffies_to_usecs(1)/USEC_PER_POLL;