From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gao feng Subject: [PATCH nf-next v2 10/10] netfilter: remove useless variable proc_net_netfilter Date: Mon, 25 Mar 2013 17:50:48 +0800 Message-ID: <1364205048-32632-10-git-send-email-gaofeng@cn.fujitsu.com> References: <1364205048-32632-1-git-send-email-gaofeng@cn.fujitsu.com> Cc: pablo@netfilter.org, Gao feng To: netfilter-devel@vger.kernel.org Return-path: Received: from cn.fujitsu.com ([222.73.24.84]:13751 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1756388Ab3CYJuO (ORCPT ); Mon, 25 Mar 2013 05:50:14 -0400 In-Reply-To: <1364205048-32632-1-git-send-email-gaofeng@cn.fujitsu.com> Sender: netfilter-devel-owner@vger.kernel.org List-ID: After we add net namespace support for nflog and nfqueue, the var proc_net_netfilter has no use,just remove it. Signed-off-by: Gao feng --- include/linux/netfilter.h | 1 - net/netfilter/core.c | 7 ------- 2 files changed, 8 deletions(-) diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index ee14284..b9d401c 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -291,7 +291,6 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family) #ifdef CONFIG_PROC_FS #include -extern struct proc_dir_entry *proc_net_netfilter; #endif #else /* !CONFIG_NETFILTER */ diff --git a/net/netfilter/core.c b/net/netfilter/core.c index e054799..3117ce8 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -276,11 +276,6 @@ 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 @@ -290,8 +285,6 @@ static int __net_init netfilter_net_init(struct net *net) if (net_eq(net, &init_net)) { if (!net->nf.proc_netfilter) panic("cannot create netfilter proc entry"); - else - proc_net_netfilter = net->nf.proc_netfilter; } else if (!net->nf.proc_netfilter) { pr_err("cannot create netfilter proc entry"); return -ENOMEM; -- 1.7.11.7