wcn36xx: cancel pending scan request when interface goes down

When the network interface goes down while a scan request is still
pending that can't be stopped due to firmware hickups, wcn->scan_req
remains set, even though the hardware is deinitialized. This results
in -EBUSY for all scan requests after the interface was brought up
again.

Fix this by explicitly completing pending scan requests in
wcn36xx_stop().

Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index 749aef3e2b857705f287d1094d034f35c6b1312f..08b6939d3f5751dd22eead03be436bb5a2d90df1 100644 (file)
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -353,6 +353,19 @@ static void wcn36xx_stop(struct ieee80211_hw *hw)
 
        wcn36xx_dbg(WCN36XX_DBG_MAC, "mac stop\n");
 
+       cancel_work_sync(&wcn->scan_work);
+
+       mutex_lock(&wcn->scan_lock);
+       if (wcn->scan_req) {
+               struct cfg80211_scan_info scan_info = {
+                       .aborted = true,
+               };
+
+               ieee80211_scan_completed(wcn->hw, &scan_info);
+       }
+       wcn->scan_req = NULL;
+       mutex_unlock(&wcn->scan_lock);
+
        wcn36xx_debugfs_exit(wcn);
        wcn36xx_smd_stop(wcn);
        wcn36xx_dxe_deinit(wcn);