diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-28 21:06:58 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-28 21:06:58 +0100 |
| commit | 2c2aba6c561ac425602f4a0be61422224cb87151 (patch) | |
| tree | 30b5f2c40b823ca61e2e0930d5e98a89a83222bb /net/ipv4/arp.c | |
| parent | netrom: avoid overflows in nr_setsockopt() (diff) | |
| download | linux-2c2aba6c561ac425602f4a0be61422224cb87151.tar.xz linux-2c2aba6c561ac425602f4a0be61422224cb87151.zip | |
ipv6: Use universal hash for NDISC.
In order to perform a proper universal hash on a vector of integers,
we have to use different universal hashes on each vector element.
Which means we need 4 different hash randoms for ipv6.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/arp.c')
| -rw-r--r-- | net/ipv4/arp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index 381a0876c363..59402be133f0 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -121,7 +121,7 @@ /* * Interface to generic neighbour cache. */ -static u32 arp_hash(const void *pkey, const struct net_device *dev, __u32 rnd); +static u32 arp_hash(const void *pkey, const struct net_device *dev, __u32 *hash_rnd); static int arp_constructor(struct neighbour *neigh); static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb); static void arp_error_report(struct neighbour *neigh, struct sk_buff *skb); @@ -215,9 +215,9 @@ int arp_mc_map(__be32 addr, u8 *haddr, struct net_device *dev, int dir) static u32 arp_hash(const void *pkey, const struct net_device *dev, - __u32 hash_rnd) + __u32 *hash_rnd) { - return arp_hashfn(*(u32 *)pkey, dev, hash_rnd); + return arp_hashfn(*(u32 *)pkey, dev, *hash_rnd); } static int arp_constructor(struct neighbour *neigh) |