rcu: Teach RCU that idle task is not quiscent state at boot

[safe/jmp/linux-2.6] / include / linux / pfkeyv2.h

diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h
index d5dd471..01b2629 100644 (file)
--- a/include/linux/pfkeyv2.h
+++ b/include/linux/pfkeyv2.h
@@ -32,7 +32,7 @@ struct sadb_ext {
 struct sadb_sa {
        uint16_t        sadb_sa_len;
        uint16_t        sadb_sa_exttype;
-       uint32_t        sadb_sa_spi;
+       __be32          sadb_sa_spi;
        uint8_t         sadb_sa_replay;
        uint8_t         sadb_sa_state;
        uint8_t         sadb_sa_auth;
@@ -211,7 +211,7 @@ struct sadb_x_nat_t_type {
 struct sadb_x_nat_t_port {
        uint16_t        sadb_x_nat_t_port_len;
        uint16_t        sadb_x_nat_t_port_exttype;
-       uint16_t        sadb_x_nat_t_port_port;
+       __be16          sadb_x_nat_t_port_port;
        uint16_t        sadb_x_nat_t_port_reserved;
 } __attribute__((packed));
 /* sizeof(struct sadb_x_nat_t_port) == 8 */
@@ -226,6 +226,15 @@ struct sadb_x_sec_ctx {
 } __attribute__((packed));
 /* sizeof(struct sadb_sec_ctx) = 8 */
 
+/* Used by MIGRATE to pass addresses IKE will use to perform
+ * negotiation with the peer */
+struct sadb_x_kmaddress {
+       uint16_t        sadb_x_kmaddress_len;
+       uint16_t        sadb_x_kmaddress_exttype;
+       uint32_t        sadb_x_kmaddress_reserved;
+} __attribute__((packed));
+/* sizeof(struct sadb_x_kmaddress) == 8 */
+
 /* Message types */
 #define SADB_RESERVED          0
 #define SADB_GETSPI            1
@@ -251,7 +260,8 @@ struct sadb_x_sec_ctx {
 #define SADB_X_SPDEXPIRE       21
 #define SADB_X_SPDDELETE2      22
 #define SADB_X_NAT_T_NEW_MAPPING       23
-#define SADB_MAX               23
+#define SADB_X_MIGRATE         24
+#define SADB_MAX               24
 
 /* Security Association flags */
 #define SADB_SAFLAGS_PFS       1
@@ -285,6 +295,7 @@ struct sadb_x_sec_ctx {
 #define SADB_X_AALG_SHA2_384HMAC       6
 #define SADB_X_AALG_SHA2_512HMAC       7
 #define SADB_X_AALG_RIPEMD160HMAC      8
+#define SADB_X_AALG_AES_XCBC_MAC       9
 #define SADB_X_AALG_NULL               251     /* kame */
 #define SADB_AALG_MAX                  251
 
@@ -296,6 +307,14 @@ struct sadb_x_sec_ctx {
 #define SADB_X_EALG_BLOWFISHCBC                7
 #define SADB_EALG_NULL                 11
 #define SADB_X_EALG_AESCBC             12
+#define SADB_X_EALG_AESCTR             13
+#define SADB_X_EALG_AES_CCM_ICV8       14
+#define SADB_X_EALG_AES_CCM_ICV12      15
+#define SADB_X_EALG_AES_CCM_ICV16      16
+#define SADB_X_EALG_AES_GCM_ICV8       18
+#define SADB_X_EALG_AES_GCM_ICV12      19
+#define SADB_X_EALG_AES_GCM_ICV16      20
+#define SADB_X_EALG_CAMELLIACBC                22
 #define SADB_EALG_MAX                   253 /* last EALG */
 /* private allocations should use 249-255 (RFC2407) */
 #define SADB_X_EALG_SERPENTCBC  252     /* draft-ietf-ipsec-ciph-aes-cbc-00 */
@@ -336,7 +355,9 @@ struct sadb_x_sec_ctx {
 #define SADB_X_EXT_NAT_T_DPORT         22
 #define SADB_X_EXT_NAT_T_OA            23
 #define SADB_X_EXT_SEC_CTX             24
-#define SADB_EXT_MAX                   24
+/* Used with MIGRATE to pass @ to IKE for negotiation */
+#define SADB_X_EXT_KMADDRESS           25
+#define SADB_EXT_MAX                   25
 
 /* Identity Extension values */
 #define SADB_IDENTTYPE_RESERVED        0