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.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
