Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f536522 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: kill nf_sysctl.c 



Since there now is generic support for shared sysctl paths, the only
remains are the net/netfilter and net/ipv4/netfilter paths. Move them
to net/netfilter/core.c and net/ipv4/netfilter.c and kill nf_sysctl.c.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 86c0bf40

net/ipv4/netfilter.c

+10 −0
Original line number Diff line number Diff line
@@ -211,3 +211,13 @@ static void ipv4_netfilter_fini(void) 


module_init(ipv4_netfilter_init);

module_exit(ipv4_netfilter_fini);



#ifdef CONFIG_SYSCTL

struct ctl_path nf_net_ipv4_netfilter_sysctl_path[] = {

	{ .procname = "net", .ctl_name = CTL_NET, },

	{ .procname = "ipv4", .ctl_name = NET_IPV4, },

	{ .procname = "netfilter", .ctl_name = NET_IPV4_NETFILTER, },

	{ }

};

EXPORT_SYMBOL_GPL(nf_net_ipv4_netfilter_sysctl_path);

#endif /* CONFIG_SYSCTL */

net/netfilter/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ nf_conntrack-y := nf_conntrack_core.o nf_conntrack_standalone.o nf_conntrack_exp 
nf_conntrack-$(CONFIG_NF_CONNTRACK_EVENTS) += nf_conntrack_ecache.o



obj-$(CONFIG_NETFILTER) = netfilter.o

obj-$(CONFIG_SYSCTL) += nf_sysctl.o



obj-$(CONFIG_NETFILTER_NETLINK) += nfnetlink.o

obj-$(CONFIG_NETFILTER_NETLINK_QUEUE) += nfnetlink_queue.o

net/netfilter/core.c

+9 −0
Original line number Diff line number Diff line
@@ -272,3 +272,12 @@ void __init netfilter_init(void) 
	if (netfilter_log_init() < 0)

		panic("cannot initialize nf_log");

}



#ifdef CONFIG_SYSCTL

struct ctl_path nf_net_netfilter_sysctl_path[] = {

	{ .procname = "net", .ctl_name = CTL_NET, },

	{ .procname = "netfilter", .ctl_name = NET_NETFILTER, },

	{ }

};

EXPORT_SYMBOL_GPL(nf_net_netfilter_sysctl_path);

#endif /* CONFIG_SYSCTL */

net/netfilter/nf_sysctl.c

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/* nf_sysctl.c	netfilter sysctl registration/unregistation

 *

 * Copyright (c) 2006 Patrick McHardy <kaber@trash.net>

 */

#include <linux/module.h>

#include <linux/sysctl.h>

#include <linux/string.h>

#include <linux/slab.h>



/* net/netfilter */

struct ctl_path nf_net_netfilter_sysctl_path[] = {

	{ .procname = "net", .ctl_name = CTL_NET, },

	{ .procname = "netfilter", .ctl_name = NET_NETFILTER, },

	{ }

};

EXPORT_SYMBOL_GPL(nf_net_netfilter_sysctl_path);



/* net/ipv4/netfilter */

struct ctl_path nf_net_ipv4_netfilter_sysctl_path[] = {

	{ .procname = "net", .ctl_name = CTL_NET, },

	{ .procname = "ipv4", .ctl_name = NET_IPV4, },

	{ .procname = "netfilter", .ctl_name = NET_IPV4_NETFILTER, },

	{ }

};

EXPORT_SYMBOL_GPL(nf_net_ipv4_netfilter_sysctl_path);