Skip to content

Commit

Permalink
ipv4: Fix nexthop exception hash computation.
Browse files Browse the repository at this point in the history
Need to mask it with (FNHE_HASH_SIZE - 1).

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jul 17, 2012
1 parent a6ff1a2 commit d3a25c9
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions net/ipv4/route.c
Original file line number Diff line number Diff line change
Expand Up @@ -1347,6 +1347,16 @@ static struct fib_nh_exception *fnhe_oldest(struct fnhe_hash_bucket *hash, __be3
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)
{
struct fnhe_hash_bucket *hash = nh->nh_exceptions;
Expand All @@ -1361,8 +1371,7 @@ static struct fib_nh_exception *find_or_create_fnhe(struct fib_nh *nh, __be32 da
return NULL;
}

hval = (__force u32) daddr;
hval ^= (hval >> 11) ^ (hval >> 22);
hval = fnhe_hashfun(daddr);
hash += hval;

depth = 0;
Expand Down Expand Up @@ -1890,8 +1899,7 @@ static void rt_bind_exception(struct rtable *rt, struct fib_nh *nh, __be32 daddr
struct fib_nh_exception *fnhe;
u32 hval;

hval = (__force u32) daddr;
hval ^= (hval >> 11) ^ (hval >> 22);
hval = fnhe_hashfun(daddr);

for (fnhe = rcu_dereference(hash[hval].chain); fnhe;
fnhe = rcu_dereference(fnhe->fnhe_next)) {
Expand Down

0 comments on commit d3a25c9

Please sign in to comment.