wlan: Process all candidate AP before setting state to not connected.
HDD connection state is set to eConnectionState_NotConnected for
each individual connection failure with the APs of the
requested profile i.e. with status eCSR_ROAM_ASSOCIATION_COMPLETION
and result eCSR_ROAM_RESULT_NOT_ASSOCIATED. Due to this if
disconnect command is sent from supplicant, it is dropped in HDD.
Eventually if DUT connects to an AP in the same requested profile,
driver is in connected state and supplicant is in
disconnected state.
Set HDD connection state to eConnectionState_NotConnected
only when CSR has completed all the available candidate AP
for the requested profile and Device is not able to
connect to any of them i.e status
eCSR_ROAM_ASSOCIATION FAILURE.
Process the Disconnect commands, even if SME is waiting
for the key.
Change-Id: I5edf92593fa765ace0ee43ceff207b64f33f69d6
CRs-Fixed: 668635
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 42c4a73..dbb0d4c 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -724,7 +724,6 @@
// Set not-connected state
pHddStaCtx->conn_info.connDot11DesiredBssType = eCSR_BSS_TYPE_ANY;
- hdd_connSetConnectionState( pHddStaCtx, eConnectionState_NotConnected );
vos_mem_zero( &pHddStaCtx->conn_info.SSID, sizeof( tCsrSSIDInfo ) );
}
@@ -790,6 +789,9 @@
netif_carrier_off(dev);
INIT_COMPLETION(pAdapter->disconnect_comp_var);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: Set HDD connState to eConnectionState_Disconnecting",
+ __func__);
hdd_connSetConnectionState( pHddStaCtx, eConnectionState_Disconnecting );
/* If only STA mode is on */
if((pHddCtx->concurrency_mode <= 1) && (pHddCtx->no_of_sessions[WLAN_HDD_INFRA_STATION] <=1))
@@ -903,6 +905,10 @@
pHddCtx->sta_to_adapter[sta_id] = NULL;
// Clear saved connection information in HDD
hdd_connRemoveConnectInfo( pHddStaCtx );
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: Set HDD connState to eConnectionState_NotConnected",
+ __func__);
+ hdd_connSetConnectionState( pHddStaCtx, eConnectionState_NotConnected );
#ifdef WLAN_FEATURE_GTK_OFFLOAD
if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
(WLAN_HDD_P2P_CLIENT == pAdapter->device_mode))
@@ -1188,6 +1194,9 @@
if ( eCSR_ROAM_RESULT_ASSOCIATED == roamResult )
{
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: Set HDD connState to eConnectionState_Associated",
+ __func__);
hdd_connSetConnectionState( pHddStaCtx, eConnectionState_Associated );
pAdapter->maxRateFlags = pRoamInfo->maxRateFlags;
@@ -1474,9 +1483,16 @@
MAC_ADDR_ARRAY(pWextState->req_bssId),
roamResult, roamStatus);
- /*Handle all failure conditions*/
- hdd_connSetConnectionState( pHddStaCtx, eConnectionState_NotConnected);
-
+ /* Set connection state to eConnectionState_NotConnected only when CSR
+ * has completed operation - with a ASSOCIATION_FAILURE status
+ */
+ if ( eCSR_ROAM_ASSOCIATION_FAILURE == roamStatus )
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: Set HDD connState to eConnectionState_NotConnected",
+ __func__);
+ hdd_connSetConnectionState( pHddStaCtx, eConnectionState_NotConnected);
+ }
if((pHddCtx->concurrency_mode <= 1) && (pHddCtx->no_of_sessions[WLAN_HDD_INFRA_STATION] <=1))
{
pHddCtx->isAmpAllowed = VOS_TRUE;
@@ -1619,6 +1635,9 @@
* connection state to IBSS Disconnected (meaning no peers
* are in the IBSS).
*/
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: Set HDD connState to eConnectionState_IbssDisconnected",
+ __func__);
hdd_connSetConnectionState( WLAN_HDD_GET_STATION_CTX_PTR(pAdapter),
eConnectionState_IbssDisconnected );
/*notify wmm */
@@ -1785,7 +1804,10 @@
static eHalStatus roamIbssConnectHandler( hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo )
{
struct cfg80211_bss *bss;
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "IBSS Connect Indication from SME!!!" );
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: IBSS Connect Indication from SME!!! "
+ "Set HDD connState to eConnectionState_IbssConnected",
+ __func__);
// Set the internal connection state to show 'IBSS Connected' (IBSS with a partner stations)...
hdd_connSetConnectionState( WLAN_HDD_GET_STATION_CTX_PTR(pAdapter), eConnectionState_IbssConnected );
@@ -2169,6 +2191,9 @@
// Stop only when we are inactive
netif_tx_disable(pAdapter->dev);
netif_carrier_off(pAdapter->dev);
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: Set HDD connState to eConnectionState_NotConnected",
+ __func__);
hdd_connSetConnectionState( WLAN_HDD_GET_STATION_CTX_PTR(pAdapter), eConnectionState_NotConnected );
// Send the bssid address to the wext.
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 07d0d3a..652330a 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -5755,9 +5755,13 @@
*/
if (WLAN_HDD_INFRA_STATION == pAdapter->device_mode ||
WLAN_HDD_P2P_CLIENT == pAdapter->device_mode)
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: Set HDD connState to eConnectionState_Connecting",
+ __func__);
hdd_connSetConnectionState(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter),
eConnectionState_Connecting);
-
+ }
status = sme_RoamConnect( WLAN_HDD_GET_HAL_CTX(pAdapter),
pAdapter->sessionId, pRoamProfile, &roamId);
@@ -6728,6 +6732,9 @@
}
pHddCtx->isAmpAllowed = VOS_TRUE;
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: Set HDD connState to eConnectionState_Disconnecting",
+ __func__);
pHddStaCtx->conn_info.connState = eConnectionState_Disconnecting;
INIT_COMPLETION(pAdapter->disconnect_comp_var);
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 9efc8b2..8e1c921 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -5664,6 +5664,9 @@
#endif
//Set the Connection State to Not Connected
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ "%s: Set HDD connState to eConnectionState_NotConnected",
+ __func__);
pHddStaCtx->conn_info.connState = eConnectionState_NotConnected;
//Set the default operation channel
@@ -6917,6 +6920,9 @@
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ "%s: Set HDD connState to eConnectionState_NotConnected",
+ __func__);
pHddStaCtx->conn_info.connState = eConnectionState_NotConnected;
init_completion(&pAdapter->disconnect_comp_var);
sme_RoamDisconnect(pHddCtx->hHal, pAdapter->sessionId,
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 851eea2..26cb244 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -7373,7 +7373,8 @@
* then change the band*/
hddLog(VOS_TRACE_LEVEL_INFO,
- "%s STA connected in band %u, Changing band to %u, Issuing Disconnect",
+ "%s STA connected in band %u, Changing band to %u, Issuing Disconnect."
+ " Set HDD connState to eConnectionState_NotConnected",
__func__, csrGetCurrentBand(hHal), band);
pHddStaCtx->conn_info.connState = eConnectionState_NotConnected;
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 1cd8194..5082359 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -4602,7 +4602,7 @@
smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
return eHAL_STATUS_FAILURE;
}
-
+
switch ( pCommand->u.roamCmd.roamReason )
{
case eCsrForcedDisassoc:
@@ -6909,7 +6909,14 @@
tANI_BOOLEAN fComplete = eANI_BOOLEAN_FALSE;
eCsrRoamSubState NewSubstate;
tANI_U32 sessionId = pCommand->sessionId;
-
+
+ if( CSR_IS_WAIT_FOR_KEY( pMac, sessionId ) )
+ {
+ smsLog(pMac, LOG1, FL(" Stop Wait for key timer and change substate to"
+ " eCSR_ROAM_SUBSTATE_NONE"));
+ csrRoamStopWaitForKeyTimer( pMac );
+ csrRoamSubstateChange( pMac, eCSR_ROAM_SUBSTATE_NONE, sessionId);
+ }
// change state to 'Roaming'...
csrRoamStateChange( pMac, eCSR_ROAMING_STATE_JOINING, sessionId );
diff --git a/CORE/SME/src/csr/csrInsideApi.h b/CORE/SME/src/csr/csrInsideApi.h
index 29bd6bd..7af5434 100644
--- a/CORE/SME/src/csr/csrInsideApi.h
+++ b/CORE/SME/src/csr/csrInsideApi.h
@@ -199,6 +199,14 @@
( eCSR_ENCRYPT_TYPE_WEP40 != (encType) ) && \
( eCSR_ENCRYPT_TYPE_WEP104 != (encType) ) )
+#define CSR_IS_DISCONNECT_COMMAND(pCommand) ( ( eSmeCommandRoam == (pCommand)->command ) &&\
+ ( ( eCsrForcedDisassoc == (pCommand)->u.roamCmd.roamReason ) ||\
+ ( eCsrForcedDeauth == (pCommand)->u.roamCmd.roamReason ) ||\
+ ( eCsrSmeIssuedDisassocForHandoff ==\
+ (pCommand)->u.roamCmd.roamReason ) ||\
+ ( eCsrForcedDisassocMICFailure ==\
+ (pCommand)->u.roamCmd.roamReason ) ) )
+
eCsrRoamState csrRoamStateChange( tpAniSirGlobal pMac, eCsrRoamState NewRoamState, tANI_U8 sessionId);
eHalStatus csrScanningStateMsgProcessor( tpAniSirGlobal pMac, void *pMsgBuf );
void csrRoamingStateMsgProcessor( tpAniSirGlobal pMac, void *pMsgBuf );
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 03ea5bd..127f635 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -728,13 +728,18 @@
{
pCommand = GET_BASE_ADDR( pEntry, tSmeCmd, Link );
- //We cannot execute any command in wait-for-key state until setKey is through.
- if( CSR_IS_WAIT_FOR_KEY( pMac, pCommand->sessionId ) )
+ /* Allow only disconnect command
+ * in wait-for-key state until setKey is through.
+ */
+ if( CSR_IS_WAIT_FOR_KEY( pMac, pCommand->sessionId ) &&
+ !CSR_IS_DISCONNECT_COMMAND( pCommand ) )
{
if( !CSR_IS_SET_KEY_COMMAND( pCommand ) )
{
csrLLUnlock( &pMac->sme.smeCmdActiveList );
- smsLog(pMac, LOGE, " Cannot process command(%d) while waiting for key", pCommand->command);
+ smsLog(pMac, LOGE, FL("SessionId %d: Cannot process "
+ "command(%d) while waiting for key"),
+ pCommand->sessionId, pCommand->command);
fContinue = eANI_BOOLEAN_FALSE;
goto sme_process_scan_queue;
}