diff options
author | Colin Cross <ccross@android.com> | 2012-05-07 18:20:34 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2012-05-07 18:20:34 -0700 |
commit | f02fac63308349b1dbde468adfd084fdb560eeae (patch) | |
tree | 35c39e5c3c70e40c52bc18c07a88dd7a1becb649 /net/netfilter/xt_CT.c | |
parent | 6ff6845be02be8d53da28d2333a015d54b1234db (diff) | |
parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) |
Merge commit 'v3.4-rc6' into android-3.4
Conflicts:
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
Change-Id: If4f371a21c052fa597d107c44b128a093e4a8b91
Diffstat (limited to 'net/netfilter/xt_CT.c')
-rw-r--r-- | net/netfilter/xt_CT.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c index 59530e93fa5..3746d8b9a47 100644 --- a/net/netfilter/xt_CT.c +++ b/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; |