Pull bugzilla-7570 into release branch

[linux-2.6-omap-h63xx.git] / include / linux / xfrm.h

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 430afd05826975e4df9a65afe68e5b9729c1b11c..15ca89e9961b04b589d6c67c5387b807f377fd31 100644 (file)
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -129,7 +129,8 @@ enum
 #define XFRM_MODE_TUNNEL 1
 #define XFRM_MODE_ROUTEOPTIMIZATION 2
 #define XFRM_MODE_IN_TRIGGER 3
-#define XFRM_MODE_MAX 4
+#define XFRM_MODE_BEET 4
+#define XFRM_MODE_MAX 5
 
 /* Netlink configuration messages.  */
 enum {
@@ -177,6 +178,9 @@ enum {
        XFRM_MSG_REPORT,
 #define XFRM_MSG_REPORT XFRM_MSG_REPORT
 
+       XFRM_MSG_MIGRATE,
+#define XFRM_MSG_MIGRATE XFRM_MSG_MIGRATE
+
        __XFRM_MSG_MAX
 };
 #define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1)
@@ -210,8 +214,8 @@ struct xfrm_user_tmpl {
 
 struct xfrm_encap_tmpl {
        __u16           encap_type;
-       __u16           encap_sport;
-       __u16           encap_dport;
+       __be16          encap_sport;
+       __be16          encap_dport;
        xfrm_address_t  encap_oa;
 };
 
@@ -255,6 +259,7 @@ enum xfrm_attr_type_t {
        XFRMA_COADDR,           /* xfrm_address_t */
        XFRMA_LASTUSED,
        XFRMA_POLICY_TYPE,      /* struct xfrm_userpolicy_type */
+       XFRMA_MIGRATE,
        __XFRMA_MAX
 
 #define XFRMA_MAX (__XFRMA_MAX - 1)
@@ -288,7 +293,9 @@ struct xfrm_usersa_id {
 
 struct xfrm_aevent_id {
        struct xfrm_usersa_id           sa_id;
+       xfrm_address_t                  saddr;
        __u32                           flags;
+       __u32                           reqid;
 };
 
 struct xfrm_userspi_info {
@@ -348,13 +355,26 @@ struct xfrm_user_report {
        struct xfrm_selector            sel;
 };
 
+struct xfrm_user_migrate {
+       xfrm_address_t                  old_daddr;
+       xfrm_address_t                  old_saddr;
+       xfrm_address_t                  new_daddr;
+       xfrm_address_t                  new_saddr;
+       __u8                            proto;
+       __u8                            mode;
+       __u16                           reserved;
+       __u32                           reqid;
+       __u16                           old_family;
+       __u16                           new_family;
+};
+
 #ifndef __KERNEL__
 /* backwards compatibility for userspace */
 #define XFRMGRP_ACQUIRE                1
 #define XFRMGRP_EXPIRE         2
 #define XFRMGRP_SA             4
 #define XFRMGRP_POLICY         8
-#define XFRMGRP_REPORT         0x10
+#define XFRMGRP_REPORT         0x20
 #endif
 
 enum xfrm_nlgroups {
@@ -372,6 +392,8 @@ enum xfrm_nlgroups {
 #define XFRMNLGRP_AEVENTS      XFRMNLGRP_AEVENTS
        XFRMNLGRP_REPORT,
 #define XFRMNLGRP_REPORT       XFRMNLGRP_REPORT
+       XFRMNLGRP_MIGRATE,
+#define XFRMNLGRP_MIGRATE      XFRMNLGRP_MIGRATE
        __XFRMNLGRP_MAX
 };
 #define XFRMNLGRP_MAX  (__XFRMNLGRP_MAX - 1)