[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>
This commit is contained in:

committed by
David S. Miller

parent
c6995bdff0
commit
3d7cc2ba62
@@ -846,17 +846,18 @@ static struct ctl_table ipv4_table[] = {
|
||||
{ .ctl_name = 0 }
|
||||
};
|
||||
|
||||
static __initdata struct ctl_path net_ipv4_path[] = {
|
||||
struct ctl_path net_ipv4_ctl_path[] = {
|
||||
{ .procname = "net", .ctl_name = CTL_NET, },
|
||||
{ .procname = "ipv4", .ctl_name = NET_IPV4, },
|
||||
{ },
|
||||
};
|
||||
EXPORT_SYMBOL_GPL(net_ipv4_ctl_path);
|
||||
|
||||
static __init int sysctl_ipv4_init(void)
|
||||
{
|
||||
struct ctl_table_header *hdr;
|
||||
|
||||
hdr = register_sysctl_paths(net_ipv4_path, ipv4_table);
|
||||
hdr = register_sysctl_paths(net_ipv4_ctl_path, ipv4_table);
|
||||
return hdr == NULL ? -ENOMEM : 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user