wlan: Send disconnect indication to upperlayer after clean up in PE layer
Supplicant may send PNO command as disconnection was already informed
to supplicant while disconnection might still be in progress in PE
layer(DEL_STA/DEL_BSS).
Fix to send disconnect indication to upper layers after complete
cleanup.
Change-Id: I976044186eb8e79f709bda618b38815827a3e0c5
CRs-Fixed: 951162
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index d69b6f7..a39069e 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -1685,6 +1685,15 @@
tANI_U16 assocId;
} tSirSmeDeauthCnf, *tpSirSmeDeauthCnf;
+typedef struct sSirSmeDisConDoneInd
+{
+ tANI_U16 messageType;
+ tANI_U16 length;
+ tANI_U8 sessionId;
+ tSirResultCodes reasonCode;
+ tSirMacAddr peerMacAddr;
+}tSirSmeDisConDoneInd, *tpSirSmeDisConDoneInd;
+
/// Definition for stop BSS request message
typedef struct sSirSmeStopBssReq
{
diff --git a/CORE/MAC/inc/wniApi.h b/CORE/MAC/inc/wniApi.h
index 97d127c..466d8f9 100644
--- a/CORE/MAC/inc/wniApi.h
+++ b/CORE/MAC/inc/wniApi.h
@@ -132,6 +132,7 @@
eWNI_SME_DEAUTH_REQ,
eWNI_SME_DEAUTH_RSP,
eWNI_SME_DEAUTH_IND,
+ eWNI_SME_DISCONNECT_DONE_IND,
eWNI_SME_WM_STATUS_CHANGE_NTF,
eWNI_SME_IBSS_NEW_PEER_IND,
eWNI_SME_IBSS_PEER_DEPARTED_IND,
diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c
index 59b7515..52f16cb 100644
--- a/CORE/MAC/src/pe/lim/limAssocUtils.c
+++ b/CORE/MAC/src/pe/lim/limAssocUtils.c
@@ -823,11 +823,6 @@
psessionEntry->limAID = 0;
- } else if (
- (mlmStaContext.cleanupTrigger == eLIM_LINK_MONITORING_DISASSOC) ||
- (mlmStaContext.cleanupTrigger == eLIM_LINK_MONITORING_DEAUTH)) {
- /* only for non-STA cases PE/SME is serialized */
- return;
}
if ((mlmStaContext.cleanupTrigger ==
diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
index ecf62ea..b352576 100644
--- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
@@ -1288,6 +1288,7 @@
tANI_U8 *pBuf;
tSirSmeDisassocRsp *pSirSmeDisassocRsp;
tSirSmeDisassocInd *pSirSmeDisassocInd;
+ tSirSmeDisConDoneInd *pSirSmeDisConDoneInd;
tANI_U32 *pMsg;
bool failure = FALSE;
@@ -1298,13 +1299,6 @@
switch (disassocTrigger)
{
- case eLIM_PEER_ENTITY_DISASSOC:
- if (reasonCode != eSIR_SME_STA_NOT_ASSOCIATED)
- {
- failure = TRUE;
- goto error;
- }
-
case eLIM_HOST_DISASSOC:
/**
* Disassociation response due to
@@ -1355,6 +1349,30 @@
pMsg = (tANI_U32*) pSirSmeDisassocRsp;
break;
+ case eLIM_PEER_ENTITY_DISASSOC:
+ case eLIM_LINK_MONITORING_DISASSOC:
+ pSirSmeDisConDoneInd = vos_mem_malloc(sizeof(tSirSmeDisConDoneInd));
+ if ( NULL == pSirSmeDisConDoneInd )
+ {
+ // Log error
+ limLog(pMac, LOGP,
+ FL("call to AllocateMemory failed for disconnect indication"));
+
+ return;
+ }
+ vos_mem_zero(pSirSmeDisConDoneInd, sizeof(tSirSmeDisConDoneInd));
+ limLog(pMac, LOG1,
+ FL("send eWNI_SME_DISCONNECT_DONE_IND withretCode: %d"),
+ reasonCode);
+ pSirSmeDisConDoneInd->messageType = eWNI_SME_DISCONNECT_DONE_IND;
+ pSirSmeDisConDoneInd->length = sizeof(tSirSmeDisConDoneInd);
+ vos_mem_copy(pSirSmeDisConDoneInd->peerMacAddr, peerMacAddr,
+ sizeof(tSirMacAddr));
+ pSirSmeDisConDoneInd->sessionId = smesessionId;
+ pSirSmeDisConDoneInd->reasonCode = reasonCode;
+ pMsg = (tANI_U32 *)pSirSmeDisConDoneInd;
+ break;
+
default:
/**
* Disassociation indication due to Disassociation
@@ -1725,6 +1743,7 @@
tANI_U8 *pBuf;
tSirSmeDeauthRsp *pSirSmeDeauthRsp;
tSirSmeDeauthInd *pSirSmeDeauthInd;
+ tSirSmeDisConDoneInd *pSirSmeDisConDoneInd;
tpPESession psessionEntry;
tANI_U8 sessionId;
tANI_U32 *pMsg;
@@ -1732,9 +1751,6 @@
psessionEntry = peFindSessionByBssid(pMac,peerMacAddr,&sessionId);
switch (deauthTrigger)
{
- case eLIM_PEER_ENTITY_DEAUTH:
- return;
-
case eLIM_HOST_DEAUTH:
/**
* Deauthentication response to host triggered
@@ -1769,6 +1785,28 @@
break;
+ case eLIM_PEER_ENTITY_DEAUTH:
+ case eLIM_LINK_MONITORING_DEAUTH:
+ pSirSmeDisConDoneInd = vos_mem_malloc(sizeof(tSirSmeDisConDoneInd));
+ if ( NULL == pSirSmeDisConDoneInd )
+ {
+ // Log error
+ limLog(pMac, LOGP,
+ FL("call to AllocateMemory failed for disconnect indication"));
+
+ return;
+ }
+ vos_mem_zero(pSirSmeDisConDoneInd, sizeof(tSirSmeDisConDoneInd));
+ limLog(pMac, LOG1,
+ FL("send eWNI_SME_DISCONNECT_DONE_IND withretCode: %d"),
+ reasonCode);
+ pSirSmeDisConDoneInd->messageType = eWNI_SME_DISCONNECT_DONE_IND;
+ pSirSmeDisConDoneInd->length = sizeof(tSirSmeDisConDoneInd);
+ pSirSmeDisConDoneInd->sessionId = smesessionId;
+ pSirSmeDisConDoneInd->reasonCode = reasonCode;
+ pMsg = (tANI_U32 *)pSirSmeDisConDoneInd;
+ break;
+
default:
/**
* Deauthentication indication due to Deauthentication
diff --git a/CORE/SAP/src/sapApiLinkCntl.c b/CORE/SAP/src/sapApiLinkCntl.c
index 631df4d..73c16f4 100644
--- a/CORE/SAP/src/sapApiLinkCntl.c
+++ b/CORE/SAP/src/sapApiLinkCntl.c
@@ -1405,6 +1405,7 @@
#endif
break;
+ case eCSR_ROAM_RESULT_DEAUTH_IND:
case eCSR_ROAM_RESULT_DISASSOC_IND:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
FL("CSR roamResult = %s (%d)"),
@@ -1421,23 +1422,6 @@
}
break;
- case eCSR_ROAM_RESULT_DEAUTH_IND:
- VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
- FL("CSR roamResult = %s (%d)"),
- "eCSR_ROAM_RESULT_DEAUTH_IND",
- roamResult);
-#ifdef WLAN_FEATURE_AP_HT40_24G
- sapRemoveHT40IntolerantSta(sapContext, pCsrRoamInfo);
-#endif
- /* Fill in the event structure */
- //TODO: we will use the same event inorder to inform HDD to disassociate the station
- vosStatus = sapSignalHDDevent( sapContext, pCsrRoamInfo, eSAP_STA_DISASSOC_EVENT, (v_PVOID_t)eSAP_STATUS_SUCCESS);
- if(!VOS_IS_STATUS_SUCCESS(vosStatus))
- {
- halStatus = eHAL_STATUS_FAILURE;
- }
- break;
-
case eCSR_ROAM_RESULT_MIC_ERROR_GROUP:
VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,
FL("CSR roamResult = %s (%d)"),
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 69b0364..413b0f7 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -9595,6 +9595,7 @@
tSirSmeAssocInd *pAssocInd;
tSirSmeDisassocInd *pDisassocInd;
tSirSmeDeauthInd *pDeauthInd;
+ tSirSmeDisConDoneInd *pDisConDoneInd;
tSirSmeWmStatusChangeNtf *pStatusChangeMsg;
tSirSmeNewBssInfo *pNewBss;
tSmeIbssPeerInd *pIbssPeerInd;
@@ -9762,19 +9763,6 @@
csrRoamIssueWmStatusChange( pMac, sessionId, eCsrDisassociated, pSirMsg );
if (CSR_IS_INFRA_AP(&pSession->connectedProfile))
{
- pRoamInfo = &roamInfo;
- pRoamInfo->statusCode = pDisassocInd->statusCode;
- pRoamInfo->u.pConnectedProfile = &pSession->connectedProfile;
- pRoamInfo->staId = (tANI_U8)pDisassocInd->staId;
-
- vos_mem_copy(pRoamInfo->peerMac, pDisassocInd->peerMacAddr,
- sizeof(tSirMacAddr));
- vos_mem_copy(&pRoamInfo->bssid, pDisassocInd->bssId,
- sizeof(tCsrBssid));
-
- status = csrRoamCallCallback(pMac, sessionId, pRoamInfo, 0,
- eCSR_ROAM_INFRA_IND, eCSR_ROAM_RESULT_DISASSOC_IND);
-
/*
* STA/P2P client got disassociated so remove any pending deauth
* commands in sme pending list
@@ -9849,26 +9837,33 @@
#endif
csrRoamLinkDown(pMac, sessionId);
csrRoamIssueWmStatusChange( pMac, sessionId, eCsrDeauthenticated, pSirMsg );
- if(CSR_IS_INFRA_AP(&pSession->connectedProfile))
- {
-
- pRoamInfo = &roamInfo;
-
- pRoamInfo->statusCode = pDeauthInd->statusCode;
- pRoamInfo->u.pConnectedProfile = &pSession->connectedProfile;
-
- pRoamInfo->staId = (tANI_U8)pDeauthInd->staId;
-
- vos_mem_copy(pRoamInfo->peerMac, pDeauthInd->peerMacAddr,
- sizeof(tSirMacAddr));
- vos_mem_copy(&pRoamInfo->bssid, pDeauthInd->bssId,
- sizeof(tCsrBssid));
-
- status = csrRoamCallCallback(pMac, sessionId, pRoamInfo, 0, eCSR_ROAM_INFRA_IND, eCSR_ROAM_RESULT_DEAUTH_IND);
- }
}
break;
-
+
+ case eWNI_SME_DISCONNECT_DONE_IND:
+ pDisConDoneInd = (tSirSmeDisConDoneInd *)(pSirMsg);
+ smsLog( pMac, LOG1,
+ FL("eWNI_SME_DISCONNECT_DONE_IND RC:%d"),
+ pDisConDoneInd->reasonCode);
+ if( CSR_IS_SESSION_VALID(pMac, pDisConDoneInd->sessionId))
+ {
+ roamInfo.reasonCode = pDisConDoneInd->reasonCode;
+ roamInfo.statusCode = eSIR_SME_STA_DISASSOCIATED;
+ vos_mem_copy(roamInfo.peerMac, pDisConDoneInd->peerMacAddr,
+ sizeof(tSirMacAddr));
+ status = csrRoamCallCallback(pMac,
+ pDisConDoneInd->sessionId,
+ &roamInfo, 0,
+ eCSR_ROAM_LOSTLINK,
+ eCSR_ROAM_RESULT_DISASSOC_IND);
+ }
+ else
+ {
+ smsLog(pMac, LOGE, FL("Inactive session %d"),
+ pDisConDoneInd->sessionId);
+ }
+ break;
+
case eWNI_SME_SWITCH_CHL_REQ: // in case of STA, the SWITCH_CHANNEL originates from its AP
smsLog( pMac, LOGW, FL("eWNI_SME_SWITCH_CHL_REQ from SME"));
pSwitchChnInd = (tpSirSmeSwitchChannelInd)pSirMsg;
@@ -11089,16 +11084,6 @@
}
if(!fToRoam)
{
- //Tell HDD about the lost link
- if(!CSR_IS_INFRA_AP(&pSession->connectedProfile))
- {
- /* Don't call csrRoamCallCallback for GO/SoftAp case as this indication
- * was already given as part of eWNI_SME_DISASSOC_IND msg handling in
- * csrRoamCheckForLinkStatusChange API.
- */
- csrRoamCallCallback(pMac, sessionId, &roamInfo, 0, eCSR_ROAM_LOSTLINK, result);
- }
-
/*No need to start idle scan in case of IBSS/SAP
Still enable idle scan for polling in case concurrent sessions are running */
if(CSR_IS_INFRASTRUCTURE(&pSession->connectedProfile))
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index d02a59c..86863ec 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -2784,74 +2784,121 @@
{
eHalStatus status = eHAL_STATUS_SUCCESS;
tSirMbMsg *pMsg = (tSirMbMsg *)pMsgBuf;
+ tSirSmeDisConDoneInd *pDisConDoneInd;
+ tCsrRoamInfo roamInfo = {0};
- if((eWNI_SME_SCAN_RSP == pMsg->type) || (eWNI_SME_GET_SCANNED_CHANNEL_RSP == pMsg->type))
+ if((eWNI_SME_SCAN_RSP == pMsg->type) ||
+ (eWNI_SME_GET_SCANNED_CHANNEL_RSP == pMsg->type))
{
status = csrScanSmeScanResponse( pMac, pMsgBuf );
}
else
{
- if(pMsg->type == eWNI_SME_UPPER_LAYER_ASSOC_CNF)
+ switch (pMsg->type)
{
- tCsrRoamSession *pSession;
- tSirSmeAssocIndToUpperLayerCnf *pUpperLayerAssocCnf;
- tCsrRoamInfo roamInfo;
- tCsrRoamInfo *pRoamInfo = NULL;
- tANI_U32 sessionId;
- eHalStatus status;
- smsLog( pMac, LOG1, FL("Scanning : ASSOCIATION confirmation can be given to upper layer "));
- vos_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0);
- pRoamInfo = &roamInfo;
- pUpperLayerAssocCnf = (tSirSmeAssocIndToUpperLayerCnf *)pMsgBuf;
- status = csrRoamGetSessionIdFromBSSID( pMac, (tCsrBssid *)pUpperLayerAssocCnf->bssId, &sessionId );
- pSession = CSR_GET_SESSION(pMac, sessionId);
-
- if(!pSession)
+ case eWNI_SME_UPPER_LAYER_ASSOC_CNF:
{
- smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
- return eHAL_STATUS_FAILURE;
- }
+ tCsrRoamSession *pSession;
+ tSirSmeAssocIndToUpperLayerCnf *pUpperLayerAssocCnf;
+ tCsrRoamInfo *pRoamInfo = NULL;
+ tANI_U32 sessionId;
+ eHalStatus status;
- pRoamInfo->statusCode = eSIR_SME_SUCCESS; //send the status code as Success
- pRoamInfo->u.pConnectedProfile = &pSession->connectedProfile;
- pRoamInfo->staId = (tANI_U8)pUpperLayerAssocCnf->aid;
- pRoamInfo->rsnIELen = (tANI_U8)pUpperLayerAssocCnf->rsnIE.length;
- pRoamInfo->prsnIE = pUpperLayerAssocCnf->rsnIE.rsnIEdata;
- pRoamInfo->addIELen = (tANI_U8)pUpperLayerAssocCnf->addIE.length;
- pRoamInfo->paddIE = pUpperLayerAssocCnf->addIE.addIEdata;
- vos_mem_copy(pRoamInfo->peerMac, pUpperLayerAssocCnf->peerMacAddr, sizeof(tSirMacAddr));
- vos_mem_copy(&pRoamInfo->bssid, pUpperLayerAssocCnf->bssId, sizeof(tCsrBssid));
- pRoamInfo->wmmEnabledSta = pUpperLayerAssocCnf->wmmEnabledSta;
+ smsLog( pMac, LOG1,
+ FL("Scanning : ASSOCIATION confirmation can be given to upper layer "));
+ pRoamInfo = &roamInfo;
+ pUpperLayerAssocCnf = (tSirSmeAssocIndToUpperLayerCnf *)pMsgBuf;
+ status = csrRoamGetSessionIdFromBSSID( pMac,
+ (tCsrBssid *)pUpperLayerAssocCnf->bssId,
+ &sessionId );
+ pSession = CSR_GET_SESSION(pMac, sessionId);
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL("session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
+ //send the status code as Success
+ pRoamInfo->statusCode = eSIR_SME_SUCCESS;
+ pRoamInfo->u.pConnectedProfile = &pSession->connectedProfile;
+ pRoamInfo->staId = (tANI_U8)pUpperLayerAssocCnf->aid;
+ pRoamInfo->rsnIELen =
+ (tANI_U8)pUpperLayerAssocCnf->rsnIE.length;
+ pRoamInfo->prsnIE = pUpperLayerAssocCnf->rsnIE.rsnIEdata;
+ pRoamInfo->addIELen =
+ (tANI_U8)pUpperLayerAssocCnf->addIE.length;
+ pRoamInfo->paddIE = pUpperLayerAssocCnf->addIE.addIEdata;
+ vos_mem_copy(pRoamInfo->peerMac,
+ pUpperLayerAssocCnf->peerMacAddr,
+ sizeof(tSirMacAddr));
+ vos_mem_copy(&pRoamInfo->bssid,
+ pUpperLayerAssocCnf->bssId,
+ sizeof(tCsrBssid));
+ pRoamInfo->wmmEnabledSta = pUpperLayerAssocCnf->wmmEnabledSta;
#ifdef WLAN_FEATURE_AP_HT40_24G
- pRoamInfo->HT40MHzIntoEnabledSta =
- pUpperLayerAssocCnf->HT40MHzIntoEnabledSta;
+ pRoamInfo->HT40MHzIntoEnabledSta =
+ pUpperLayerAssocCnf->HT40MHzIntoEnabledSta;
#endif
- if(CSR_IS_INFRA_AP(pRoamInfo->u.pConnectedProfile) )
- {
- pMac->roam.roamSession[sessionId].connectState = eCSR_ASSOC_STATE_TYPE_INFRA_CONNECTED;
- pRoamInfo->fReassocReq = pUpperLayerAssocCnf->reassocReq;
- status = csrRoamCallCallback(pMac, sessionId, pRoamInfo, 0, eCSR_ROAM_INFRA_IND, eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF);
- }
- if(CSR_IS_WDS_AP( pRoamInfo->u.pConnectedProfile))
- {
- vos_sleep( 100 );
- pMac->roam.roamSession[sessionId].connectState = eCSR_ASSOC_STATE_TYPE_WDS_CONNECTED;//Sta
- status = csrRoamCallCallback(pMac, sessionId, pRoamInfo, 0, eCSR_ROAM_WDS_IND, eCSR_ROAM_RESULT_WDS_ASSOCIATION_IND);//Sta
- }
-
+ if(CSR_IS_INFRA_AP(pRoamInfo->u.pConnectedProfile) )
+ {
+ pMac->roam.roamSession[sessionId].connectState =
+ eCSR_ASSOC_STATE_TYPE_INFRA_CONNECTED;
+ pRoamInfo->fReassocReq = pUpperLayerAssocCnf->reassocReq;
+ status = csrRoamCallCallback(pMac, sessionId, pRoamInfo,
+ 0, eCSR_ROAM_INFRA_IND,
+ eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF);
+ }
+ if(CSR_IS_WDS_AP( pRoamInfo->u.pConnectedProfile))
+ {
+ vos_sleep( 100 );
+ pMac->roam.roamSession[sessionId].connectState =
+ eCSR_ASSOC_STATE_TYPE_WDS_CONNECTED;//Sta
+ status = csrRoamCallCallback(pMac, sessionId, pRoamInfo, 0,
+ eCSR_ROAM_WDS_IND,
+ eCSR_ROAM_RESULT_WDS_ASSOCIATION_IND);//Sta
+ }
+ break;
}
- else
- {
+ case eWNI_SME_DISCONNECT_DONE_IND:
+ pDisConDoneInd = (tSirSmeDisConDoneInd *)(pMsg);
- if( csrIsAnySessionInConnectState( pMac ) )
+ smsLog( pMac, LOG1,
+ FL("eWNI_SME_DISCONNECT_DONE_IND RC:%d"),
+ pDisConDoneInd->reasonCode);
+ if( CSR_IS_SESSION_VALID(pMac, pDisConDoneInd->sessionId))
{
- //In case of we are connected, we need to check whether connect status changes
- //because scan may also run while connected.
- csrRoamCheckForLinkStatusChange( pMac, ( tSirSmeRsp * )pMsgBuf );
+ roamInfo.reasonCode = pDisConDoneInd->reasonCode;
+ roamInfo.statusCode = eSIR_SME_STA_DISASSOCIATED;
+ vos_mem_copy(roamInfo.peerMac, pDisConDoneInd->peerMacAddr,
+ sizeof(tSirMacAddr));
+ status = csrRoamCallCallback(pMac,
+ pDisConDoneInd->sessionId,
+ &roamInfo, 0,
+ eCSR_ROAM_LOSTLINK,
+ eCSR_ROAM_RESULT_DISASSOC_IND);
}
else
{
- smsLog( pMac, LOGW, "Message [0x%04x] received in state, when expecting Scan Response", pMsg->type );
+ smsLog(pMac, LOGE, FL("Inactive session %d"),
+ pDisConDoneInd->sessionId);
+ status = eHAL_STATUS_FAILURE;
+ }
+ break;
+
+ default :
+ if( csrIsAnySessionInConnectState( pMac ) )
+ {
+ /*In case of we are connected, we need to check whether connect
+ * status changes because scan may also run while connected.
+ */
+ csrRoamCheckForLinkStatusChange( pMac, (tSirSmeRsp *)pMsgBuf );
+ }
+ else
+ {
+ smsLog( pMac, LOGW,
+ "Message [0x%04x] received in state, when expecting Scan Response",
+ pMsg->type );
}
}
}