From a5ce53e73ff5b11256f884abac28023780ed0e95 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Mon, 14 Jan 2008 23:48:39 -0800
Subject: [PATCH] --- yaml --- r: 78841 b: refs/heads/master c:
 4f536522dae9d5326ad1872cd254ee84681cf563 h: refs/heads/master i:   78839:
 5cdcee49ce8854e582f2d636bb6e3e0cf4388319 v: v3

---
 [refs]                          |  2 +-
 trunk/net/ipv4/netfilter.c      | 10 ++++++++++
 trunk/net/netfilter/Makefile    |  1 -
 trunk/net/netfilter/core.c      |  9 +++++++++
 trunk/net/netfilter/nf_sysctl.c | 25 -------------------------
 5 files changed, 20 insertions(+), 27 deletions(-)
 delete mode 100644 trunk/net/netfilter/nf_sysctl.c

diff --git a/[refs] b/[refs]
index c7937b1fc0de..d1f1af7a70de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86c0bf4095b35b978540aa43b12840d138a0b376
+refs/heads/master: 4f536522dae9d5326ad1872cd254ee84681cf563
diff --git a/trunk/net/ipv4/netfilter.c b/trunk/net/ipv4/netfilter.c
index 0ed843ed420a..63221553d26b 100644
--- a/trunk/net/ipv4/netfilter.c
+++ b/trunk/net/ipv4/netfilter.c
@@ -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 */
diff --git a/trunk/net/netfilter/Makefile b/trunk/net/netfilter/Makefile
index c910caee0d4f..ea7508387f95 100644
--- a/trunk/net/netfilter/Makefile
+++ b/trunk/net/netfilter/Makefile
@@ -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
diff --git a/trunk/net/netfilter/core.c b/trunk/net/netfilter/core.c
index e0263445484a..c4065b8f9a95 100644
--- a/trunk/net/netfilter/core.c
+++ b/trunk/net/netfilter/core.c
@@ -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 */
diff --git a/trunk/net/netfilter/nf_sysctl.c b/trunk/net/netfilter/nf_sysctl.c
deleted file mode 100644
index d9fcc893301d..000000000000
--- a/trunk/net/netfilter/nf_sysctl.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 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);