diff options
| author | Florian Westphal <fw@strlen.de> | 2017-04-16 02:55:09 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-18 13:49:14 -0400 |
| commit | 5f8ddeab10ce45d3d3de8ae7ea8811512845c497 (patch) | |
| tree | 41fe63ac1297c07eee1ea140ee4ddceae417e5d5 /lib | |
| parent | 3a9ca1e2cba02365d93a8cf7bdda04c05a637f1b (diff) | |
| download | linux-stable-5f8ddeab10ce45d3d3de8ae7ea8811512845c497.tar.gz linux-stable-5f8ddeab10ce45d3d3de8ae7ea8811512845c497.tar.bz2 linux-stable-5f8ddeab10ce45d3d3de8ae7ea8811512845c497.zip | |
rhashtable: remove insecure_elasticity
commit 83e7e4ce9e93c3 ("mac80211: Use rhltable instead of rhashtable")
removed the last user that made use of 'insecure_elasticity' parameter,
i.e. the default of 16 is used everywhere.
Replace it with a constant.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rhashtable.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/lib/rhashtable.c b/lib/rhashtable.c index f8635fd57442..d22a5ef109fb 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -535,7 +535,7 @@ static void *rhashtable_lookup_one(struct rhashtable *ht, struct rhash_head *head; int elasticity; - elasticity = ht->elasticity; + elasticity = RHT_ELASTICITY; pprev = rht_bucket_var(tbl, hash); rht_for_each_continue(head, *pprev, tbl, hash) { struct rhlist_head *list; @@ -972,21 +972,6 @@ int rhashtable_init(struct rhashtable *ht, if (params->nelem_hint) size = rounded_hashtable_size(&ht->p); - /* The maximum (not average) chain length grows with the - * size of the hash table, at a rate of (log N)/(log log N). - * The value of 16 is selected so that even if the hash - * table grew to 2^32 you would not expect the maximum - * chain length to exceed it unless we are under attack - * (or extremely unlucky). - * - * As this limit is only to detect attacks, we don't need - * to set it to a lower value as you'd need the chain - * length to vastly exceed 16 to have any real effect - * on the system. - */ - if (!params->insecure_elasticity) - ht->elasticity = 16; - if (params->locks_mul) ht->p.locks_mul = roundup_pow_of_two(params->locks_mul); else |