aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-09-27 18:44:54 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-28 18:02:30 -0700
commit48818f822d2b2e16f4bf4d1ed1185e7d2146dc34 (patch)
tree2dbc1c04e79f773b0805aff0da9547e857035ea1
parent9f8552996d969f56039ec88128cf5ad35b12f141 (diff)
downloadkernel_samsung_smdk4412-48818f822d2b2e16f4bf4d1ed1185e7d2146dc34.zip
kernel_samsung_smdk4412-48818f822d2b2e16f4bf4d1ed1185e7d2146dc34.tar.gz
kernel_samsung_smdk4412-48818f822d2b2e16f4bf4d1ed1185e7d2146dc34.tar.bz2
[IPV6]: struct in6_addr annotations
in6_addr elements are net-endian Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/in6.h4
-rw-r--r--include/net/ipv6.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/in6.h b/include/linux/in6.h
index d776829..348ecd4 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -32,8 +32,8 @@ struct in6_addr
union
{
__u8 u6_addr8[16];
- __u16 u6_addr16[8];
- __u32 u6_addr32[4];
+ __be16 u6_addr16[8];
+ __be32 u6_addr32[4];
} in6_u;
#define s6_addr in6_u.u6_addr8
#define s6_addr16 in6_u.u6_addr16
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 72bf47b..8223c44 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -318,8 +318,8 @@ static inline void ipv6_addr_prefix(struct in6_addr *pfx,
#ifndef __HAVE_ARCH_ADDR_SET
static inline void ipv6_addr_set(struct in6_addr *addr,
- __u32 w1, __u32 w2,
- __u32 w3, __u32 w4)
+ __be32 w1, __be32 w2,
+ __be32 w3, __be32 w4)
{
addr->s6_addr32[0] = w1;
addr->s6_addr32[1] = w2;
@@ -337,7 +337,7 @@ static inline int ipv6_addr_equal(const struct in6_addr *a1,
a1->s6_addr32[3] == a2->s6_addr32[3]);
}
-static inline int __ipv6_prefix_equal(const u32 *a1, const u32 *a2,
+static inline int __ipv6_prefix_equal(const __be32 *a1, const __be32 *a2,
unsigned int prefixlen)
{
unsigned pdw, pbi;