diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-14 23:23:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-14 23:23:54 -0400 |
| commit | 2aec609fb45e84d65bc8eabc7b650bbecb1cc179 (patch) | |
| tree | eb3e8a79604113392d0ee74b19dbc1dfce579c11 /include/linux/xfrm.h | |
| parent | 4c8894980010536915c4f5513ee180e3614aeca9 (diff) | |
| parent | 9076689ab07974a6f5d230fc241448f7a77e9078 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/netfilter/nf_conntrack_proto_tcp.c
Diffstat (limited to 'include/linux/xfrm.h')
| -rw-r--r-- | include/linux/xfrm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h index 2ca6bae88721..fb0c215a3051 100644 --- a/include/linux/xfrm.h +++ b/include/linux/xfrm.h | |||
| @@ -339,6 +339,7 @@ struct xfrm_usersa_info { | |||
| 339 | #define XFRM_STATE_NOPMTUDISC 4 | 339 | #define XFRM_STATE_NOPMTUDISC 4 |
| 340 | #define XFRM_STATE_WILDRECV 8 | 340 | #define XFRM_STATE_WILDRECV 8 |
| 341 | #define XFRM_STATE_ICMP 16 | 341 | #define XFRM_STATE_ICMP 16 |
| 342 | #define XFRM_STATE_AF_UNSPEC 32 | ||
| 342 | }; | 343 | }; |
| 343 | 344 | ||
| 344 | struct xfrm_usersa_id { | 345 | struct xfrm_usersa_id { |