From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Gao feng <gaofeng@cn.fujitsu.com>
Cc: netfilter-devel@vger.kernel.org, kaber@trash.net,
canqunzhang@gmail.com, ebiederm@xmission.com
Subject: Re: [PATCH nf-next 11/11] netfilter: l4proto: refactor l4proto support for netns
Date: Wed, 23 Jan 2013 14:19:55 +0100 [thread overview]
Message-ID: <20130123131955.GK13799@1984> (raw)
In-Reply-To: <1358842234-15005-11-git-send-email-gaofeng@cn.fujitsu.com>
I have applied this, again with minor comestical changes
On Tue, Jan 22, 2013 at 04:10:34PM +0800, Gao feng wrote:
[...]
> diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
> index c3be4ae..74195e6 100644
> --- a/include/net/netfilter/nf_conntrack_l4proto.h
> +++ b/include/net/netfilter/nf_conntrack_l4proto.h
> @@ -121,11 +121,19 @@ extern struct nf_conntrack_l4proto *
> nf_ct_l4proto_find_get(u_int16_t l3proto, u_int8_t l4proto);
> extern void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p);
>
> -/* Protocol registration. */
> -extern int nf_conntrack_l4proto_register(struct net *net,
> - struct nf_conntrack_l4proto *proto);
> -extern void nf_conntrack_l4proto_unregister(struct net *net,
> - struct nf_conntrack_l4proto *proto);
> +/* Protocol pernet registration. */
> +extern int
> +nf_conntrack_l4proto_pernet_register(struct net *net,
> + struct nf_conntrack_l4proto *proto);
> +extern void
> +nf_conntrack_l4proto_pernet_unregister(struct net *net,
> + struct nf_conntrack_l4proto *proto);
> +
> +/* Protocol global registration. */
> +extern int
> +nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto);
> +extern void
> +nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto);
Using the nf_ct_* prefix instead of nf_conntrack_*.
> static inline void nf_ct_kfree_compat_sysctl_table(struct nf_proto_net *pn)
> {
> diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
> index 04799da..71e32c4 100644
> --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
> +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
> @@ -420,39 +420,39 @@ static int ipv4_net_init(struct net *net)
> {
> int ret = 0;
>
> - ret = nf_conntrack_l4proto_register(net,
> - &nf_conntrack_l4proto_tcp4);
> + ret = nf_conntrack_l4proto_pernet_register(net,
> + &nf_conntrack_l4proto_tcp4);
> if (ret < 0) {
> - pr_err("nf_conntrack_l4proto_tcp4 :protocol register failed\n");
> + pr_err("nf_conntrack_l4proto_tcp4 :sysctl register failed\n");
> goto out_tcp;
> }
> - ret = nf_conntrack_l4proto_register(net,
> - &nf_conntrack_l4proto_udp4);
We save again all those line breaks. Many of them were unnecesarily
added in previous patchset, you only have to break if the line is
larger than 80 chars per column.
Thanks a lot for this patchset, Gao. The netns support for conntrack
looks much cleaner now.
next prev parent reply other threads:[~2013-01-23 13:19 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-22 8:10 [PATCH nf-next 01/11] netfilter: move nf_conntrack initialize out of pernet operations Gao feng
2013-01-22 8:10 ` [PATCH nf-next 02/11] netfilter: expect: move initial codes out of pernet_operations Gao feng
2013-01-23 13:11 ` Pablo Neira Ayuso
2013-01-22 8:10 ` [PATCH nf-next 03/11] netfilter: acct: " Gao feng
2013-01-23 13:11 ` Pablo Neira Ayuso
2013-01-22 8:10 ` [PATCH nf-next 04/11] netfilter: tstamp: " Gao feng
2013-01-23 13:11 ` Pablo Neira Ayuso
2013-01-22 8:10 ` [PATCH nf-next 05/11] netfilter: ecache: " Gao feng
2013-01-23 13:11 ` Pablo Neira Ayuso
2013-01-22 8:10 ` [PATCH nf-next 06/11] netfilter: timeout: " Gao feng
2013-01-23 13:13 ` Pablo Neira Ayuso
2013-01-24 0:43 ` Gao feng
2013-01-22 8:10 ` [PATCH nf-next 07/11] netfilter: helper: " Gao feng
2013-01-23 13:14 ` Pablo Neira Ayuso
2013-01-22 8:10 ` [PATCH nf-next 08/11] netfilter: labels: " Gao feng
2013-01-23 13:14 ` Pablo Neira Ayuso
2013-01-22 8:10 ` [PATCH nf-next 09/11] netfilter: proto: " Gao feng
2013-01-23 13:14 ` Pablo Neira Ayuso
2013-01-22 8:10 ` [PATCH nf-next 10/11] netfilter: l3proto: refactor l3proto support for netns Gao feng
2013-01-23 13:16 ` Pablo Neira Ayuso
2013-01-22 8:10 ` [PATCH nf-next 11/11] netfilter: l4proto: refactor l4proto " Gao feng
2013-01-23 13:19 ` Pablo Neira Ayuso [this message]
2013-01-23 13:11 ` [PATCH nf-next 01/11] netfilter: move nf_conntrack initialize out of pernet operations Pablo Neira Ayuso
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=20130123131955.GK13799@1984 \
--to=pablo@netfilter.org \
--cc=canqunzhang@gmail.com \
--cc=ebiederm@xmission.com \
--cc=gaofeng@cn.fujitsu.com \
--cc=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.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).