From 19d51789f6fb42e9b16b26dbcfc0c2e028a519c7 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Fri, 27 Apr 2012 02:00:50 +0200
Subject: [PATCH] --- yaml --- r: 299959 b: refs/heads/master c:
 6cf51852486af3d79f57bf46d00209a14244dbaa h: refs/heads/master i:   299957:
 bdceb615ce05f8bc06115451e89a5e0e472d70f6   299955:
 1ead0d55fb6a2c493faba2e9411d60085369443d   299951:
 c899409b5cb8fe06141f002878114a735a223f48 v: v3

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

diff --git a/[refs] b/[refs]
index e820152e776c..407fb025a2e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8537de8a7ab6681cc72fb0411ab1ba7fdba62dd0
+refs/heads/master: 6cf51852486af3d79f57bf46d00209a14244dbaa
diff --git a/trunk/net/netfilter/xt_CT.c b/trunk/net/netfilter/xt_CT.c
index 59530e93fa58..3746d8b9a478 100644
--- a/trunk/net/netfilter/xt_CT.c
+++ b/trunk/net/netfilter/xt_CT.c
@@ -227,7 +227,7 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par)
 	}
 
 #ifdef CONFIG_NF_CONNTRACK_TIMEOUT
-	if (info->timeout) {
+	if (info->timeout[0]) {
 		typeof(nf_ct_timeout_find_get_hook) timeout_find_get;
 		struct nf_conn_timeout *timeout_ext;