From 5f35fc483039fb494ba8ab099a668d04403dfaee Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 4 Mar 2008 14:28:41 -0800 Subject: [PATCH] --- yaml --- r: 86909 b: refs/heads/master c: 7adc3830f90df04a13366914d80a3ed407db5381 h: refs/heads/master i: 86907: 05f0512682d0b43f4c838fd46a79251eb09def52 v: v3 --- [refs] | 2 +- trunk/include/net/inet_sock.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f15144fc18fe..efbc9c3ea725 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9452e9f81e997cbd0c9bface8d2c2a4b064cc3e +refs/heads/master: 7adc3830f90df04a13366914d80a3ed407db5381 diff --git a/trunk/include/net/inet_sock.h b/trunk/include/net/inet_sock.h index 70013c5f4e59..89cd011edb99 100644 --- a/trunk/include/net/inet_sock.h +++ b/trunk/include/net/inet_sock.h @@ -175,7 +175,8 @@ extern void build_ehash_secret(void); static inline unsigned int inet_ehashfn(const __be32 laddr, const __u16 lport, const __be32 faddr, const __be16 fport) { - return jhash_2words((__force __u32) laddr ^ (__force __u32) faddr, + return jhash_3words((__force __u32) laddr, + (__force __u32) faddr, ((__u32) lport) << 16 | (__force __u32)fport, inet_ehash_secret); }