aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2006-12-03 01:05:08 -0500
committerDavid S. Miller <davem@davemloft.net>2006-12-03 01:05:08 -0500
commitbff9a89bcac5b68ac0a1ea856b1726a35ae1eabb (patch)
tree188356d5411849c8d7b1a36dcb3223373a0bbb68 /include/net
parentf9aae95828d3478520f4bd73221bcb450ec1a5c0 (diff)
[NETFILTER]: nf_conntrack: endian annotations
Resync with Al Viro's ip_conntrack annotations and fix a missed spot in ip_nat_proto_icmp.c. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netfilter/nf_conntrack_tuple.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/net/netfilter/nf_conntrack_tuple.h b/include/net/netfilter/nf_conntrack_tuple.h
index 530ef1f75283..be9dc9a0eb77 100644
--- a/include/net/netfilter/nf_conntrack_tuple.h
+++ b/include/net/netfilter/nf_conntrack_tuple.h
@@ -26,8 +26,8 @@
26 network order! */ 26 network order! */
27union nf_conntrack_man_l3proto { 27union nf_conntrack_man_l3proto {
28 u_int32_t all[NF_CT_TUPLE_L3SIZE]; 28 u_int32_t all[NF_CT_TUPLE_L3SIZE];
29 u_int32_t ip; 29 __be32 ip;
30 u_int32_t ip6[4]; 30 __be32 ip6[4];
31}; 31};
32 32
33/* The protocol-specific manipulable parts of the tuple: always in 33/* The protocol-specific manipulable parts of the tuple: always in
@@ -38,16 +38,16 @@ union nf_conntrack_man_proto
38 u_int16_t all; 38 u_int16_t all;
39 39
40 struct { 40 struct {
41 u_int16_t port; 41 __be16 port;
42 } tcp; 42 } tcp;
43 struct { 43 struct {
44 u_int16_t port; 44 __be16 port;
45 } udp; 45 } udp;
46 struct { 46 struct {
47 u_int16_t id; 47 __be16 id;
48 } icmp; 48 } icmp;
49 struct { 49 struct {
50 u_int16_t port; 50 __be16 port;
51 } sctp; 51 } sctp;
52}; 52};
53 53
@@ -77,16 +77,16 @@ struct nf_conntrack_tuple
77 u_int16_t all; 77 u_int16_t all;
78 78
79 struct { 79 struct {
80 u_int16_t port; 80 __be16 port;
81 } tcp; 81 } tcp;
82 struct { 82 struct {
83 u_int16_t port; 83 __be16 port;
84 } udp; 84 } udp;
85 struct { 85 struct {
86 u_int8_t type, code; 86 u_int8_t type, code;
87 } icmp; 87 } icmp;
88 struct { 88 struct {
89 u_int16_t port; 89 __be16 port;
90 } sctp; 90 } sctp;
91 } u; 91 } u;
92 92