From 3a008746cf98449ca1bd7c6d99cd40b54026cbdd Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Fri, 5 Apr 2013 19:40:10 +0200
Subject: [PATCH] --- yaml --- r: 368873 b: refs/heads/master c:
 12202fa7573d32aa0915cde6e8fab4c86b63ca2c h: refs/heads/master i:   368871:
 506ddfaea72488ba3bad4e8415667882a1d5c4da v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/netfilter.h |  5 -----
 trunk/net/netfilter/core.c      | 16 ++++------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index c0a3c4a3ba9c..ffd76f5c0e46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e817961048ecd12cf9cdfcec0062deb5f7970592
+refs/heads/master: 12202fa7573d32aa0915cde6e8fab4c86b63ca2c
diff --git a/trunk/include/linux/netfilter.h b/trunk/include/linux/netfilter.h
index ee142846f56a..0060fde3160e 100644
--- a/trunk/include/linux/netfilter.h
+++ b/trunk/include/linux/netfilter.h
@@ -289,11 +289,6 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family)
 #endif
 }
 
-#ifdef CONFIG_PROC_FS
-#include <linux/proc_fs.h>
-extern struct proc_dir_entry *proc_net_netfilter;
-#endif
-
 #else /* !CONFIG_NETFILTER */
 #define NF_HOOK(pf, hook, skb, indev, outdev, okfn) (okfn)(skb)
 #define NF_HOOK_COND(pf, hook, skb, indev, outdev, okfn, cond) (okfn)(skb)
diff --git a/trunk/net/netfilter/core.c b/trunk/net/netfilter/core.c
index b085184d9b45..7d97302f7c07 100644
--- a/trunk/net/netfilter/core.c
+++ b/trunk/net/netfilter/core.c
@@ -276,23 +276,15 @@ void (*nf_nat_decode_session_hook)(struct sk_buff *, struct flowi *);
 EXPORT_SYMBOL(nf_nat_decode_session_hook);
 #endif
 
-#ifdef CONFIG_PROC_FS
-struct proc_dir_entry *proc_net_netfilter;
-EXPORT_SYMBOL(proc_net_netfilter);
-#endif
-
 static int __net_init netfilter_net_init(struct net *net)
 {
 #ifdef CONFIG_PROC_FS
 	net->nf.proc_netfilter = proc_net_mkdir(net, "netfilter",
 						net->proc_net);
-	if (net_eq(net, &init_net)) {
-		if (!net->nf.proc_netfilter)
-			return -ENOMEM;
-		else
-			proc_net_netfilter = net->nf.proc_netfilter;
-	} else if (!net->nf.proc_netfilter) {
-		pr_err("cannot create netfilter proc entry");
+	if (!net->nf.proc_netfilter) {
+		if (!net_eq(net, &init_net))
+			pr_err("cannot create netfilter proc entry");
+
 		return -ENOMEM;
 	}
 #endif