wlan: Remove WDA_SET_MAX_TX_POWER_PER_BAND_RSP msg as its not used
WDA_SetMaxTxPowerPerBandCallBack post a msg
WDA_SET_MAX_TX_POWER_PER_BAND_RSP to lim but the msg is not handled
in lim and only operation done is to free the wdaMsgParam memory.
Fix is to remove the WDA_SET_MAX_TX_POWER_PER_BAND_RSP msg as no
resp is expected by LIM and free the wdaMsgParam memory in
WDA_SetMaxTxPowerPerBandCallBack
Change-Id: I235a1aa237dc1fe11ed220c77ab48dd0c2d2b1be
CRs-Fixed: 2218939
diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h
index 5b93620..ad1a547 100644
--- a/CORE/MAC/src/include/sirParams.h
+++ b/CORE/MAC/src/include/sirParams.h
@@ -700,8 +700,6 @@
#define SIR_HAL_SET_MAX_TX_POWER_PER_BAND_REQ \
(SIR_HAL_ITC_MSG_TYPES_BEGIN + 229)
-#define SIR_HAL_SET_MAX_TX_POWER_PER_BAND_RSP \
- (SIR_HAL_ITC_MSG_TYPES_BEGIN + 230)
#define SIR_HAL_BCN_MISS_RATE_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 231)
diff --git a/CORE/SYS/legacy/src/utils/src/macTrace.c b/CORE/SYS/legacy/src/utils/src/macTrace.c
index 5c72c14..c90dbaf 100644
--- a/CORE/SYS/legacy/src/utils/src/macTrace.c
+++ b/CORE/SYS/legacy/src/utils/src/macTrace.c
@@ -786,7 +786,6 @@
#endif //SUPPORT_BEACON_FILTER
CASE_RETURN_STRING(WDA_SET_MAX_TX_POWER_REQ);
CASE_RETURN_STRING(WDA_SET_MAX_TX_POWER_RSP);
- CASE_RETURN_STRING(WDA_SET_MAX_TX_POWER_PER_BAND_RSP);
CASE_RETURN_STRING(WDA_SET_MAX_TX_POWER_PER_BAND_REQ);
CASE_RETURN_STRING(WDA_SEND_MSG_COMPLETE);
CASE_RETURN_STRING(WDA_SET_HOST_OFFLOAD);
diff --git a/CORE/WDA/inc/wlan_qct_wda.h b/CORE/WDA/inc/wlan_qct_wda.h
index 69a48fd..dda8b04 100644
--- a/CORE/WDA/inc/wlan_qct_wda.h
+++ b/CORE/WDA/inc/wlan_qct_wda.h
@@ -1144,8 +1144,6 @@
#define WDA_SET_MAX_TX_POWER_PER_BAND_REQ \
SIR_HAL_SET_MAX_TX_POWER_PER_BAND_REQ
-#define WDA_SET_MAX_TX_POWER_PER_BAND_RSP \
- SIR_HAL_SET_MAX_TX_POWER_PER_BAND_RSP
#define WDA_SEND_MSG_COMPLETE SIR_HAL_SEND_MSG_COMPLETE
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index 882dc14..6124bd4 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -8855,8 +8855,6 @@
void* pUserData)
{
tWDA_ReqParams *pWdaParams = (tWDA_ReqParams *)pUserData;
- tWDA_CbContext *pWDA = NULL;
- tMaxTxPowerPerBandParams *pMxTxPwrPerBandParams = NULL;
VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
"<------ %s ", __func__);
@@ -8867,38 +8865,14 @@
VOS_ASSERT(0);
return ;
}
- pWDA = (tWDA_CbContext *) pWdaParams->pWdaContext;
- if (NULL == pWDA)
- {
- VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s:pWDA is NULL", __func__);
- vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
- vos_mem_free(pWdaParams->wdaMsgParam);
- vos_mem_free(pWdaParams);
- VOS_ASSERT(0);
- return ;
- }
- pMxTxPwrPerBandParams = (tMaxTxPowerPerBandParams*)pWdaParams->wdaMsgParam;
- if ( NULL == pMxTxPwrPerBandParams )
- {
- VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: pMxTxPwrPerBandParams received NULL ", __func__);
- VOS_ASSERT(0);
- vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
- vos_mem_free(pWdaParams);
- return;
- }
-
- /*need to free memory for the pointers used in the
- WDA Process.Set Max Tx Power Req function*/
+ /*
+ * Need to free memory for the pointers used in the WDA Process.Set Max Tx
+ * Power Req function
+ */
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams->wdaMsgParam);
vos_mem_free(pWdaParams);
- pMxTxPwrPerBandParams->power = pwdiSetMaxTxPowerPerBandRsp->ucPower;
-
- /* send response to UMAC*/
- WDA_SendMsg(pWDA, WDA_SET_MAX_TX_POWER_PER_BAND_RSP,
- pMxTxPwrPerBandParams, 0);
return;
}
@@ -8956,12 +8930,10 @@
"Failure in SET MAX TX Power REQ Params WDI API,"
" free all the memory");
vos_mem_free(pWdaParams->wdaWdiApiMsgParam);
+ vos_mem_free(pWdaParams->wdaMsgParam);
vos_mem_free(pWdaParams);
- /* send response to UMAC*/
- WDA_SendMsg(pWDA,
- WDA_SET_MAX_TX_POWER_PER_BAND_RSP,
- MaxTxPowerPerBandParams, 0);
}
+
return CONVERT_WDI2VOS_STATUS(status);
}