diff options
| author | Pablo Neira Ayuso | 2012-06-05 18:35:48 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2012-06-07 14:58:41 +0200 |
| commit | e76d0af5e45f4152e3fdcc103b753a8aff93fcb5 (patch) | |
| tree | 2032968036adb8a275280b510997e746891fb643 /net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | |
| parent | netfilter: nf_ct_gre: use new namespace support (diff) | |
| download | kernel-qcow2-linux-e76d0af5e45f4152e3fdcc103b753a8aff93fcb5.tar.gz kernel-qcow2-linux-e76d0af5e45f4152e3fdcc103b753a8aff93fcb5.tar.xz kernel-qcow2-linux-e76d0af5e45f4152e3fdcc103b753a8aff93fcb5.zip | |
netfilter: nf_conntrack: remove now unused sysctl for nf_conntrack_l[3|4]proto
Since the sysctl data for l[3|4]proto now resides in pernet nf_proto_net.
We can now remove this unused fields from struct nf_contrack_l[3,4]proto.
Acked-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c')
| -rw-r--r-- | net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c index 5c66203af51c..d79b961a8009 100644 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c @@ -380,7 +380,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = { #endif #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT) .ctl_table_path = "net/ipv4/netfilter", - .ctl_table = ip_ct_sysctl_table, #endif .init_net = ipv4_init_net, .me = THIS_MODULE, |