1 files changed, 4 insertions, 4 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 44f1b673f916..88df8fc814e4 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -35,9 +35,9 @@ struct prefix_info {
 #else
 #error "Please fix <asm/byteorder.h>"
 #endif
-        __u32                   valid;
+        __be32                  valid;
-        __u32                   prefered;
+        __be32                  prefered;
-        __u32                   reserved2;
+        __be32                  reserved2;
        struct in6_addr         prefix;
 };
@@ -183,7 +183,7 @@ static __inline__ u8 ipv6_addr_hash(const struct in6_addr *addr)
         * This will include the IEEE address token on links that support it.
         */
-        word = addr->s6_addr32[2] ^ addr->s6_addr32[3];
+        word = (__force u32)(addr->s6_addr32[2] ^ addr->s6_addr32[3]);
        word ^= (word >> 16);
        word ^= (word >> 8);

diff --git a/include/net/addrconf.h b/include/net/addrconf.h index 44f1b673f916..88df8fc814e4 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h
@@ -35,9 +35,9 @@ struct prefix_info {
35	#else	35	#else
36	#error "Please fix <asm/byteorder.h>"	36	#error "Please fix <asm/byteorder.h>"
37	#endif	37	#endif
38	__u32 valid;	38	__be32 valid;
39	__u32 prefered;	39	__be32 prefered;
40	__u32 reserved2;	40	__be32 reserved2;
41		41
42	struct in6_addr prefix;	42	struct in6_addr prefix;
43	};	43	};
@@ -183,7 +183,7 @@ static __inline__ u8 ipv6_addr_hash(const struct in6_addr *addr)
183	* This will include the IEEE address token on links that support it.	183	* This will include the IEEE address token on links that support it.
184	*/	184	*/
185		185
186	word = addr->s6_addr32[2] ^ addr->s6_addr32[3];	186	word = (__force u32)(addr->s6_addr32[2] ^ addr->s6_addr32[3]);
187	word ^= (word >> 16);	187	word ^= (word >> 16);
188	word ^= (word >> 8);	188	word ^= (word >> 8);
189		189