prima: change prototype of pWDAAckFnTxComp to pass the void pointer
As part of enhanced tx bd completion changes, Changing the
prototype of pWDAAckFnTxComp to pass the void pointer. This will
help to use this callback in both older and newer implementation.
Change-Id: Ie22f9e93e3f8ab5ac38fe98d0fb7cceec6c5356f
CRs-Fixed: 806189
diff --git a/CORE/MAC/src/pe/lim/limP2P.c b/CORE/MAC/src/pe/lim/limP2P.c
index 197840e..3c51e00 100644
--- a/CORE/MAC/src/pe/lim/limP2P.c
+++ b/CORE/MAC/src/pe/lim/limP2P.c
@@ -86,7 +86,7 @@
tpSetLinkStateCallback callback, void *callbackArg);
static tSirRetStatus limCreateSessionForRemainOnChn(tpAniSirGlobal pMac, tPESession **ppP2pSession);
-eHalStatus limP2PActionCnf(tpAniSirGlobal pMac, tANI_U32 txCompleteSuccess);
+eHalStatus limP2PActionCnf(tpAniSirGlobal pMac, void *pData);
/*----------------------------------------------------------------------------
*
@@ -670,7 +670,7 @@
tANI_U8 sessionId;
tSirRemainOnChnReq *MsgRemainonChannel = pMac->lim.gpLimRemainOnChanReq;
tSirMacAddr nullBssid = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
+ tANI_U32 txStatus = 0;
if ( NULL == MsgRemainonChannel )
{
PELOGE(limLog( pMac, LOGP,
@@ -724,7 +724,7 @@
{
limLog(pMac, LOGE,
FL("Remain on channel expired, Action frame status failure"));
- limP2PActionCnf(pMac, 0);
+ limP2PActionCnf(pMac, &txStatus);
}
return;
@@ -836,8 +836,19 @@
} /*** end limSendSmeListenRsp() ***/
-eHalStatus limP2PActionCnf(tpAniSirGlobal pMac, tANI_U32 txCompleteSuccess)
+eHalStatus limP2PActionCnf(tpAniSirGlobal pMac, void *pData)
{
+ tANI_U32 txCompleteSuccess;
+
+ if (!pData)
+ {
+ limLog(pMac, LOG1,
+ FL(" pData is NULL"));
+ return eHAL_STATUS_FAILURE;
+ }
+
+ txCompleteSuccess = *((tANI_U32*) pData);
+
limLog(pMac, LOG1,
FL(" %s txCompleteSuccess %d, Session Id %d"),
__func__, txCompleteSuccess, pMac->lim.mgmtFrameSessionId);
diff --git a/CORE/MAC/src/pe/lim/limProcessTdls.c b/CORE/MAC/src/pe/lim/limProcessTdls.c
index 1667a2e..4269569 100644
--- a/CORE/MAC/src/pe/lim/limProcessTdls.c
+++ b/CORE/MAC/src/pe/lim/limProcessTdls.c
@@ -542,9 +542,18 @@
* TX Complete for Management frames
*/
eHalStatus limMgmtTXComplete(tpAniSirGlobal pMac,
- tANI_U32 txCompleteSuccess)
+ void *pData)
{
tpPESession psessionEntry = NULL ;
+ tANI_U32 txCompleteSuccess = 0;
+
+ if (!pData)
+ {
+ limLog(pMac, LOGE, FL("pData is NULL"));
+ return eHAL_STATUS_SUCCESS;
+ }
+
+ txCompleteSuccess = *((tANI_U32*) pData);
if (0xff != pMac->lim.mgmtFrameSessionId)
{
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index 6c7853c..bf9f48a 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -4013,12 +4013,12 @@
return eHAL_STATUS_SUCCESS;
}
-eHalStatus limDisassocTxCompleteCnf(tpAniSirGlobal pMac, tANI_U32 txCompleteSuccess)
+eHalStatus limDisassocTxCompleteCnf(tpAniSirGlobal pMac, void *pData)
{
return limSendDisassocCnf(pMac);
}
-eHalStatus limDeauthTxCompleteCnf(tpAniSirGlobal pMac, tANI_U32 txCompleteSuccess)
+eHalStatus limDeauthTxCompleteCnf(tpAniSirGlobal pMac, void *pData)
{
return limSendDeauthCnf(pMac);
}
diff --git a/CORE/WDA/inc/wlan_qct_wda.h b/CORE/WDA/inc/wlan_qct_wda.h
index 532de67..b897cc3 100644
--- a/CORE/WDA/inc/wlan_qct_wda.h
+++ b/CORE/WDA/inc/wlan_qct_wda.h
@@ -382,7 +382,7 @@
//callback function for TX complete
//parameter 1 - global pMac pointer
//parameter 2 - txComplete status : 1- success, 0 - failure.
-typedef eHalStatus (*pWDAAckFnTxComp)(tpAniSirGlobal, tANI_U32);
+typedef eHalStatus (*pWDAAckFnTxComp)(tpAniSirGlobal, void *pData);
typedef struct
{
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index b7a6e26..78ca7ca 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -13932,7 +13932,7 @@
VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
"Tx Complete timeout Timer Stop Failed ");
}
- pWDA->pAckTxCbFunc( pMac, wdiLowLevelInd->wdiIndicationData.tx_complete_status);
+ pWDA->pAckTxCbFunc( pMac, &wdiLowLevelInd->wdiIndicationData.tx_complete_status);
pWDA->pAckTxCbFunc = NULL;
}
else