From 6839f4d2812af6821fc29079b5a1c7d94b121bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Thu, 8 Apr 2010 11:27:42 -0700
Subject: [PATCH] --- yaml --- r: 194008 b: refs/heads/master c:
 e4077e018b5ead3de9951fc01d8bf12eeeeeefed h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/xfrm.h | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 2452bc3409ae..ed8ee7864a01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a5bff744a6263d397f88671ed2f772da9c64989
+refs/heads/master: e4077e018b5ead3de9951fc01d8bf12eeeeeefed
diff --git a/trunk/include/net/xfrm.h b/trunk/include/net/xfrm.h
index 625dd61ccbba..cccb049991a9 100644
--- a/trunk/include/net/xfrm.h
+++ b/trunk/include/net/xfrm.h
@@ -735,19 +735,12 @@ static inline void xfrm_pol_put(struct xfrm_policy *policy)
 		xfrm_policy_destroy(policy);
 }
 
-#ifdef CONFIG_XFRM_SUB_POLICY
 static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols)
 {
 	int i;
 	for (i = npols - 1; i >= 0; --i)
 		xfrm_pol_put(pols[i]);
 }
-#else
-static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols)
-{
-	xfrm_pol_put(pols[0]);
-}
-#endif
 
 extern void __xfrm_state_destroy(struct xfrm_state *);