diff options
| author | Neil Brown <neilb@suse.de> | 2008-07-11 07:57:40 -0400 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2008-07-11 07:57:40 -0400 |
| commit | 0306d5efbf897c7d410fd30b89fc7d97372aa501 (patch) | |
| tree | 668811bca39ca7c1585da88d52ec2f0a43216c0e /include/linux/xfrm.h | |
| parent | f9f278fefdbbbf198bb4111b3fba47d9043dae59 (diff) | |
| parent | e5a5816f7875207cb0a0a7032e39a4686c5e10a4 (diff) | |
Merge branch 'master' into for-next
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 { |