aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-08 03:25:17 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:21:21 -0500
commit90bcaf7b4a33bb9b100cc06869f0c033a870d4a0 (patch)
treefb8307b99fd9779d17fdfb0c35d836a8438d424a /include/net
parent92d9ece7af9c84bfbd1ff640926fac5b573a09f7 (diff)
[IPV6]: flowlabels are net-endian
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/flow.h2
-rw-r--r--include/net/ipv6.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/flow.h b/include/net/flow.h
index 5cda27cd9deb..270d4c1761af 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -27,7 +27,7 @@ struct flowi {
27 struct in6_addr daddr; 27 struct in6_addr daddr;
28 struct in6_addr saddr; 28 struct in6_addr saddr;
29 __u32 fwmark; 29 __u32 fwmark;
30 __u32 flowlabel; 30 __be32 flowlabel;
31 } ip6_u; 31 } ip6_u;
32 32
33 struct { 33 struct {
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 4953fac1d070..0b8c9b990ac4 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -191,7 +191,7 @@ struct ipv6_txoptions
191struct ip6_flowlabel 191struct ip6_flowlabel
192{ 192{
193 struct ip6_flowlabel *next; 193 struct ip6_flowlabel *next;
194 u32 label; 194 __be32 label;
195 struct in6_addr dst; 195 struct in6_addr dst;
196 struct ipv6_txoptions *opt; 196 struct ipv6_txoptions *opt;
197 atomic_t users; 197 atomic_t users;
@@ -211,7 +211,7 @@ struct ipv6_fl_socklist
211 struct ip6_flowlabel *fl; 211 struct ip6_flowlabel *fl;
212}; 212};
213 213
214extern struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, u32 label); 214extern struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, __be32 label);
215extern struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions * opt_space, 215extern struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions * opt_space,
216 struct ip6_flowlabel * fl, 216 struct ip6_flowlabel * fl,
217 struct ipv6_txoptions * fopt); 217 struct ipv6_txoptions * fopt);