wlan: Add WDA req callback for DEL STA.
If DEL STA is received during WDI busy state it is queued.
When its processed from the queue, in case of failure registered
req callback is called to indicate failure to upper layer.
In DEL STA the req callback is NULL and thus failure is not
indicated to upper layer.
Before DEL STA is sent to WDI gLimProcessDefdMsgs is set to false.
In above case LIM will not receive DEL STA response and thus
gLimProcessDefdMsgs is not set to true again and thus all PE
messages are deffered and are not processed. This lead to sme
command stuck.
To fix this assign req callback to DEL STA. Added req callback
for DEL BSS, ADD BSS, ADD STA, ADD SELF STA as well.
CRs-Fixed: 883713
Change-Id: If6dcc675f8de71a5baceb44df566c8e54b2aeaf9
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index 79cf4b4..07c94ca 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -3640,10 +3640,10 @@
}
/*
- * FUNCTION: WDA_ConfigBssReqCallback
+ * FUNCTION: WDA_ConfigBssRspCallback
* config BSS Req Callback, called by WDI
*/
-void WDA_ConfigBssReqCallback(WDI_ConfigBSSRspParamsType *wdiConfigBssRsp
+void WDA_ConfigBssRspCallback(WDI_ConfigBSSRspParamsType *wdiConfigBssRsp
,void* pUserData)
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
@@ -3778,6 +3778,40 @@
wdiEdcaParam->wdiCW.max = macEdcaParam->cw.max;
wdiEdcaParam->usTXOPLimit = macEdcaParam->txoplimit;
}
+void WDA_ConfigBssReqCallback(WDI_Status wdiStatus,
+ void* pUserData)
+{
+ tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
+ tWDA_CbContext *pWDA;
+ tAddBssParams *addBssParams;
+
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ "<------ %s, wdiStatus: %d",
+ __func__, wdiStatus);
+
+ if (NULL == pWdaParams)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Invalid pWdaParams pointer", __func__);
+ VOS_ASSERT(0);
+ return;
+ }
+
+ pWDA = (tWDA_CbContext *)pWdaParams->pWdaContext;
+ addBssParams = (tAddBssParams *)pWdaParams->wdaMsgParam;
+
+ addBssParams->status = wdiStatus;
+
+ if (IS_WDI_STATUS_FAILURE(wdiStatus))
+ {
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams) ;
+ WDA_SendMsg(pWDA, WDA_ADD_BSS_RSP, (void *)addBssParams , 0);
+ }
+
+ return ;
+}
+
/*
* FUNCTION: WDA_ProcessConfigBssReq
* Configure BSS before starting Assoc with AP
@@ -3821,13 +3855,15 @@
vos_mem_set(wdiConfigBssReqParam, sizeof(WDI_ConfigBSSReqParamsType), 0);
WDA_UpdateBSSParams(pWDA, &wdiConfigBssReqParam->wdiReqInfo,
configBssReqParam) ;
+ wdiConfigBssReqParam->wdiReqStatusCB = WDA_ConfigBssReqCallback;
+ wdiConfigBssReqParam->pUserData = pWdaParams;
/* Store Init Req pointer, as this will be used for response */
/* store Params pass it to WDI */
pWdaParams->pWdaContext = pWDA;
pWdaParams->wdaMsgParam = configBssReqParam;
pWdaParams->wdaWdiApiMsgParam = wdiConfigBssReqParam;
status = WDI_ConfigBSSReq(wdiConfigBssReqParam,
- (WDI_ConfigBSSRspCb )WDA_ConfigBssReqCallback, pWdaParams) ;
+ (WDI_ConfigBSSRspCb )WDA_ConfigBssRspCallback, pWdaParams) ;
if(IS_WDI_STATUS_FAILURE(status))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
@@ -3949,10 +3985,10 @@
}
#endif
/*
- * FUNCTION: WDA_AddStaReqCallback
+ * FUNCTION: WDA_AddStaRspCallback
* ADD STA req callback, send RSP back to PE
*/
-void WDA_AddStaReqCallback(WDI_ConfigSTARspParamsType *wdiConfigStaRsp,
+void WDA_AddStaRspCallback(WDI_ConfigSTARspParamsType *wdiConfigStaRsp,
void* pUserData)
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
@@ -4007,11 +4043,45 @@
WDA_SendMsg(pWDA, WDA_ADD_STA_RSP, (void *)addStaReqParam, 0) ;
return ;
}
+void WDA_AddStaReqCallback(WDI_Status wdiStatus,
+ void* pUserData)
+{
+ tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
+ tWDA_CbContext *pWDA;
+ tAddStaParams *addStaParams;
+
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ "<------ %s, wdiStatus: %d",
+ __func__, wdiStatus);
+
+ if (NULL == pWdaParams)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Invalid pWdaParams pointer", __func__);
+ VOS_ASSERT(0);
+ return;
+ }
+
+ pWDA = (tWDA_CbContext *)pWdaParams->pWdaContext;
+ addStaParams = (tAddStaParams *)pWdaParams->wdaMsgParam;
+
+ addStaParams->status = wdiStatus;
+
+ if (IS_WDI_STATUS_FAILURE(wdiStatus))
+ {
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams) ;
+ WDA_SendMsg(pWDA, WDA_ADD_STA_RSP, (void *)addStaParams , 0);
+ }
+
+ return ;
+}
+
/*
* FUNCTION: WDA_ConfigStaReq
* Trigger Config STA processing in WDI
*/
-VOS_STATUS WDA_ProcessAddStaReq(tWDA_CbContext *pWDA,
+VOS_STATUS WDA_ProcessAddStaReq(tWDA_CbContext *pWDA,
tAddStaParams *addStaReqParam)
{
WDI_Status status = WDI_STATUS_SUCCESS ;
@@ -4041,13 +4111,16 @@
/* update STA params into WDI structure */
WDA_UpdateSTAParams(pWDA, &wdiConfigStaReqParam->wdiReqInfo,
addStaReqParam) ;
+ wdiConfigStaReqParam->wdiReqStatusCB = WDA_AddStaReqCallback;
+ wdiConfigStaReqParam->pUserData = pWdaParams;
/* Store Init Req pointer, as this will be used for response */
/* store Params pass it to WDI */
pWdaParams->pWdaContext = pWDA;
pWdaParams->wdaMsgParam = addStaReqParam;
pWdaParams->wdaWdiApiMsgParam = wdiConfigStaReqParam;
+
status = WDI_ConfigSTAReq(wdiConfigStaReqParam,
- (WDI_ConfigSTARspCb )WDA_AddStaReqCallback, pWdaParams) ;
+ (WDI_ConfigSTARspCb )WDA_AddStaRspCallback, pWdaParams) ;
if(IS_WDI_STATUS_FAILURE(status))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
@@ -4059,11 +4132,12 @@
}
return CONVERT_WDI2VOS_STATUS(status) ;
}
+
/*
- * FUNCTION: WDA_DelBSSReqCallback
+ * FUNCTION: WDA_DelBSSRspCallback
* Dens DEL BSS RSP back to PE
- */
-void WDA_DelBSSReqCallback(WDI_DelBSSRspParamsType *wdiDelBssRsp,
+ */
+void WDA_DelBSSRspCallback(WDI_DelBSSRspParamsType *wdiDelBssRsp,
void* pUserData)
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
@@ -4131,6 +4205,39 @@
WDA_SendMsg(pWDA, WDA_DELETE_BSS_RSP, (void *)delBssReqParam , 0) ;
return ;
}
+void WDA_DelBSSReqCallback(WDI_Status wdiStatus,
+ void* pUserData)
+{
+ tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
+ tWDA_CbContext *pWDA;
+ tDeleteBssParams *delbssParams;
+
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ "<------ %s, wdiStatus: %d",
+ __func__, wdiStatus);
+
+ if (NULL == pWdaParams)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Invalid pWdaParams pointer", __func__);
+ VOS_ASSERT(0);
+ return;
+ }
+
+ pWDA = (tWDA_CbContext *)pWdaParams->pWdaContext;
+ delbssParams = (tDeleteBssParams *)pWdaParams->wdaMsgParam;
+
+ delbssParams->status = wdiStatus ;
+
+ if (IS_WDI_STATUS_FAILURE(wdiStatus))
+ {
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams) ;
+ WDA_SendMsg(pWDA, WDA_DELETE_BSS_RSP, (void *)delbssParams , 0) ;
+ }
+
+ return ;
+}
/*
* FUNCTION: WDA_ProcessDelBssReq
@@ -4149,7 +4256,7 @@
if(NULL == wdiDelBssReqParam)
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: VOS MEM Alloc Failure", __func__);
+ "%s: VOS MEM Alloc Failure", __func__);
VOS_ASSERT(0);
return VOS_STATUS_E_NOMEM;
}
@@ -4163,15 +4270,17 @@
return VOS_STATUS_E_NOMEM;
}
wdiDelBssReqParam->ucBssIdx = delBssParam->bssIdx;
- wdiDelBssReqParam->wdiReqStatusCB = NULL ;
-
+ wdiDelBssReqParam->wdiReqStatusCB = WDA_DelBSSReqCallback ;
+ wdiDelBssReqParam->pUserData = pWdaParams;
+
/* Store Init Req pointer, as this will be used for response */
/* store Params pass it to WDI */
pWdaParams->pWdaContext = pWDA;
pWdaParams->wdaMsgParam = delBssParam;
pWdaParams->wdaWdiApiMsgParam = wdiDelBssReqParam;
+
status = WDI_DelBSSReq(wdiDelBssReqParam,
- (WDI_DelBSSRspCb )WDA_DelBSSReqCallback, pWdaParams) ;
+ (WDI_DelBSSRspCb )WDA_DelBSSRspCallback, pWdaParams) ;
if(IS_WDI_STATUS_FAILURE(status))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
@@ -4184,10 +4293,10 @@
return CONVERT_WDI2VOS_STATUS(status) ;
}
/*
- * FUNCTION: WDA_DelSTAReqCallback
+ * FUNCTION: WDA_DelSTARspCallback
* Dens DEL STA RSP back to PE
- */
-void WDA_DelSTAReqCallback(WDI_DelSTARspParamsType *wdiDelStaRsp,
+ */
+void WDA_DelSTARspCallback(WDI_DelSTARspParamsType *wdiDelStaRsp,
void* pUserData)
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
@@ -4199,7 +4308,7 @@
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"%s: pWdaParams received NULL", __func__);
- VOS_ASSERT(0) ;
+ VOS_ASSERT(0);
return ;
}
pWDA = (tWDA_CbContext *)pWdaParams->pWdaContext;
@@ -4226,6 +4335,40 @@
WDA_SendMsg(pWDA, WDA_DELETE_STA_RSP, (void *)delStaReqParam , 0) ;
return ;
}
+void WDA_DelSTAReqCallback(WDI_Status wdiStatus,
+ void* pUserData)
+{
+ tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
+ tWDA_CbContext *pWDA;
+ tDeleteStaParams *delStaParams;
+
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ "<------ %s, wdiStatus: %d",
+ __func__, wdiStatus);
+
+ if (NULL == pWdaParams)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Invalid pWdaParams pointer", __func__);
+ VOS_ASSERT(0);
+ return;
+ }
+
+ pWDA = (tWDA_CbContext *)pWdaParams->pWdaContext;
+ delStaParams = (tDeleteStaParams *)pWdaParams->wdaMsgParam;
+
+ delStaParams->status = wdiStatus ;
+
+ if (IS_WDI_STATUS_FAILURE(wdiStatus))
+ {
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams) ;
+ WDA_SendMsg(pWDA, WDA_DELETE_STA_RSP, (void *)delStaParams , 0) ;
+ }
+
+ return ;
+}
+
/*
* FUNCTION: WDA_ProcessDelStaReq
* Init DEL STA req with WDI
@@ -4257,14 +4400,16 @@
return VOS_STATUS_E_NOMEM;
}
wdiDelStaReqParam->ucSTAIdx = delStaParam->staIdx ;
- wdiDelStaReqParam->wdiReqStatusCB = NULL ;
+ wdiDelStaReqParam->wdiReqStatusCB = WDA_DelSTAReqCallback ;
+ wdiDelStaReqParam->pUserData = pWdaParams;
/* Store Init Req pointer, as this will be used for response */
/* store Params pass it to WDI */
pWdaParams->pWdaContext = pWDA;
pWdaParams->wdaMsgParam = delStaParam;
pWdaParams->wdaWdiApiMsgParam = wdiDelStaReqParam;
+
status = WDI_DelSTAReq(wdiDelStaReqParam,
- (WDI_DelSTARspCb )WDA_DelSTAReqCallback, pWdaParams) ;
+ (WDI_DelSTARspCb )WDA_DelSTARspCallback, pWdaParams) ;
if(IS_WDI_STATUS_FAILURE(status))
{
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
@@ -4277,7 +4422,7 @@
}
return CONVERT_WDI2VOS_STATUS(status) ;
}
-void WDA_ProcessAddStaSelfRsp(WDI_AddSTASelfRspParamsType* pwdiAddSTASelfRsp, void* pUserData)
+void WDA_ProcessAddStaSelfRspCallback(WDI_AddSTASelfRspParamsType* pwdiAddSTASelfRsp, void* pUserData)
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
tWDA_CbContext *pWDA;
@@ -4309,6 +4454,42 @@
WDA_SendMsg( pWDA, WDA_ADD_STA_SELF_RSP, (void *)pAddStaSelfRsp, 0) ;
return ;
}
+void WDA_ProcessAddStaSelfReqCallback(WDI_Status wdiStatus,
+ void* pUserData)
+{
+ tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
+ tWDA_CbContext *pWDA;
+ tAddStaSelfParams *addStaSelfParams;
+
+ VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
+ "<------ %s, wdiStatus: %d",
+ __func__, wdiStatus);
+
+ if (NULL == pWdaParams)
+ {
+ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
+ "%s: Invalid pWdaParams pointer", __func__);
+ VOS_ASSERT(0);
+ return;
+ }
+
+ pWDA = (tWDA_CbContext *)pWdaParams->pWdaContext;
+ addStaSelfParams = (tAddStaSelfParams *)pWdaParams->wdaMsgParam;
+
+ addStaSelfParams->status = wdiStatus ;
+
+ if (IS_WDI_STATUS_FAILURE(wdiStatus))
+ {
+ vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams) ;
+ pWDA->wdaAddSelfStaParams.wdaAddSelfStaFailReason
+ = WDA_ADDSTA_REQ_WDI_FAIL;
+ pWDA->wdaAddSelfStaParams.wdiAddStaSelfStaFailCounter++;
+ WDA_SendMsg(pWDA, WDA_ADD_STA_SELF_RSP, (void *)addStaSelfParams , 0);
+ }
+
+ return ;
+}
/*
* FUNCTION: WDA_ProcessAddStaSelfReq
@@ -4345,15 +4526,18 @@
vos_mem_free(wdiAddStaSelfReq) ;
return( VOS_STATUS_E_NOMEM );
}
- wdiAddStaSelfReq->wdiReqStatusCB = NULL;
+ wdiAddStaSelfReq->wdiReqStatusCB = WDA_ProcessAddStaSelfReqCallback;
+ wdiAddStaSelfReq->pUserData = pWdaParams;
vos_mem_copy( wdiAddStaSelfReq->wdiAddSTASelfInfo.selfMacAddr, pAddStaSelfReq->selfMacAddr, 6);
wdiAddStaSelfReq->wdiAddSTASelfInfo.currDeviceMode = pAddStaSelfReq->currDeviceMode;
/* Store Init Req pointer, as this will be used for response */
/* store Params pass it to WDI */
pWdaParams->pWdaContext = pWDA;
pWdaParams->wdaMsgParam = pAddStaSelfReq;
- pWdaParams->wdaWdiApiMsgParam = wdiAddStaSelfReq;
- wstatus = WDI_AddSTASelfReq( wdiAddStaSelfReq, WDA_ProcessAddStaSelfRsp, pWdaParams);
+ pWdaParams->wdaWdiApiMsgParam = wdiAddStaSelfReq;
+
+ wstatus = WDI_AddSTASelfReq( wdiAddStaSelfReq,
+ WDA_ProcessAddStaSelfRspCallback, pWdaParams);
if(IS_WDI_STATUS_FAILURE(wstatus))
{
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index f1b3f9d..225576e 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -25392,6 +25392,12 @@
*ppfnReqCB = ((WDI_DelSTAReqParamsType*)pEvent->pEventData)->wdiReqStatusCB;
*ppUserData = ((WDI_DelSTAReqParamsType*)pEvent->pEventData)->pUserData;
break;
+
+ case WDI_ADD_STA_SELF_REQ:
+ *ppfnReqCB = ((WDI_AddSTASelfReqParamsType*)pEvent->pEventData)->wdiReqStatusCB;
+ *ppUserData = ((WDI_AddSTASelfReqParamsType*)pEvent->pEventData)->pUserData;
+ break;
+
case WDI_DEL_STA_SELF_REQ:
*ppfnReqCB = ((WDI_DelSTASelfReqParamsType*)pEvent->pEventData)->wdiReqStatusCB;
*ppUserData = ((WDI_DelSTASelfReqParamsType*)pEvent->pEventData)->pUserData;