From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Fri, 29 Jun 2012 05:23:25 +0000 (+0000)
Subject: netfilter: nf_ct_tcp: missing per-net support for cttimeout
X-Git-Tag: v3.6-rc1~125^2~281^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be0593c678249cbb32c6096a705f05a9834e257d;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

netfilter: nf_ct_tcp: missing per-net support for cttimeout

This patch adds missing per-net support for the cttimeout
infrastructure to TCP.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Gao feng <gaofeng@cn.fujitsu.com>
---

diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index 07e56ea..a5ac11e 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -821,7 +821,7 @@ static int tcp_error(struct net *net, struct nf_conn *tmpl,
 
 static unsigned int *tcp_get_timeouts(struct net *net)
 {
-	return tcp_timeouts;
+	return tcp_pernet(net)->timeouts;
 }
 
 /* Returns verdict for packet, or -1 for invalid. */