From c3363fd4d868e7489eae3502d2b117ee95252698 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:14 +0000 Subject: [PATCH] --- yaml --- r: 351378 b: refs/heads/master c: a04d40b8956010d2a6a7abc9254792c8f8649242 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/ipv6.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6bf9b41d68e7..2b06d9c3d448 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e287656b365f8db4486371c76ea54cbdbed7129c +refs/heads/master: a04d40b8956010d2a6a7abc9254792c8f8649242 diff --git a/trunk/include/net/ipv6.h b/trunk/include/net/ipv6.h index c5049b019332..77cef3321571 100644 --- a/trunk/include/net/ipv6.h +++ b/trunk/include/net/ipv6.h @@ -487,8 +487,13 @@ static inline bool ipv6_addr_loopback(const struct in6_addr *a) static inline bool ipv6_addr_v4mapped(const struct in6_addr *a) { - return (a->s6_addr32[0] | a->s6_addr32[1] | - (a->s6_addr32[2] ^ htonl(0x0000ffff))) == 0; + return ( +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 + *(__be64 *)a | +#else + (a->s6_addr32[0] | a->s6_addr32[1]) | +#endif + (a->s6_addr32[2] ^ htonl(0x0000ffff))) == 0UL; } /*