Patchwork [2/2] netfilter: nf_ct_tcp: missing per-net support for cttimeout

login
register
mail settings
Submitter Pablo Neira
Date June 29, 2012, 3:23 p.m.
Message ID <1340983405-32118-2-git-send-email-pablo@netfilter.org>
Download mbox | patch
Permalink /patch/168144/
State Accepted
Headers show

Comments

Pablo Neira - June 29, 2012, 3:23 p.m.
From: Pablo Neira Ayuso <pablo@netfilter.org>

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

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/netfilter/nf_conntrack_proto_tcp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Gao feng - June 30, 2012, 12:32 p.m.
于 2012年06月29日 23:23, pablo@netfilter.org 写道:
> From: Pablo Neira Ayuso <pablo@netfilter.org>
> 
> This patch adds missing per-net support for the cttimeout
> infrastructure to TCP.
> 
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> ---
>  net/netfilter/nf_conntrack_proto_tcp.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Sorry,actually I missed it,thanks!

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. */

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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. */