---

yaml --- r: 298754 b: refs/heads/master c: 44b52bc h: refs/heads/master v: v3
git-mirror · Apr 3, 2012 · 95148da · 95148da
1 parent 25ff5f1
commit 95148da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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: