ath6kl: Fix disconnect event reporting

Driver does not report disconnect event properly when in connecting state,
this leads to issues failures in starting reconnection. Send a disconnect
command to target when a disconnect event is received with reason code
other than 3 (DISCONNECT_CMD - disconnect request from host) to make the
frimware stop trying to connect even after giving disconnect event. There
will be one more disconnect event for this disconnect command with reason
code DISCONNECT_CMD which will be notified to cfg80211.

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

1 files changed, 9 insertions, 11 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index c3540bbfcac6..c84f53d6523b 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -602,22 +602,20 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl *ar, u8 reason,
                 }
         }
 
-        if (!test_bit(CONNECT_PEND, &ar->flag)) {
-                if (reason != DISCONNECT_CMD)
-                        ath6kl_wmi_disconnect_cmd(ar->wmi);
-
-                return;
-        }
+        /*
+         * Send a disconnect command to target when a disconnect event is
+         * received with reason code other than 3 (DISCONNECT_CMD - disconnect
+         * request from host) to make the firmware stop trying to connect even
+         * after giving disconnect event. There will be one more disconnect
+         * event for this disconnect command with reason code DISCONNECT_CMD
+         * which will be notified to cfg80211.
+         */
 
-        if (reason == NO_NETWORK_AVAIL) {
-                /* connect cmd failed */
+        if (reason != DISCONNECT_CMD) {
                 ath6kl_wmi_disconnect_cmd(ar->wmi);
                 return;
         }
 
-        if (reason != DISCONNECT_CMD)
-                return;
-
         clear_bit(CONNECT_PEND, &ar->flag);
 
         if (ar->sme_state == SME_CONNECTING) {