diff options
author | Gao feng <gaofeng@cn.fujitsu.com> | 2013-02-17 20:34:56 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-18 14:53:08 -0500 |
commit | ece31ffd539e8e2b586b1ca5f50bc4f4591e3893 (patch) | |
tree | 05407d915a4c0be78a4aa85f54ae3b148ec91ea3 /drivers/net | |
parent | b4278c961aca320839964e23cfc7906ff61af0c2 (diff) |
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 'drivers/net')
-rw-r--r-- | drivers/net/hamradio/bpqether.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/scc.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/yam.c | 2 | ||||
-rw-r--r-- | drivers/net/ppp/pppoe.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index 61f28842163d..02de6c891670 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c | |||
@@ -611,7 +611,7 @@ static void __exit bpq_cleanup_driver(void) | |||
611 | 611 | ||
612 | unregister_netdevice_notifier(&bpq_dev_notifier); | 612 | unregister_netdevice_notifier(&bpq_dev_notifier); |
613 | 613 | ||
614 | proc_net_remove(&init_net, "bpqether"); | 614 | remove_proc_entry("bpqether", init_net.proc_net); |
615 | 615 | ||
616 | rtnl_lock(); | 616 | rtnl_lock(); |
617 | while (!list_empty(&bpq_devices)) { | 617 | while (!list_empty(&bpq_devices)) { |
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index cab13f4d2942..bc1d52170389 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c | |||
@@ -2173,7 +2173,7 @@ static void __exit scc_cleanup_driver(void) | |||
2173 | if (Vector_Latch) | 2173 | if (Vector_Latch) |
2174 | release_region(Vector_Latch, 1); | 2174 | release_region(Vector_Latch, 1); |
2175 | 2175 | ||
2176 | proc_net_remove(&init_net, "z8530drv"); | 2176 | remove_proc_entry("z8530drv", init_net.proc_net); |
2177 | } | 2177 | } |
2178 | 2178 | ||
2179 | MODULE_AUTHOR("Joerg Reuter <jreuter@yaina.de>"); | 2179 | MODULE_AUTHOR("Joerg Reuter <jreuter@yaina.de>"); |
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 92847d27b2e8..4cf8f1017aad 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c | |||
@@ -1199,7 +1199,7 @@ static void __exit yam_cleanup_driver(void) | |||
1199 | kfree(p); | 1199 | kfree(p); |
1200 | } | 1200 | } |
1201 | 1201 | ||
1202 | proc_net_remove(&init_net, "yam"); | 1202 | remove_proc_entry("yam", init_net.proc_net); |
1203 | } | 1203 | } |
1204 | 1204 | ||
1205 | /* --------------------------------------------------------------------- */ | 1205 | /* --------------------------------------------------------------------- */ |
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index d7fa96c42ae7..bb07ba94c3aa 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c | |||
@@ -1145,7 +1145,7 @@ static __net_init int pppoe_init_net(struct net *net) | |||
1145 | 1145 | ||
1146 | static __net_exit void pppoe_exit_net(struct net *net) | 1146 | static __net_exit void pppoe_exit_net(struct net *net) |
1147 | { | 1147 | { |
1148 | proc_net_remove(net, "pppoe"); | 1148 | remove_proc_entry("pppoe", net->proc_net); |
1149 | } | 1149 | } |
1150 | 1150 | ||
1151 | static struct pernet_operations pppoe_net_ops = { | 1151 | static struct pernet_operations pppoe_net_ops = { |