aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/sysctl_net_ipv4.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-01-09 03:33:11 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:01:10 -0500
commit3d7cc2ba628dcc6b55a2bafc7eaf35019fdcc201 (patch)
tree0b709ed4a97e048058d374401b50a3a1dbdce516 /net/ipv4/sysctl_net_ipv4.c
parentc6995bdff0fc9f97621922a7f857fa640537a7e2 (diff)
[NETFILTER]: Switch to using ctl_paths in nf_queue and conntrack modules
This includes the most simple cases for netfilter. The first part is tne queue modules for ipv4 and ipv6, on which the net/ipv4/ and net/ipv6/ paths are reused from the appropriate ipv4 and ipv6 code. The conntrack module is also patched, but this hunk is very small and simple. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Acked-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/sysctl_net_ipv4.c')
-rw-r--r--net/ipv4/sysctl_net_ipv4.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index a5a9f8e3bb25..45536a91266a 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -846,17 +846,18 @@ static struct ctl_table ipv4_table[] = {
846 { .ctl_name = 0 } 846 { .ctl_name = 0 }
847}; 847};
848 848
849static __initdata struct ctl_path net_ipv4_path[] = { 849struct ctl_path net_ipv4_ctl_path[] = {
850 { .procname = "net", .ctl_name = CTL_NET, }, 850 { .procname = "net", .ctl_name = CTL_NET, },
851 { .procname = "ipv4", .ctl_name = NET_IPV4, }, 851 { .procname = "ipv4", .ctl_name = NET_IPV4, },
852 { }, 852 { },
853}; 853};
854EXPORT_SYMBOL_GPL(net_ipv4_ctl_path);
854 855
855static __init int sysctl_ipv4_init(void) 856static __init int sysctl_ipv4_init(void)
856{ 857{
857 struct ctl_table_header *hdr; 858 struct ctl_table_header *hdr;
858 859
859 hdr = register_sysctl_paths(net_ipv4_path, ipv4_table); 860 hdr = register_sysctl_paths(net_ipv4_ctl_path, ipv4_table);
860 return hdr == NULL ? -ENOMEM : 0; 861 return hdr == NULL ? -ENOMEM : 0;
861} 862}
862 863