---

yaml --- r: 351377 b: refs/heads/master c: e287656 h: refs/heads/master i: 351375: e5e3d94 v: v3
git-mirror · Jan 14, 2013 · 953824b · 953824b
1 parent 86e335f
commit 953824b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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)