]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
netfilter: nf_ct_tcp: missing per-net support for cttimeout
authorPablo Neira Ayuso <pablo@netfilter.org>
Fri, 29 Jun 2012 05:23:25 +0000 (05:23 +0000)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 4 Jul 2012 17:37:42 +0000 (19:37 +0200)
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>
net/netfilter/nf_conntrack_proto_tcp.c

index 07e56ea2e9bfefcd912c73e415003586395b0554..a5ac11ebef331895f39af5e86ca4406e56562ceb 100644 (file)
@@ -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. */