aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/route.c
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>2013-01-13 05:02:29 +0000
committerDavid S. Miller <davem@davemloft.net>2013-01-13 20:17:14 -0500
commitc08977bb2b198cca1827d982b0c137458f4c2927 (patch)
treed089cba65a2c187f91e261a02bc1605a2b1ce635 /net/ipv6/route.c
parentipv6: Make ipv6_is_mld() inline and use it from ip6_mc_input(). (diff)
downloadlinux-dev-c08977bb2b198cca1827d982b0c137458f4c2927.tar.xz
linux-dev-c08977bb2b198cca1827d982b0c137458f4c2927.zip
ipv6 route: Use ipv6_addr_hash() in rt6_info_hash_nhsfn().
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--net/ipv6/route.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 6238eb5037a7..34f392f050c1 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -388,15 +388,8 @@ static int rt6_info_hash_nhsfn(unsigned int candidate_count,
{
unsigned int val = fl6->flowi6_proto;
- val ^= (__force u32)fl6->daddr.s6_addr32[0];
- val ^= (__force u32)fl6->daddr.s6_addr32[1];
- val ^= (__force u32)fl6->daddr.s6_addr32[2];
- val ^= (__force u32)fl6->daddr.s6_addr32[3];
-
- val ^= (__force u32)fl6->saddr.s6_addr32[0];
- val ^= (__force u32)fl6->saddr.s6_addr32[1];
- val ^= (__force u32)fl6->saddr.s6_addr32[2];
- val ^= (__force u32)fl6->saddr.s6_addr32[3];
+ val ^= ipv6_addr_hash(&fl6->daddr);
+ val ^= ipv6_addr_hash(&fl6->saddr);
/* Work only if this not encapsulated */
switch (fl6->flowi6_proto) {