[PATCH 01/11] wil6210: fix sequence for scan-abort during reset

[Maya Erez]

From: Hamad Kadmany <qca_hkadm...@qca.qualcomm.com>

Communication with FW must be done before wil->status
is initialized in order to properly handle cases where
communication with FW halts during reset sequence.

Signed-off-by: Hamad Kadmany <qca_hkadm...@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_me...@qca.qualcomm.com>
---
 drivers/net/wireless/ath/wil6210/main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/ath/wil6210/main.c 
b/drivers/net/wireless/ath/wil6210/main.c
index c33cc4a..7e72096 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -948,15 +948,15 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw)
        /* Disable device led before reset*/
        wmi_led_cfg(wil, false);
 
+       mutex_lock(&wil->p2p_wdev_mutex);
+       wil_abort_scan(wil, false);
+       mutex_unlock(&wil->p2p_wdev_mutex);
+
        /* prevent NAPI from being scheduled and prevent wmi commands */
        mutex_lock(&wil->wmi_mutex);
        bitmap_zero(wil->status, wil_status_last);
        mutex_unlock(&wil->wmi_mutex);
 
-       mutex_lock(&wil->p2p_wdev_mutex);
-       wil_abort_scan(wil, false);
-       mutex_unlock(&wil->p2p_wdev_mutex);
-
        wil_mask_irq(wil);
 
        wmi_event_flush(wil);
-- 
1.9.1