summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2012-06-29 05:23:25 +0000
committerPablo Neira Ayuso <pablo@netfilter.org>2012-07-04 19:37:42 +0200
commitbe0593c678249cbb32c6096a705f05a9834e257d (patch)
tree3b084d1b0f02abd9373de4beb1a222be6195f79c /net
parent08911475d1d0921401e37d83292b217e1411d10b (diff)
downloadop-kernel-dev-be0593c678249cbb32c6096a705f05a9834e257d.zip
op-kernel-dev-be0593c678249cbb32c6096a705f05a9834e257d.tar.gz
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>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_proto_tcp.c2
1 files changed, 1 insertions, 1 deletions
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. */
OpenPOWER on IntegriCloud