diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-08 00:23:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-02 21:21:17 -0800 |
| commit | d5a0a1e3109339090769e40fdaa62482fcf2a717 (patch) | |
| tree | e151364d1930a90c551faae4fd85fb6fcd88baa3 /include/linux | |
| parent | 4806126d78345ad8a99bca1367a8a39c08e19393 (diff) | |
| download | op-kernel-dev-d5a0a1e3109339090769e40fdaa62482fcf2a717.zip op-kernel-dev-d5a0a1e3109339090769e40fdaa62482fcf2a717.tar.gz | |
[IPV4]: encapsulation annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_tunnel.h | 8 | ||||
| -rw-r--r-- | include/linux/xfrm.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h index bef9f8f..8de079b 100644 --- a/include/linux/if_tunnel.h +++ b/include/linux/if_tunnel.h @@ -19,10 +19,10 @@ struct ip_tunnel_parm { char name[IFNAMSIZ]; int link; - __u16 i_flags; - __u16 o_flags; - __u32 i_key; - __u32 o_key; + __be16 i_flags; + __be16 o_flags; + __be32 i_key; + __be32 o_key; struct iphdr iph; }; diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h index 8ae7f74..7907c42 100644 --- a/include/linux/xfrm.h +++ b/include/linux/xfrm.h @@ -211,8 +211,8 @@ struct xfrm_user_tmpl { struct xfrm_encap_tmpl { __u16 encap_type; - __u16 encap_sport; - __u16 encap_dport; + __be16 encap_sport; + __be16 encap_dport; xfrm_address_t encap_oa; }; |
