Hi pablo:
于 2012年05月23日 18:38, Pablo Neira Ayuso 写道:
> 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 <ebiederm@xxxxxxxxxxxx>
>> Signed-off-by: Gao feng <gaofeng@xxxxxxxxxxxxxx>
>> ---
>> 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;
>>
>> #ifdef CONFIG_SYSCTL
>> - struct ctl_table_header *ctl_table_header;
>> const char *ctl_table_path;
>> - struct ctl_table *ctl_table;
>> #endif /* CONFIG_SYSCTL */
>>
>> /* 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
>
> Interesting. This structure is added in patch 1/17, then it's remove
> in patch 15/17.
>
> 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 fields in
struct nf_conntrack_l4proto are useless,this patch is just some cleanup.
the same with nf_conntrack_l3proto.
--
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
