---

yaml --- r: 133923 b: refs/heads/master c: f7105d6 h: refs/heads/master i: 133921: 93d390e 133919: 861298c v: v3
git-mirror · Jan 28, 2009 · 2da2f50 · 2da2f50
1 parent 406c3f7
commit 2da2f50
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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)))