diff options
author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /net/rds/connection.c | |
parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'net/rds/connection.c')
-rw-r--r-- | net/rds/connection.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/net/rds/connection.c b/net/rds/connection.c index 378c3a6..642ad42 100644 --- a/net/rds/connection.c +++ b/net/rds/connection.c @@ -51,16 +51,10 @@ static struct kmem_cache *rds_conn_slab; static struct hlist_head *rds_conn_bucket(__be32 laddr, __be32 faddr) { - static u32 rds_hash_secret __read_mostly; - - unsigned long hash; - - net_get_random_once(&rds_hash_secret, sizeof(rds_hash_secret)); - /* Pass NULL, don't need struct net for hash */ - hash = __inet_ehashfn(be32_to_cpu(laddr), 0, - be32_to_cpu(faddr), 0, - rds_hash_secret); + unsigned long hash = inet_ehashfn(NULL, + be32_to_cpu(laddr), 0, + be32_to_cpu(faddr), 0); return &rds_conn_hash[hash & RDS_CONNECTION_HASH_MASK]; } |