aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorremi.denis-courmont@nokia <remi.denis-courmont@nokia>2009-01-22 22:00:29 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-27 00:03:35 -0500
commit6530e0fee1834fab51720769ac422186de2b3120 (patch)
tree9ee1860c9625ee8b19ff99ea6df230bfb60dd392
parent660f706d931d4795d341805e083a8091af74fa88 (diff)
Phonet: remove useless locking in device cleanup
Incoming packets and sockets are already gone. The netdevice notifier is unregistered under the RTNL lock There remains a race with the rtnetlink handlers unregistration, but it is a generic RTNL issue that was already present before this change. Signed-off-by: RĂ©mi Denis-Courmont <remi.denis-courmont@nokia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/phonet/pn_dev.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c
index fd418107652b..3e24c0522ee3 100644
--- a/net/phonet/pn_dev.c
+++ b/net/phonet/pn_dev.c
@@ -204,13 +204,8 @@ void phonet_device_exit(void)
204 struct phonet_device *pnd, *n; 204 struct phonet_device *pnd, *n;
205 205
206 rtnl_unregister_all(PF_PHONET); 206 rtnl_unregister_all(PF_PHONET);
207 rtnl_lock(); 207 unregister_netdevice_notifier(&phonet_device_notifier);
208 spin_lock_bh(&pndevs.lock);
209 208
210 list_for_each_entry_safe(pnd, n, &pndevs.list, list) 209 list_for_each_entry_safe(pnd, n, &pndevs.list, list)
211 __phonet_device_free(pnd); 210 __phonet_device_free(pnd);
212
213 spin_unlock_bh(&pndevs.lock);
214 rtnl_unlock();
215 unregister_netdevice_notifier(&phonet_device_notifier);
216} 211}