diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2003-04-30 19:24:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2003-04-30 19:24:42 -0700 |
| commit | f48b1d88fa6e2aa368202b77e5da3c4ea0979edb (patch) | |
| tree | 24392a9fc59f2cbf2a06c3115f982a309010b16a /include/net | |
| parent | eb0a5728e048e61e7802a0aa3e1dcd9d0353e78f (diff) | |
| parent | 9f8fbf3081bb50522945a0315fb6b6621665548b (diff) | |
Merge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5
into kernel.bkbits.net:/home/davem/net-2.5
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip.h | 1 | ||||
| -rw-r--r-- | include/net/xfrm.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index da0dab10f4f0..25e95ec9b4fb 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -47,6 +47,7 @@ struct inet_skb_parm #define IPSKB_MASQUERADED 1 #define IPSKB_TRANSLATED 2 #define IPSKB_FORWARDED 4 +#define IPSKB_XFRM_TUNNEL_SIZE 8 }; struct ipcm_cookie diff --git a/include/net/xfrm.h b/include/net/xfrm.h index b3a67d100b4d..f478323f39b0 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -760,6 +760,7 @@ extern int xfrm4_rcv(struct sk_buff *skb); extern int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type); extern int xfrm4_tunnel_register(struct xfrm_tunnel *handler); extern int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler); +extern int xfrm4_tunnel_check_size(struct sk_buff *skb); extern int xfrm6_rcv(struct sk_buff **pskb, unsigned int *nhoffp); extern int xfrm6_clear_mutable_options(struct sk_buff *skb, u16 *nh_offset, int dir); extern int xfrm_user_policy(struct sock *sk, int optname, u8 *optval, int optlen); |