From 394722a8cc57a825ca5ad2372344b2977dfe28a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?= =?UTF-8?q?=E6=98=8E?= Date: Sun, 13 Jan 2013 05:02:38 +0000 Subject: [PATCH] --- yaml --- r: 351357 b: refs/heads/master c: 2b464f61f036f7fb9cbc34710c9b2390499e87d0 h: refs/heads/master i: 351355: 408c1e11961497091c555d57c89ea4124d4d8d83 v: v3 --- [refs] | 2 +- trunk/net/ipv6/xfrm6_tunnel.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a67fab694027..9ede3d09d10d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c08977bb2b198cca1827d982b0c137458f4c2927 +refs/heads/master: 2b464f61f036f7fb9cbc34710c9b2390499e87d0 diff --git a/trunk/net/ipv6/xfrm6_tunnel.c b/trunk/net/ipv6/xfrm6_tunnel.c index ee5a7065aacc..babd1674388a 100644 --- a/trunk/net/ipv6/xfrm6_tunnel.c +++ b/trunk/net/ipv6/xfrm6_tunnel.c @@ -72,7 +72,7 @@ static inline unsigned int xfrm6_tunnel_spi_hash_byaddr(const xfrm_address_t *ad { unsigned int h; - h = (__force u32)(addr->a6[0] ^ addr->a6[1] ^ addr->a6[2] ^ addr->a6[3]); + h = ipv6_addr_hash((const struct in6_addr *)addr); h ^= h >> 16; h ^= h >> 8; h &= XFRM6_TUNNEL_SPI_BYADDR_HSIZE - 1;