This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 2e22a99..5bd2274 100644 (file)
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -103,45 +103,26 @@ enum
 };
 
 /* Netlink configuration messages.  */
-enum {
-       XFRM_MSG_BASE = 0x10,
-
-       XFRM_MSG_NEWSA = 0x10,
-#define XFRM_MSG_NEWSA XFRM_MSG_NEWSA
-       XFRM_MSG_DELSA,
-#define XFRM_MSG_DELSA XFRM_MSG_DELSA
-       XFRM_MSG_GETSA,
-#define XFRM_MSG_GETSA XFRM_MSG_GETSA
-
-       XFRM_MSG_NEWPOLICY,
-#define XFRM_MSG_NEWPOLICY XFRM_MSG_NEWPOLICY
-       XFRM_MSG_DELPOLICY,
-#define XFRM_MSG_DELPOLICY XFRM_MSG_DELPOLICY
-       XFRM_MSG_GETPOLICY,
-#define XFRM_MSG_GETPOLICY XFRM_MSG_GETPOLICY
-
-       XFRM_MSG_ALLOCSPI,
-#define XFRM_MSG_ALLOCSPI XFRM_MSG_ALLOCSPI
-       XFRM_MSG_ACQUIRE,
-#define XFRM_MSG_ACQUIRE XFRM_MSG_ACQUIRE
-       XFRM_MSG_EXPIRE,
-#define XFRM_MSG_EXPIRE XFRM_MSG_EXPIRE
-
-       XFRM_MSG_UPDPOLICY,
-#define XFRM_MSG_UPDPOLICY XFRM_MSG_UPDPOLICY
-       XFRM_MSG_UPDSA,
-#define XFRM_MSG_UPDSA XFRM_MSG_UPDSA
-
-       XFRM_MSG_POLEXPIRE,
-#define XFRM_MSG_POLEXPIRE XFRM_MSG_POLEXPIRE
-
-       XFRM_MSG_FLUSHSA,
-#define XFRM_MSG_FLUSHSA XFRM_MSG_FLUSHSA
-       XFRM_MSG_FLUSHPOLICY,
-#define XFRM_MSG_FLUSHPOLICY XFRM_MSG_FLUSHPOLICY
-
-       XFRM_MSG_MAX
-};
+#define XFRM_MSG_BASE          0x10
+
+#define XFRM_MSG_NEWSA         (XFRM_MSG_BASE + 0)
+#define XFRM_MSG_DELSA         (XFRM_MSG_BASE + 1)
+#define XFRM_MSG_GETSA         (XFRM_MSG_BASE + 2)
+
+#define XFRM_MSG_NEWPOLICY     (XFRM_MSG_BASE + 3)
+#define XFRM_MSG_DELPOLICY     (XFRM_MSG_BASE + 4)
+#define XFRM_MSG_GETPOLICY     (XFRM_MSG_BASE + 5)
+
+#define XFRM_MSG_ALLOCSPI      (XFRM_MSG_BASE + 6)
+#define XFRM_MSG_ACQUIRE       (XFRM_MSG_BASE + 7)
+#define XFRM_MSG_EXPIRE                (XFRM_MSG_BASE + 8)
+
+#define XFRM_MSG_UPDPOLICY     (XFRM_MSG_BASE + 9)
+#define XFRM_MSG_UPDSA         (XFRM_MSG_BASE + 10)
+
+#define XFRM_MSG_POLEXPIRE     (XFRM_MSG_BASE + 11)
+
+#define XFRM_MSG_MAX           (XFRM_MSG_POLEXPIRE+1)
 
 struct xfrm_user_tmpl {
        struct xfrm_id          id;
@@ -247,10 +228,6 @@ struct xfrm_user_polexpire {
        __u8                            hard;
 };
 
-struct xfrm_usersa_flush {
-       __u8                            proto;
-};
-
 #define XFRMGRP_ACQUIRE                1
 #define XFRMGRP_EXPIRE         2