diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2012-06-29 05:23:25 +0000 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-07-04 19:37:42 +0200 |
| commit | be0593c678249cbb32c6096a705f05a9834e257d (patch) | |
| tree | 3b084d1b0f02abd9373de4beb1a222be6195f79c /net/netfilter/nf_conntrack_proto_tcp.c | |
| parent | netfilter: nf_conntrack: generalize nf_ct_l4proto_net (diff) | |
| download | linux-dev-be0593c678249cbb32c6096a705f05a9834e257d.tar.xz linux-dev-be0593c678249cbb32c6096a705f05a9834e257d.zip | |
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/netfilter/nf_conntrack_proto_tcp.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_tcp.c | 2 |
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 07e56ea2e9bf..a5ac11ebef33 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. */ |