X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fxfrm.h;fp=include%2Flinux%2Fxfrm.h;h=82fbb758e28f398bbcc0e2a3728a433d81ea6f82;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=46a15c7a1a13efcab599605672b206d9e078452b;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 46a15c7a1..82fbb758e 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -118,10 +118,6 @@ 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,
@@ -160,10 +156,6 @@ enum {
 	XFRM_MSG_FLUSHPOLICY,
 #define XFRM_MSG_FLUSHPOLICY XFRM_MSG_FLUSHPOLICY
 
-	XFRM_MSG_NEWAE,
-#define XFRM_MSG_NEWAE XFRM_MSG_NEWAE
-	XFRM_MSG_GETAE,
-#define XFRM_MSG_GETAE XFRM_MSG_GETAE
 	__XFRM_MSG_MAX
 };
 #define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1)
@@ -202,21 +194,6 @@ struct xfrm_encap_tmpl {
 	xfrm_address_t	encap_oa;
 };
 
-/* AEVENT flags  */
-enum xfrm_ae_ftype_t {
-	XFRM_AE_UNSPEC,
-	XFRM_AE_RTHR=1,	/* replay threshold*/
-	XFRM_AE_RVAL=2, /* replay value */
-	XFRM_AE_LVAL=4, /* lifetime value */
-	XFRM_AE_ETHR=8, /* expiry timer threshold */
-	XFRM_AE_CR=16, /* Event cause is replay update */
-	XFRM_AE_CE=32, /* Event cause is timer expiry */
-	XFRM_AE_CU=64, /* Event cause is policy update */
-	__XFRM_AE_MAX
-
-#define XFRM_AE_MAX (__XFRM_AE_MAX - 1)
-};
-
 /* Netlink message attributes.  */
 enum xfrm_attr_type_t {
 	XFRMA_UNSPEC,
@@ -228,10 +205,6 @@ enum xfrm_attr_type_t {
 	XFRMA_SA,
 	XFRMA_POLICY,
 	XFRMA_SEC_CTX,		/* struct xfrm_sec_ctx */
-	XFRMA_LTIME_VAL,
-	XFRMA_REPLAY_VAL,
-	XFRMA_REPLAY_THRESH,
-	XFRMA_ETIMER_THRESH,
 	__XFRMA_MAX
 
 #define XFRMA_MAX (__XFRMA_MAX - 1)
@@ -262,11 +235,6 @@ struct xfrm_usersa_id {
 	__u8				proto;
 };
 
-struct xfrm_aevent_id {
-	struct xfrm_usersa_id		sa_id;
-	__u32				flags;
-};
-
 struct xfrm_userspi_info {
 	struct xfrm_usersa_info		info;
 	__u32				min;
@@ -338,8 +306,6 @@ enum xfrm_nlgroups {
 #define XFRMNLGRP_SA		XFRMNLGRP_SA
 	XFRMNLGRP_POLICY,
 #define XFRMNLGRP_POLICY	XFRMNLGRP_POLICY
-	XFRMNLGRP_AEVENTS,
-#define XFRMNLGRP_AEVENTS	XFRMNLGRP_AEVENTS
 	__XFRMNLGRP_MAX
 };
 #define XFRMNLGRP_MAX	(__XFRMNLGRP_MAX - 1)