---

yaml --- r: 150085 b: refs/heads/master c: 513de11 h: refs/heads/master i: 150083: 2491200 v: v3
git-mirror · May 3, 2009 · 838f69e · 838f69e
1 parent 91e7bd6
commit 838f69e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: accc5b4f902b0ba83b2c6c48f2d9e7c204cef4a8
+refs/heads/master: 513de11bba246b7a67df4c314d9fc936b6a75d0e
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -1735,8 +1735,12 @@ u16 skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb)
 {
 	u32 hash;
 
-	if (skb_rx_queue_recorded(skb))
-		return skb_get_rx_queue(skb) % dev->real_num_tx_queues;
+	if (skb_rx_queue_recorded(skb)) {
+		hash = skb_get_rx_queue(skb);
+		while (unlikely (hash >= dev->real_num_tx_queues))
+			hash -= dev->real_num_tx_queues;
+		return hash;
+	}
 
 	if (skb->sk && skb->sk->sk_hash)
 		hash = skb->sk->sk_hash;