From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gao feng Subject: Re: [PATCH 15/17] netfilter: cleanup sysctl for l4proto and l3proto Date: Thu, 24 May 2012 08:59:18 +0800 Message-ID: <4FBD87E6.6000402@cn.fujitsu.com> References: <1336985547-31960-1-git-send-email-gaofeng@cn.fujitsu.com> <1336985547-31960-16-git-send-email-gaofeng@cn.fujitsu.com> <20120523103810.GE2836@1984> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, serge.hallyn@canonical.com, ebiederm@xmission.com, dlezcano@fr.ibm.com To: Pablo Neira Ayuso Return-path: Received: from cn.fujitsu.com ([222.73.24.84]:3068 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754765Ab2EXBhT convert rfc822-to-8bit (ORCPT ); Wed, 23 May 2012 21:37:19 -0400 In-Reply-To: <20120523103810.GE2836@1984> Sender: netfilter-devel-owner@vger.kernel.org List-ID: Hi pablo: =E4=BA=8E 2012=E5=B9=B405=E6=9C=8823=E6=97=A5 18:38, Pablo Neira Ayuso = =E5=86=99=E9=81=93: > On Mon, May 14, 2012 at 04:52:25PM +0800, Gao feng wrote: >> delete no useless sysctl data for l4proto and l3proto. >> >> Acked-by: Eric W. Biederman >> Signed-off-by: Gao feng >> --- >> include/net/netfilter/nf_conntrack_l3proto.h | 2 -- >> include/net/netfilter/nf_conntrack_l4proto.h | 10 ---------- >> net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 1 - >> net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 8 -------- >> net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 5 ----- >> net/netfilter/nf_conntrack_proto_generic.c | 8 -------- >> net/netfilter/nf_conntrack_proto_sctp.c | 15 -------------= -- >> net/netfilter/nf_conntrack_proto_tcp.c | 15 -------------= -- >> net/netfilter/nf_conntrack_proto_udp.c | 15 -------------= -- >> net/netfilter/nf_conntrack_proto_udplite.c | 12 ------------ >> 10 files changed, 0 insertions(+), 91 deletions(-) >> >> diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/= net/netfilter/nf_conntrack_l3proto.h >> index d6df8c7..6f7c13f 100644 >> --- a/include/net/netfilter/nf_conntrack_l3proto.h >> +++ b/include/net/netfilter/nf_conntrack_l3proto.h >> @@ -64,9 +64,7 @@ struct nf_conntrack_l3proto { >> size_t nla_size; >> =20 >> #ifdef CONFIG_SYSCTL >> - struct ctl_table_header *ctl_table_header; >> const char *ctl_table_path; >> - struct ctl_table *ctl_table; >> #endif /* CONFIG_SYSCTL */ >> =20 >> /* Init l3proto pernet data */ >> diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/= net/netfilter/nf_conntrack_l4proto.h >> index 0d329b9..4881df34 100644 >> --- a/include/net/netfilter/nf_conntrack_l4proto.h >> +++ b/include/net/netfilter/nf_conntrack_l4proto.h >> @@ -95,16 +95,6 @@ struct nf_conntrack_l4proto { >> const struct nla_policy *nla_policy; >> } ctnl_timeout; >> #endif >> - >> -#ifdef CONFIG_SYSCTL >> - struct ctl_table_header **ctl_table_header; >> - struct ctl_table *ctl_table; >> - unsigned int *ctl_table_users; >> -#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT >> - struct ctl_table_header *ctl_compat_table_header; >> - struct ctl_table *ctl_compat_table; >> -#endif >> -#endif >=20 > Interesting. This structure is added in patch 1/17, then it's remove > in patch 15/17. >=20 > Probably I'm missing anything, but why are you doing it like that? This structure means ctl_table_header,ctl_table and so on? I add this structure to struct nf_proto_net in patch 1/17,so those fiel= ds in struct nf_conntrack_l4proto are useless,this patch is just some cleanup= =2E the same with nf_conntrack_l3proto. -- To unsubscribe from this list: send the line "unsubscribe netfilter-dev= el" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html