From 2da2f508837d6308df771d76a737f7c09d563aa7 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 27 Jan 2009 16:27:48 -0800
Subject: [PATCH] --- yaml --- r: 133923 b: refs/heads/master c:
 f7105d63940899ece79bda024f668e6c761cfebf h: refs/heads/master i:   133921:
 93d390ea6014fdad66cd7f996f18c662719b83a6   133919:
 861298cb0ac7a9cf16c3ce54deffc8ce3d783f52 v: v3

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

diff --git a/[refs] b/[refs]
index fb0261da2248..b95aa79b45a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c8dfc830aadd978e461dad66c33741b71c6a0be
+refs/heads/master: f7105d63940899ece79bda024f668e6c761cfebf
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index b21ad0b47aae..cb8caa93caca 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1729,6 +1729,13 @@ static u16 simple_tx_hash(struct net_device *dev, struct sk_buff *skb)
 		goto out;
 	}
 
+	if (skb->sk && skb->sk->sk_hash) {
+		u32 val = skb->sk->sk_hash;
+
+		hash = jhash_1word(val, simple_tx_hashrnd);
+		goto out;
+	}
+
 	switch (skb->protocol) {
 	case htons(ETH_P_IP):
 		if (!(ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)))