From 99baf5442d7314d6e8fa53d69b9dc23d39070e05 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 13 Nov 2009 21:54:04 +0000
Subject: [PATCH] --- yaml --- r: 171551 b: refs/heads/master c:
 ed04642f753b1240fc65c2978b7365e93209972a h: refs/heads/master i:   171549:
 2ee2c0c2e108e2f1e9b9f13687f6bdb09320e8e7   171547:
 2529c1096c51f69be225778afd5c26b8a7cdcb2d   171543:
 0292edb8e7fb1bee5097e169198cba6826eb5b32   171535:
 33925475af7d92247fa75ae5619a0e5ec74d1d77   171519:
 bfc86208a1f22038333901cb41c9045b7402e14a v: v3

---
 [refs]               |  2 +-
 trunk/net/core/dev.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 39be693c7490..55b3eb25bb96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c2b5bdee125d840b2023dcc7625353c8e5bb10c
+refs/heads/master: ed04642f753b1240fc65c2978b7365e93209972a
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 548340b57296..32045df1da5c 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1848,6 +1848,20 @@ u16 skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb)
 }
 EXPORT_SYMBOL(skb_tx_hash);
 
+static inline u16 dev_cap_txqueue(struct net_device *dev, u16 queue_index)
+{
+	if (unlikely(queue_index >= dev->real_num_tx_queues)) {
+		if (net_ratelimit()) {
+			WARN(1, "%s selects TX queue %d, but "
+			     "real number of TX queues is %d\n",
+			     dev->name, queue_index,
+			     dev->real_num_tx_queues);
+		}
+		return 0;
+	}
+	return queue_index;
+}
+
 static struct netdev_queue *dev_pick_tx(struct net_device *dev,
 					struct sk_buff *skb)
 {
@@ -1861,6 +1875,7 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev,
 
 		if (ops->ndo_select_queue) {
 			queue_index = ops->ndo_select_queue(dev, skb);
+			queue_index = dev_cap_txqueue(dev, queue_index);
 		} else {
 			queue_index = 0;
 			if (dev->real_num_tx_queues > 1)