prima: Avoid waiting if driver is not in connecting stage
If disconnect is already in progress because of deauth received
from AP when disconnect is also received from supplicant, there
is a possibility that completion variable disconnect_comp_var
gets reset in hdd_DisConnectHandler because of disconnection
in progress from AP before completion variable disconnect_comp_var
gets initialized in wlan_hdd_disconnect to handle disconnect from
supplicant. This can cause a delay of 5 seconds eventhough disconnect
was already happened. This waiting is not required when previous
connection status was not eConnectionState_Connecting. Fix this delay
by adding a check to avoid waiting when previous connection status was
not eConnectionState_Connecting.
Change-Id: I58ac638622c5164fa1e9fe45c52ebf60fab2340f
CRs-Fixed: 1093562
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index e8ccf95..f228279 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -14868,6 +14868,7 @@
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
long ret;
+ eConnectionState prev_conn_state;
ENTER();
@@ -14888,6 +14889,8 @@
* Calls hdd_DisConnectHandler.
*/
+ prev_conn_state = pHddStaCtx->conn_info.connState;
+
spin_lock_bh(&pAdapter->lock_for_active_session);
if (eConnectionState_Associated == pHddStaCtx->conn_info.connState)
{
@@ -14914,7 +14917,21 @@
/*issue disconnect*/
status = sme_RoamDisconnect( WLAN_HDD_GET_HAL_CTX(pAdapter),
pAdapter->sessionId, reason);
- if(eHAL_STATUS_CMD_NOT_QUEUED == status)
+ if((eHAL_STATUS_CMD_NOT_QUEUED == status) &&
+ prev_conn_state != eConnectionState_Connecting)
+ {
+ hddLog(LOG1,
+ FL("status = %d, already disconnected"), status);
+ result = 0;
+ goto disconnected;
+ }
+ /*
+ * Wait here instead of returning directly, this will block the next
+ * connect command and allow processing of the scan for ssid and
+ * the previous connect command in CSR. Else we might hit some
+ * race conditions leading to SME and HDD out of sync.
+ */
+ else if(eHAL_STATUS_CMD_NOT_QUEUED == status)
{
hddLog(LOG1,
FL("Already disconnected or connect was in sme/roam pending list and removed by disconnect"));
@@ -15069,7 +15086,10 @@
}
}
#endif
- hddLog(LOG1, FL("Disconnecting with reasoncode:%u"), reasonCode);
+
+ hddLog(LOG1, FL("Disconnecting with reasoncode:%u connState %d"),
+ reasonCode,
+ pHddStaCtx->conn_info.connState);
status = wlan_hdd_disconnect(pAdapter, reasonCode);
if ( 0 != status )
{