diff options
author | Gao feng <gaofeng@cn.fujitsu.com> | 2013-02-18 01:34:56 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-18 14:53:08 -0500 |
commit | ece31ffd539e8e2b586b1ca5f50bc4f4591e3893 (patch) | |
tree | 05407d915a4c0be78a4aa85f54ae3b148ec91ea3 /net/netfilter/nf_conntrack_expect.c | |
parent | net: proc: remove proc_net_fops_create (diff) | |
download | linux-dev-ece31ffd539e8e2b586b1ca5f50bc4f4591e3893.tar.xz linux-dev-ece31ffd539e8e2b586b1ca5f50bc4f4591e3893.zip |
net: proc: change proc_net_remove to remove_proc_entry
proc_net_remove is only used to remove proc entries
that under /proc/net,it's not a general function for
removing proc entries of netns. if we want to remove
some proc entries which under /proc/net/stat/, we still
need to call remove_proc_entry.
this patch use remove_proc_entry to replace proc_net_remove.
we can remove proc_net_remove after this patch.
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_expect.c')
-rw-r--r-- | net/netfilter/nf_conntrack_expect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c index 4c15f8d0b741..3921e5bc1235 100644 --- a/net/netfilter/nf_conntrack_expect.c +++ b/net/netfilter/nf_conntrack_expect.c @@ -582,7 +582,7 @@ static int exp_proc_init(struct net *net) static void exp_proc_remove(struct net *net) { #ifdef CONFIG_NF_CONNTRACK_PROCFS - proc_net_remove(net, "nf_conntrack_expect"); + remove_proc_entry("nf_conntrack_expect", net->proc_net); #endif /* CONFIG_NF_CONNTRACK_PROCFS */ } |