wlan : To remove PAL memory wrapper in PE(3)
This is to remove the PAL memory wrapper in PE and replace with vos calls.
CRs-Fixed: 520321
Change-Id: Icdde33e9c2a906d98be775bc00214f3d86d54906
diff --git a/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c b/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
index 45a2339..70b8f90 100644
--- a/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
@@ -122,10 +122,10 @@
|| pMac->fScanOffload
)
{
- if(eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
- (void **)&pBeacon, sizeof(tSchBeaconStruct)))
+ pBeacon = vos_mem_malloc(sizeof(tSchBeaconStruct));
+ if ( NULL == pBeacon )
{
- limLog(pMac, LOGE, FL("Unable to PAL allocate memory in limProcessBeaconFrame") );
+ limLog(pMac, LOGE, FL("Unable to allocate memory in limProcessBeaconFrame") );
return;
}
@@ -139,7 +139,7 @@
FL("Received invalid Beacon in state %X"),
psessionEntry->limMlmState);
limPrintMlmState(pMac, LOGW, psessionEntry->limMlmState);
- palFreeMemory(pMac->hHdd, pBeacon);
+ vos_mem_free(pBeacon);
return;
}
@@ -148,7 +148,8 @@
if ((!psessionEntry->lastBeaconDtimPeriod) &&
(sirCompareMacAddr( psessionEntry->bssId, pBeacon->bssid)))
{
- palCopyMemory( pMac->hHdd, ( tANI_U8* )&psessionEntry->lastBeaconTimeStamp, ( tANI_U8* )pBeacon->timeStamp, sizeof(tANI_U64) );
+ vos_mem_copy(( tANI_U8* )&psessionEntry->lastBeaconTimeStamp,
+ ( tANI_U8* )pBeacon->timeStamp, sizeof(tANI_U64) );
psessionEntry->lastBeaconDtimCount = pBeacon->tim.dtimCount;
psessionEntry->lastBeaconDtimPeriod= pBeacon->tim.dtimPeriod;
psessionEntry->currentBssBeaconCnt++;
@@ -183,25 +184,27 @@
{
if( psessionEntry->beacon != NULL )
{
- palFreeMemory(pMac->hHdd, psessionEntry->beacon);
+ vos_mem_free(psessionEntry->beacon);
psessionEntry->beacon = NULL;
}
psessionEntry->bcnLen = WDA_GET_RX_PAYLOAD_LEN(pRxPacketInfo);
- if( (palAllocateMemory(pMac->hHdd, (void**)&psessionEntry->beacon, psessionEntry->bcnLen)) != eHAL_STATUS_SUCCESS)
+ psessionEntry->beacon = vos_mem_malloc(psessionEntry->bcnLen);
+ if ( NULL == psessionEntry->beacon )
{
PELOGE(limLog(pMac, LOGE, FL("Unable to allocate memory to store beacon"));)
}
else
{
//Store the Beacon/ProbeRsp. This is sent to csr/hdd in join cnf response.
- palCopyMemory(pMac->hHdd, psessionEntry->beacon, WDA_GET_RX_MPDU_DATA(pRxPacketInfo), psessionEntry->bcnLen);
+ vos_mem_copy(psessionEntry->beacon, WDA_GET_RX_MPDU_DATA(pRxPacketInfo),
+ psessionEntry->bcnLen);
}
// STA in WT_JOIN_BEACON_STATE (IBSS)
limCheckAndAnnounceJoinSuccess(pMac, pBeacon, pHdr,psessionEntry);
} // if (pMac->lim.gLimMlmState == eLIM_MLM_WT_PROBE_RESP_STATE)
- palFreeMemory(pMac->hHdd, pBeacon);
+ vos_mem_free(pBeacon);
} // if ((pMac->lim.gLimMlmState == eLIM_MLM_WT_PROBE_RESP_STATE) || ...
else
{
@@ -274,10 +277,10 @@
(pMac->lim.gLimMlmState == eLIM_MLM_PASSIVE_SCAN_STATE) ||
(pMac->lim.gLimMlmState == eLIM_MLM_LEARN_STATE))
{
- if(eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
- (void **)&pBeacon, sizeof(tSchBeaconStruct)))
+ pBeacon = vos_mem_malloc(sizeof(tSchBeaconStruct));
+ if ( NULL == pBeacon )
{
- limLog(pMac, LOGE, FL("Unable to PAL allocate memory in limProcessBeaconFrameNoSession") );
+ limLog(pMac, LOGE, FL("Unable to allocate memory in limProcessBeaconFrameNoSession") );
return;
}
@@ -286,7 +289,7 @@
// Received wrongly formatted/invalid Beacon. Ignore and move on.
limLog(pMac, LOGW, FL("Received invalid Beacon in global MLM state %X"), pMac->lim.gLimMlmState);
limPrintMlmState(pMac, LOGW, pMac->lim.gLimMlmState);
- palFreeMemory(pMac->hHdd, pBeacon);
+ vos_mem_free(pBeacon);
return;
}
@@ -303,7 +306,7 @@
else if (pMac->lim.gLimMlmState == eLIM_MLM_LEARN_STATE)
{
} // end of eLIM_MLM_LEARN_STATE)
- palFreeMemory(pMac->hHdd, pBeacon);
+ vos_mem_free(pBeacon);
} // end of (eLIM_MLM_WT_PROBE_RESP_STATE) || (eLIM_MLM_PASSIVE_SCAN_STATE)
else
{