summaryrefslogtreecommitdiffstats
path: root/net/rds
diff options
context:
space:
mode:
authorHannes Frederic Sowa <hannes@stressinduktion.org>2013-10-19 21:48:51 +0200
committerDavid S. Miller <davem@davemloft.net>2013-10-20 01:45:34 +0200
commit65cd8033ff375b68037df61603ee68070dc48578 (patch)
tree26b34f9ed023dda5a861001118a1ea1227ae252f /net/rds
parentMerge branch 'ipip_gso' (diff)
downloadlinux-65cd8033ff375b68037df61603ee68070dc48578.tar.xz
linux-65cd8033ff375b68037df61603ee68070dc48578.zip
ipv4: split inet_ehashfn to hash functions per compilation unit
This duplicates a bit of code but let's us easily introduce separate secret keys later. The separate compilation units are ipv4/inet_hashtabbles.o, ipv4/udp.o and rds/connection.o. Cc: Eric Dumazet <edumazet@google.com> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds')
-rw-r--r--net/rds/connection.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/rds/connection.c b/net/rds/connection.c
index 642ad42c416b..45e23660437a 100644
--- a/net/rds/connection.c
+++ b/net/rds/connection.c
@@ -52,9 +52,9 @@ static struct kmem_cache *rds_conn_slab;
static struct hlist_head *rds_conn_bucket(__be32 laddr, __be32 faddr)
{
/* Pass NULL, don't need struct net for hash */
- unsigned long hash = inet_ehashfn(NULL,
- be32_to_cpu(laddr), 0,
- be32_to_cpu(faddr), 0);
+ unsigned long hash = __inet_ehashfn(be32_to_cpu(laddr), 0,
+ be32_to_cpu(faddr), 0,
+ inet_ehash_secret);
return &rds_conn_hash[hash & RDS_CONNECTION_HASH_MASK];
}