From 95148da4d3ef133b2d51b821f8c1388776ce2f41 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 3 Apr 2012 10:08:48 +0200
Subject: [PATCH] --- yaml --- r: 298754 b: refs/heads/master c:
 44b52bccf855b0706de624c29fc3d82ca954bb4e h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/netfilter/xt_CT.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 29c3ac156024..d44091caac1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5276e16bb6f35412583518d6f04651dd9dc114be
+refs/heads/master: 44b52bccf855b0706de624c29fc3d82ca954bb4e
diff --git a/trunk/net/netfilter/xt_CT.c b/trunk/net/netfilter/xt_CT.c
index 0c8e43810ce3..138b75e41fdd 100644
--- a/trunk/net/netfilter/xt_CT.c
+++ b/trunk/net/netfilter/xt_CT.c
@@ -281,8 +281,10 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par)
 	info->ct = ct;
 	return 0;
 
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 err4:
 	rcu_read_unlock();
+#endif
 err3:
 	nf_conntrack_free(ct);
 err2: