1 files changed, 13 insertions, 1 deletions

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index b58adc52448d..e31b8c84f2c9 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -91,8 +91,15 @@ struct xfrm_replay_state
 };
 
 struct xfrm_algo {
+        char            alg_name[64];
+        unsigned int    alg_key_len;    /* in bits */
+        char            alg_key[0];
+};
+
+struct xfrm_algo_aead {
         char    alg_name[64];
-        int     alg_key_len;    /* in bits */
+        int     alg_key_len;    /* in bits */
+        int     alg_icv_len;    /* in bits */
         char    alg_key[0];
 };
 
@@ -114,6 +121,7 @@ enum
         XFRM_POLICY_IN  = 0,
         XFRM_POLICY_OUT = 1,
         XFRM_POLICY_FWD = 2,
+        XFRM_POLICY_MASK = 3,
         XFRM_POLICY_MAX = 3
 };
 
@@ -269,6 +277,7 @@ enum xfrm_attr_type_t {
         XFRMA_LASTUSED,
         XFRMA_POLICY_TYPE,      /* struct xfrm_userpolicy_type */
         XFRMA_MIGRATE,
+        XFRMA_ALG_AEAD,         /* struct xfrm_algo_aead */
         __XFRMA_MAX
 
 #define XFRMA_MAX (__XFRMA_MAX - 1)
@@ -328,6 +337,7 @@ struct xfrm_usersa_info {
 #define XFRM_STATE_DECAP_DSCP   2
 #define XFRM_STATE_NOPMTUDISC   4
 #define XFRM_STATE_WILDRECV     8
+#define XFRM_STATE_ICMP         16
 };
 
 struct xfrm_usersa_id {
@@ -362,6 +372,8 @@ struct xfrm_userpolicy_info {
 #define XFRM_POLICY_BLOCK       1
         __u8                            flags;
 #define XFRM_POLICY_LOCALOK     1       /* Allow user to override global policy */
+        /* Automatically expand selector to include matching ICMP payloads. */
+#define XFRM_POLICY_ICMP        2
         __u8                            share;
 };