From 953824bfa8544518f5a13705a947af195154d232 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: Mon, 14 Jan 2013 07:10:06 +0000 Subject: [PATCH] --- yaml --- r: 351377 b: refs/heads/master c: e287656b365f8db4486371c76ea54cbdbed7129c h: refs/heads/master i: 351375: e5e3d94cce0f526f9148e00fdba1b8fafacb3413 v: v3 --- [refs] | 2 +- trunk/include/net/ipv6.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9259a95be57b..6bf9b41d68e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f2e73345ad9466618edfec35d98c074f2e0570d +refs/heads/master: e287656b365f8db4486371c76ea54cbdbed7129c diff --git a/trunk/include/net/ipv6.h b/trunk/include/net/ipv6.h index ace1113bef85..c5049b019332 100644 --- a/trunk/include/net/ipv6.h +++ b/trunk/include/net/ipv6.h @@ -475,8 +475,14 @@ static inline u32 ipv6_addr_hash(const struct in6_addr *a) static inline bool ipv6_addr_loopback(const struct in6_addr *a) { +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 + const unsigned long *ul = (const unsigned long *)a; + + return (ul[0] | (ul[1] ^ cpu_to_be64(1))) == 0UL; +#else return (a->s6_addr32[0] | a->s6_addr32[1] | a->s6_addr32[2] | (a->s6_addr32[3] ^ htonl(1))) == 0; +#endif } static inline bool ipv6_addr_v4mapped(const struct in6_addr *a)