From: Gao feng <gaofeng@cn.fujitsu.com>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH 2/2] netfilter: nf_ct_tcp: missing per-net support for cttimeout
Date: Sat, 30 Jun 2012 20:32:37 +0800 [thread overview]
Message-ID: <4FEEF1E5.7030102@cn.fujitsu.com> (raw)
In-Reply-To: <1340983405-32118-2-git-send-email-pablo@netfilter.org>
于 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
next prev parent reply other threads:[~2012-06-30 12:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-29 15:23 [PATCH 1/2] netfilter: nf_conntrack: generalize nf_ct_l4proto_net pablo
2012-06-29 15:23 ` [PATCH 2/2] netfilter: nf_ct_tcp: missing per-net support for cttimeout pablo
2012-06-30 12:32 ` Gao feng [this message]
2012-06-30 12:29 ` [PATCH 1/2] netfilter: nf_conntrack: generalize nf_ct_l4proto_net Gao feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FEEF1E5.7030102@cn.fujitsu.com \
--to=gaofeng@cn.fujitsu.com \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).