aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/addrconf.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-14 20:56:00 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-02 21:22:52 -0800
commite69a4adc669fe210817ec50ae3f9a7a5ad62d4e8 (patch)
treede4666cd772f02aac4cbacf11251faeb54e99d1d /include/net/addrconf.h
parentb09b845ca6724c3bbdc00c0cb2313258c7189ca9 (diff)
downloadkernel_samsung_aries-e69a4adc669fe210817ec50ae3f9a7a5ad62d4e8.zip
kernel_samsung_aries-e69a4adc669fe210817ec50ae3f9a7a5ad62d4e8.tar.gz
kernel_samsung_aries-e69a4adc669fe210817ec50ae3f9a7a5ad62d4e8.tar.bz2
[IPV6]: Misc endianness annotations.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/addrconf.h')
-rw-r--r--include/net/addrconf.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 44f1b67..88df8fc 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;
- __u32 prefered;
- __u32 reserved2;
+ __be32 valid;
+ __be32 prefered;
+ __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);