---

yaml --- r: 221616 b: refs/heads/master c: df32cc1 h: refs/heads/master v: v3
git-mirror · Nov 1, 2010 · e81de21 · e81de21
1 parent 1c6aa8e
commit e81de21
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 315daea9481277d9b8109b47e974835a901e4bc5
+refs/heads/master: df32cc193ad88f7b1326b90af799c927b27f7654
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -2131,7 +2131,7 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev,
 	} else {
 		struct sock *sk = skb->sk;
 		queue_index = sk_tx_queue_get(sk);
-		if (queue_index < 0) {
+		if (queue_index < 0 || queue_index >= dev->real_num_tx_queues) {
 
 			queue_index = 0;
 			if (dev->real_num_tx_queues > 1)