Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / linux / xfrm.h

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index b54a12940ef69cb731abb561b2ebade59febb851..46a15c7a1a13efcab599605672b206d9e078452b 100644 (file)
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -118,6 +118,10 @@ enum
        XFRM_SHARE_UNIQUE       /* Use once */
 };
 
+#define XFRM_MODE_TRANSPORT 0
+#define XFRM_MODE_TUNNEL 1
+#define XFRM_MODE_MAX 2
+
 /* Netlink configuration messages.  */
 enum {
        XFRM_MSG_BASE = 0x10,
@@ -259,8 +263,8 @@ struct xfrm_usersa_id {
 };
 
 struct xfrm_aevent_id {
-       __u32                           flags;
        struct xfrm_usersa_id           sa_id;
+       __u32                           flags;
 };
 
 struct xfrm_userspi_info {