evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ipv4: Fix nexthop exception hash computation.

Browse source 
Need to mask it with (FNHE_HASH_SIZE - 1).

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2012-07-17 13:23:08 -07:00
parent a6ff1a2f1e
commit d3a25c980f
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/ipv4/route.c
View file

@ -1347,6 +1347,16 @@ static struct fib_nh_exception *fnhe_oldest(struct fnhe_hash_bucket *hash, __be3
return oldest; return oldest;
} }
static inline u32 fnhe_hashfun(__be32 daddr)
{
u32 hval;
hval = (__force u32) daddr;
hval ^= (hval >> 11) ^ (hval >> 22);
return hval & (FNHE_HASH_SIZE - 1);
}
static struct fib_nh_exception *find_or_create_fnhe(struct fib_nh *nh, __be32 daddr) static struct fib_nh_exception *find_or_create_fnhe(struct fib_nh *nh, __be32 daddr)
{ {
struct fnhe_hash_bucket *hash = nh->nh_exceptions; struct fnhe_hash_bucket *hash = nh->nh_exceptions;
@ -1361,8 +1371,7 @@ static struct fib_nh_exception *find_or_create_fnhe(struct fib_nh *nh, __be32 da
return NULL; return NULL;
} }
hval = (__force u32) daddr; hval = fnhe_hashfun(daddr);
hval ^= (hval >> 11) ^ (hval >> 22);
hash += hval; hash += hval;
depth = 0; depth = 0;
@ -1890,8 +1899,7 @@ static void rt_bind_exception(struct rtable *rt, struct fib_nh *nh, __be32 daddr
struct fib_nh_exception *fnhe; struct fib_nh_exception *fnhe;
u32 hval; u32 hval;
hval = (__force u32) daddr; hval = fnhe_hashfun(daddr);
hval ^= (hval >> 11) ^ (hval >> 22);
for (fnhe = rcu_dereference(hash[hval].chain); fnhe; for (fnhe = rcu_dereference(hash[hval].chain); fnhe;
fnhe = rcu_dereference(fnhe->fnhe_next)) { fnhe = rcu_dereference(fnhe->fnhe_next)) {