From e59bfb1947ae1cfca94b3b489a5418f3adcc5805 Mon Sep 17 00:00:00 2001
From: Chema Gonzalez <chema@google.com>
Date: Fri, 7 Sep 2012 13:40:50 +0000
Subject: [PATCH] --- yaml --- r: 322788 b: refs/heads/master c:
 6862234238e84648c305526af2edd98badcad1e0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b93db474fcc1..007f991655c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 777bf135b77071672662c67f0abffcf433450d68
+refs/heads/master: 6862234238e84648c305526af2edd98badcad1e0
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 83988362805e..d7fe32c946c1 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2647,15 +2647,16 @@ void __skb_get_rxhash(struct sk_buff *skb)
 	if (!skb_flow_dissect(skb, &keys))
 		return;
 
-	if (keys.ports) {
-		if ((__force u16)keys.port16[1] < (__force u16)keys.port16[0])
-			swap(keys.port16[0], keys.port16[1]);
+	if (keys.ports)
 		skb->l4_rxhash = 1;
-	}
 
 	/* get a consistent hash (same value on both flow directions) */
-	if ((__force u32)keys.dst < (__force u32)keys.src)
+	if (((__force u32)keys.dst < (__force u32)keys.src) ||
+	    (((__force u32)keys.dst == (__force u32)keys.src) &&
+	     ((__force u16)keys.port16[1] < (__force u16)keys.port16[0]))) {
 		swap(keys.dst, keys.src);
+		swap(keys.port16[0], keys.port16[1]);
+	}
 
 	hash = jhash_3words((__force u32)keys.dst,
 			    (__force u32)keys.src,