Commit ece31ffd authored by Gao feng's avatar Gao feng Committed by David S. Miller
Browse files

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: default avatarGao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4278c96

drivers/connector/connector.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -287,7 +287,7 @@ static void cn_fini(void) 




	cn_already_initialized = 0;

	cn_already_initialized = 0;





	proc_net_remove(&init_net, "connector");

	remove_proc_entry("connector", init_net.proc_net);





	cn_queue_free_dev(dev->cbdev);

	cn_queue_free_dev(dev->cbdev);

	netlink_kernel_release(dev->nls);

	netlink_kernel_release(dev->nls);

drivers/net/hamradio/bpqether.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -611,7 +611,7 @@ static void __exit bpq_cleanup_driver(void) 




	unregister_netdevice_notifier(&bpq_dev_notifier);

	unregister_netdevice_notifier(&bpq_dev_notifier);





	proc_net_remove(&init_net, "bpqether");

	remove_proc_entry("bpqether", init_net.proc_net);





	rtnl_lock();

	rtnl_lock();

	while (!list_empty(&bpq_devices)) {

	while (!list_empty(&bpq_devices)) {

drivers/net/hamradio/scc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2173,7 +2173,7 @@ static void __exit scc_cleanup_driver(void) 
	if (Vector_Latch)

	if (Vector_Latch)

		release_region(Vector_Latch, 1);

		release_region(Vector_Latch, 1);





	proc_net_remove(&init_net, "z8530drv");

	remove_proc_entry("z8530drv", init_net.proc_net);

}

}





MODULE_AUTHOR("Joerg Reuter <jreuter@yaina.de>");

MODULE_AUTHOR("Joerg Reuter <jreuter@yaina.de>");

drivers/net/hamradio/yam.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1199,7 +1199,7 @@ static void __exit yam_cleanup_driver(void) 
		kfree(p);

		kfree(p);

	}

	}





	proc_net_remove(&init_net, "yam");

	remove_proc_entry("yam", init_net.proc_net);

}

}





/* --------------------------------------------------------------------- */

/* --------------------------------------------------------------------- */

drivers/net/ppp/pppoe.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1145,7 +1145,7 @@ static __net_init int pppoe_init_net(struct net *net) 




static __net_exit void pppoe_exit_net(struct net *net)

static __net_exit void pppoe_exit_net(struct net *net)

{

{

	proc_net_remove(net, "pppoe");

	remove_proc_entry("pppoe", net->proc_net);

}

}





static struct pernet_operations pppoe_net_ops = {

static struct pernet_operations pppoe_net_ops = {