From dbc934d545a25bd94a870cb6e043a0ac4ad1cd00 Mon Sep 17 00:00:00 2001
From: Joy Latten <latten@austin.ibm.com>
Date: Thu, 30 Nov 2006 15:50:43 -0600
Subject: [PATCH] --- yaml --- r: 43183 b: refs/heads/master c:
 c9204d9ca79baac564b49d36d0228a69d7ded084 h: refs/heads/master i:   43181:
 18be4f9a7d3fd0e3a9b2e28106fd0552496816cf   43179:
 da599207b8e6fc9c19709694b1f6aaa6685b8bb5   43175:
 e052d35df088ed7bd5dc37b8b2b6a7c3fb4379e0   43167:
 e1b981dbea59e3ac9ba30cf65e439e1ef9f5f22a v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/xfrm.h     | 7 ++++++-
 trunk/net/xfrm/xfrm_policy.c | 2 ++
 trunk/net/xfrm/xfrm_state.c  | 1 -
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e3bc02aed893..5269758654ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 161a09e737f0761ca064ee6a907313402f7a54b6
+refs/heads/master: c9204d9ca79baac564b49d36d0228a69d7ded084
diff --git a/trunk/include/net/xfrm.h b/trunk/include/net/xfrm.h
index f699cdcab406..e4765413cf80 100644
--- a/trunk/include/net/xfrm.h
+++ b/trunk/include/net/xfrm.h
@@ -398,8 +398,13 @@ struct xfrm_audit
 	uid_t	loginuid;
 	u32	secid;
 };
-void xfrm_audit_log(uid_t auid, u32 secid, int type, int result,
+
+#ifdef CONFIG_AUDITSYSCALL
+extern void xfrm_audit_log(uid_t auid, u32 secid, int type, int result,
 		    struct xfrm_policy *xp, struct xfrm_state *x);
+#else
+#define xfrm_audit_log(a,s,t,r,p,x) do { ; } while (0)
+#endif /* CONFIG_AUDITSYSCALL */
 
 static inline void xfrm_pol_hold(struct xfrm_policy *policy)
 {
diff --git a/trunk/net/xfrm/xfrm_policy.c b/trunk/net/xfrm/xfrm_policy.c
index 47c13649bac1..140bb9b384ac 100644
--- a/trunk/net/xfrm/xfrm_policy.c
+++ b/trunk/net/xfrm/xfrm_policy.c
@@ -1986,6 +1986,7 @@ int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first,
 
 EXPORT_SYMBOL(xfrm_bundle_ok);
 
+#ifdef CONFIG_AUDITSYSCALL
 /* Audit addition and deletion of SAs and ipsec policy */
 
 void xfrm_audit_log(uid_t auid, u32 sid, int type, int result,
@@ -2094,6 +2095,7 @@ void xfrm_audit_log(uid_t auid, u32 sid, int type, int result,
 }
 
 EXPORT_SYMBOL(xfrm_audit_log);
+#endif /* CONFIG_AUDITSYSCALL */
 
 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
 {
diff --git a/trunk/net/xfrm/xfrm_state.c b/trunk/net/xfrm/xfrm_state.c
index d5d3a6f1f609..fdb08d9f34aa 100644
--- a/trunk/net/xfrm/xfrm_state.c
+++ b/trunk/net/xfrm/xfrm_state.c
@@ -407,7 +407,6 @@ void xfrm_state_flush(u8 proto, struct xfrm_audit *audit_info)
 				xfrm_state_hold(x);
 				spin_unlock_bh(&xfrm_state_lock);
 
-				xfrm_state_delete(x);
 				err = xfrm_state_delete(x);
 				xfrm_audit_log(audit_info->loginuid,
 					       audit_info->secid,