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/can | |
| parent | b4278c961aca320839964e23cfc7906ff61af0c2 (diff) | |
| download | linux-rpi3-ece31ffd539e8e2b586b1ca5f50bc4f4591e3893.tar.gz linux-rpi3-ece31ffd539e8e2b586b1ca5f50bc4f4591e3893.tar.bz2 linux-rpi3-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/can')
| -rw-r--r-- | net/can/bcm.c | 2 | ||||
| -rw-r--r-- | net/can/proc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/can/bcm.c b/net/can/bcm.c index 28e12d18f0f1..5dcb20076f39 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -1633,7 +1633,7 @@ static void __exit bcm_module_exit(void) can_proto_unregister(&bcm_can_proto); if (proc_dir) - proc_net_remove(&init_net, "can-bcm"); + remove_proc_entry("can-bcm", init_net.proc_net); } module_init(bcm_module_init); diff --git a/net/can/proc.c b/net/can/proc.c index ae566902d2bf..497335892146 100644 --- a/net/can/proc.c +++ b/net/can/proc.c @@ -531,5 +531,5 @@ void can_remove_proc(void) can_remove_proc_readentry(CAN_PROC_RCVLIST_SFF); if (can_dir) - proc_net_remove(&init_net, "can"); + remove_proc_entry("can", init_net.proc_net); } |