Commit 12202fa7 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: remove unneeded variable proc_net_netfilter 



Now that this supports net namespace for nflog and nfqueue,
we can remove the global proc_net_netfilter which has no
clients anymore.

Based on patch from Gao feng.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent e8179610

include/linux/netfilter.h

+0 −5
Original line number Diff line number Diff line
@@ -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)

net/netfilter/core.c

+4 −12
Original line number Diff line number Diff line
@@ -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) {

	if (!net->nf.proc_netfilter) {

		if (!net_eq(net, &init_net))

			pr_err("cannot create netfilter proc entry");



		return -ENOMEM;

	}

#endif