diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 11:03:07 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 11:03:07 +0200 |
| commit | 8a229ae2d652b42437863787cfc28f7f8a78a35d (patch) | |
| tree | 9b3b8f31202f5ec2e3963e48d2cf7afd7a719ac8 /include | |
| parent | ac5ad2a19b7c3ffa766309c5ef3de0c79fa076c4 (diff) | |
| parent | 2e54c4fb47ffcc687457f9bcd9bba895f2a84963 (diff) | |
| download | kernel_samsung_crespo-8a229ae2d652b42437863787cfc28f7f8a78a35d.zip kernel_samsung_crespo-8a229ae2d652b42437863787cfc28f7f8a78a35d.tar.gz kernel_samsung_crespo-8a229ae2d652b42437863787cfc28f7f8a78a35d.tar.bz2 | |
Merge commit '2e54c4f' into HEAD
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/xfrm.h | 2 | ||||
| -rw-r--r-- | include/net/xfrm.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h index 22e61fd..28e493b 100644 --- a/include/linux/xfrm.h +++ b/include/linux/xfrm.h @@ -84,6 +84,8 @@ struct xfrm_replay_state { __u32 bitmap; }; +#define XFRMA_REPLAY_ESN_MAX 4096 + struct xfrm_replay_state_esn { unsigned int bmp_len; __u32 oseq; diff --git a/include/net/xfrm.h b/include/net/xfrm.h index b203e14..921f627 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -269,6 +269,9 @@ struct xfrm_replay { int (*check)(struct xfrm_state *x, struct sk_buff *skb, __be32 net_seq); + int (*recheck)(struct xfrm_state *x, + struct sk_buff *skb, + __be32 net_seq); void (*notify)(struct xfrm_state *x, int event); int (*overflow)(struct xfrm_state *x, struct sk_buff *skb); }; |