wlan: Set connState to not connected if conn fails with disconnect pending
If driver receive stop adapter when STA is in connecting state, driver
queue a disconnect command without changing the connState of the STA.
It also sets the sme session disconnect in progress.
Now if the connection fails and if sme session disconnect in progress is
set driver doesn't send assoc failure indication to HDD and thus the
connState state remain connecting, now when HDD receives disconnect
callback it assume that connection is in progress and thus doesn't change
the connState. Thus STA remain in connection in progress and reject scans
continuously.
Fix is to call assoc failure indication to HDD in case sme session
disconnect in progress and connect fails. Also before processing the
disconnect set the connState to disconnecting so that HDD is in proper
state.
Change-Id: Ib9d607ad2ab05e5edc266e59516b4ae2b7668c78
CRs-Fixed: 2276843
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index af6ce8c..aa95229 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -10346,45 +10346,41 @@
wlan_hdd_tdls_exit(pAdapter, TRUE);
mutex_unlock(&pHddCtx->tdls_lock);
#endif
- if( hdd_connIsConnected(pstation) ||
- (pstation->conn_info.connState == eConnectionState_Connecting) )
+ if(hdd_connIsConnected(pstation) ||
+ (pstation->conn_info.connState == eConnectionState_Connecting))
{
- /*
- * Indicate sme of disconnect so that in progress connection
- * or preauth can be aborted.
- */
- sme_abortConnection(WLAN_HDD_GET_HAL_CTX(pAdapter),
- pAdapter->sessionId);
- INIT_COMPLETION(pAdapter->disconnect_comp_var);
if (pWextState->roamProfile.BSSType == eCSR_BSS_TYPE_START_IBSS)
+ {
+ INIT_COMPLETION(pAdapter->disconnect_comp_var);
halStatus = sme_RoamDisconnect(pHddCtx->hHal,
pAdapter->sessionId,
eCSR_DISCONNECT_REASON_IBSS_LEAVE);
- else
- halStatus = sme_RoamDisconnect(pHddCtx->hHal,
- pAdapter->sessionId,
- eCSR_DISCONNECT_REASON_UNSPECIFIED);
- /* Success implies disconnect command got queued up successfully
- * Or cmd not queued as scan for SSID is in progress
- */
- if((eHAL_STATUS_SUCCESS == halStatus) ||
- (eHAL_STATUS_CMD_NOT_QUEUED == halStatus))
- {
- ret = wait_for_completion_interruptible_timeout(
- &pAdapter->disconnect_comp_var,
+ /* Success implies disconnect command got queued up successfully
+ * Or cmd not queued as scan for SSID is in progress
+ */
+ if((eHAL_STATUS_SUCCESS == halStatus) ||
+ (eHAL_STATUS_CMD_NOT_QUEUED == halStatus))
+ {
+ ret = wait_for_completion_timeout(
+ &pAdapter->disconnect_comp_var,
msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT));
- if (ret <= 0 &&
- (eHAL_STATUS_CMD_NOT_QUEUED != halStatus))
- {
- hddLog(VOS_TRACE_LEVEL_ERROR,
+ if (ret <= 0 &&
+ (eHAL_STATUS_CMD_NOT_QUEUED != halStatus))
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: wait on disconnect_comp_var failed %ld",
__func__, ret);
- }
+ }
+ }
+ else
+ {
+ hddLog(LOGE, "%s: failed to post disconnect event to SME",
+ __func__);
+ }
}
else
{
- hddLog(LOGE, "%s: failed to post disconnect event to SME",
- __func__);
+ wlan_hdd_disconnect(pAdapter, eCSR_DISCONNECT_REASON_DEAUTH);
}
memset(&wrqu, '\0', sizeof(wrqu));
wrqu.ap_addr.sa_family = ARPHRD_ETHER;