summaryrefslogtreecommitdiff
path: root/include/net/ipv6.h
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>2013-01-14 11:10:14 +0400
committerDavid S. Miller <davem@davemloft.net>2013-01-14 22:17:00 +0400
commita04d40b8956010d2a6a7abc9254792c8f8649242 (patch)
tree29cafcaaa8ed96a4048a0feb1ca863f35b54d503 /include/net/ipv6.h
parente287656b365f8db4486371c76ea54cbdbed7129c (diff)
downloadlinux-a04d40b8956010d2a6a7abc9254792c8f8649242.tar.xz
ipv6: 64bit version of ipv6_addr_v4mapped().
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ipv6.h')
-rw-r--r--include/net/ipv6.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index c5049b019332..77cef3321571 100644
--- a/include/net/ipv6.h
+++ b/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;
}
/*