From: Arik Nemtsov Date: Tue, 27 Nov 2012 06:44:53 +0000 (+0200) Subject: wlcore: take the mutex before resetting Tx queues X-Git-Tag: upstream/snapshot3+hdmi~5537^2~28^2^2~62^2~50^2^2~24 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d935e385f88616fa867406de97521e07fe41539d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git wlcore: take the mutex before resetting Tx queues Otherwise we risk contention for private members of our global structure while op_stop_locked is running. Reported-by: Ido Yariv Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho --- diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index 3339216..63d3413 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -1852,8 +1852,8 @@ static void wlcore_op_stop_locked(struct wl1271 *wl) cancel_delayed_work_sync(&wl->tx_watchdog_work); /* let's notify MAC80211 about the remaining pending TX frames */ - wl12xx_tx_reset(wl); mutex_lock(&wl->mutex); + wl12xx_tx_reset(wl); wl1271_power_off(wl); /*