From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Date: Thu, 18 Mar 2010 10:26:45 +0000 (+0200)
Subject: wl1271: Remove circular interlocking related to the inetaddr notifier chain
X-Git-Tag: MMI-PSA29.97-13-9~23873^2~167^2~488
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2ea9fb3d79aac371e5bb0c4b0f5be7195e8fcd33;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

wl1271: Remove circular interlocking related to the inetaddr notifier chain

Removing the wl1271 from the inet addr notifier chain sometimes causes the
registered handler to be called - causing locking problems if the removing
function is called from within the mutex.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 6f6d366491a3..0bebc456ec0d 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1029,12 +1029,13 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw,
 	struct wl1271 *wl = hw->priv;
 	int i;
 
+	unregister_inetaddr_notifier(&wl1271_dev_notifier);
+
 	mutex_lock(&wl->mutex);
 	wl1271_debug(DEBUG_MAC80211, "mac80211 remove interface");
 
 	wl1271_info("down");
 
-	unregister_inetaddr_notifier(&wl1271_dev_notifier);
 	list_del(&wl->list);
 
 	WARN_ON(wl->state != WL1271_STATE_ON);