dev_vdbg(), available with -DVERBOSE_DEBUG

[karo-tx-linux.git] / include / linux / pfkeyv2.h

diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h
index d5dd471da22527132782c1a0837d1c4c22167544..d9db5f62ee4878d1cb71f6da1587a76cbce50ff5 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 */
@@ -251,7 +251,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 +286,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 +298,7 @@ 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_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 */