Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

1 files changed, 47 insertions, 0 deletions

diff --git a/include/uapi/linux/ipsec.h b/include/uapi/linux/ipsec.h
new file mode 100644
index 000000000000..d17a6302a0e9
--- /dev/null
+++ b/include/uapi/linux/ipsec.h
@@ -0,0 +1,47 @@
+#ifndef _LINUX_IPSEC_H
+#define _LINUX_IPSEC_H
+
+/* The definitions, required to talk to KAME racoon IKE. */
+
+#include <linux/pfkeyv2.h>
+
+#define IPSEC_PORT_ANY          0
+#define IPSEC_ULPROTO_ANY       255
+#define IPSEC_PROTO_ANY         255
+
+enum {
+        IPSEC_MODE_ANY          = 0,    /* We do not support this for SA */
+        IPSEC_MODE_TRANSPORT    = 1,
+        IPSEC_MODE_TUNNEL       = 2,
+        IPSEC_MODE_BEET         = 3
+};
+
+enum {
+        IPSEC_DIR_ANY           = 0,
+        IPSEC_DIR_INBOUND       = 1,
+        IPSEC_DIR_OUTBOUND      = 2,
+        IPSEC_DIR_FWD           = 3,    /* It is our own */
+        IPSEC_DIR_MAX           = 4,
+        IPSEC_DIR_INVALID       = 5
+};
+
+enum {
+        IPSEC_POLICY_DISCARD    = 0,
+        IPSEC_POLICY_NONE       = 1,
+        IPSEC_POLICY_IPSEC      = 2,
+        IPSEC_POLICY_ENTRUST    = 3,
+        IPSEC_POLICY_BYPASS     = 4
+};
+
+enum {
+        IPSEC_LEVEL_DEFAULT     = 0,
+        IPSEC_LEVEL_USE         = 1,
+        IPSEC_LEVEL_REQUIRE     = 2,
+        IPSEC_LEVEL_UNIQUE      = 3
+};
+
+#define IPSEC_MANUAL_REQID_MAX  0x3fff
+
+#define IPSEC_REPLAYWSIZE  32
+
+#endif  /* _LINUX_IPSEC_H */