From e2de5f717d97a56df9da6c380b98e652f6adee38 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 13 Jul 2010 05:24:20 +0000
Subject: [PATCH] --- yaml --- r: 201084 b: refs/heads/master c:
 87fd308cfc6b2e880bf717a740bd5c58d2aed10c h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/net/core/dev.c | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index af72bbe29a96..2cc7f0588302 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a047bf87b1b6f69c62ab9fb28072c639cb7e2fa
+refs/heads/master: 87fd308cfc6b2e880bf717a740bd5c58d2aed10c
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 723a34710ad4..4b05fdf762ab 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1911,8 +1911,16 @@ static int dev_gso_segment(struct sk_buff *skb)
  */
 static inline void skb_orphan_try(struct sk_buff *skb)
 {
-	if (!skb_tx(skb)->flags)
+	struct sock *sk = skb->sk;
+
+	if (sk && !skb_tx(skb)->flags) {
+		/* skb_tx_hash() wont be able to get sk.
+		 * We copy sk_hash into skb->rxhash
+		 */
+		if (!skb->rxhash)
+			skb->rxhash = sk->sk_hash;
 		skb_orphan(skb);
+	}
 }
 
 int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
@@ -1998,8 +2006,7 @@ u16 skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb)
 	if (skb->sk && skb->sk->sk_hash)
 		hash = skb->sk->sk_hash;
 	else
-		hash = (__force u16) skb->protocol;
-
+		hash = (__force u16) skb->protocol ^ skb->rxhash;
 	hash = jhash_1word(hash, hashrnd);
 
 	return (u16) (((u64) hash * dev->real_num_tx_queues) >> 32);