wil6210: fix protection against connections during reset

Existing code that ignores connection events during
reset flow will never take effect since it locks the
same mutex taken by the reset flow.

In addition, in case of unsolicited disconnect events ignore
those as well since device is about to get reset.

Signed-off-by: Hamad Kadmany <qca_hkadmany@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index e6c249d47487b732fc97bc2789bb40c36a45efa4..814c35645b737a3664bd3047de49d4c9fc10fc69 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -518,16 +518,16 @@ static void wmi_evt_connect(struct wil6210_priv *wil, int id, void *d, int len)
                assoc_resp_ielen = 0;
        }
 
-       mutex_lock(&wil->mutex);
        if (test_bit(wil_status_resetting, wil->status) ||
            !test_bit(wil_status_fwready, wil->status)) {
                wil_err(wil, "status_resetting, cancel connect event, CID %d\n",
                        evt->cid);
-               mutex_unlock(&wil->mutex);
                /* no need for cleanup, wil_reset will do that */
                return;
        }
 
+       mutex_lock(&wil->mutex);
+
        if ((wdev->iftype == NL80211_IFTYPE_STATION) ||
            (wdev->iftype == NL80211_IFTYPE_P2P_CLIENT)) {
                if (!test_bit(wil_status_fwconnecting, wil->status)) {
@@ -631,6 +631,13 @@ static void wmi_evt_disconnect(struct wil6210_priv *wil, int id,
 
        wil->sinfo_gen++;
 
+       if (test_bit(wil_status_resetting, wil->status) ||
+           !test_bit(wil_status_fwready, wil->status)) {
+               wil_err(wil, "status_resetting, cancel disconnect event\n");
+               /* no need for cleanup, wil_reset will do that */
+               return;
+       }
+
        mutex_lock(&wil->mutex);
        wil6210_disconnect(wil, evt->bssid, reason_code, true);
        mutex_unlock(&wil->mutex);