wlan : To remove PAL memory wrapper in PE(1)
This is to remove PAL memory wrapper in PE and replace with vos calls
CRs-Fixed: 520321
Change-Id: I2b7ae46915771a09a20301b14460c9f40a9fa314
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index fae3da2..08f6bdb 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -116,22 +116,23 @@
pMac->lim.gLimMlmScanResultLength = 0;
pMac->lim.gLimSmeScanResultLength = 0;
- palZeroMemory(pMac->hHdd, pMac->lim.gLimCachedScanHashTable,
- sizeof(pMac->lim.gLimCachedScanHashTable));
+ vos_mem_set(pMac->lim.gLimCachedScanHashTable,
+ sizeof(pMac->lim.gLimCachedScanHashTable), 0);
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
pMac->lim.gLimMlmLfrScanResultLength = 0;
pMac->lim.gLimSmeLfrScanResultLength = 0;
- palZeroMemory(pMac->hHdd, pMac->lim.gLimCachedLfrScanHashTable,
- sizeof(pMac->lim.gLimCachedLfrScanHashTable));
+ vos_mem_set(pMac->lim.gLimCachedLfrScanHashTable,
+ sizeof(pMac->lim.gLimCachedLfrScanHashTable), 0);
#endif
pMac->lim.gLimBackgroundScanChannelId = 0;
pMac->lim.gLimBackgroundScanStarted = 0;
pMac->lim.gLimRestoreCBNumScanInterval = LIM_RESTORE_CB_NUM_SCAN_INTERVAL_DEFAULT;
pMac->lim.gLimRestoreCBCount = 0;
- palZeroMemory(pMac->hHdd, pMac->lim.gLimLegacyBssidList, sizeof(pMac->lim.gLimLegacyBssidList));
+ vos_mem_set(pMac->lim.gLimLegacyBssidList,
+ sizeof(pMac->lim.gLimLegacyBssidList), 0);
/* Fill in default values */
pMac->lim.gLimTriggerBackgroundScanDuringQuietBss = 0;
@@ -139,8 +140,8 @@
// abort scan is used to abort an on-going scan
pMac->lim.abortScan = 0;
- palZeroMemory(pMac->hHdd, &pMac->lim.scanChnInfo, sizeof(tLimScanChnInfo));
- palZeroMemory(pMac->hHdd, &pMac->lim.dfschannelList, sizeof(tSirDFSChannelList));
+ vos_mem_set(&pMac->lim.scanChnInfo, sizeof(tLimScanChnInfo), 0);
+ vos_mem_set(&pMac->lim.dfschannelList, sizeof(tSirDFSChannelList), 0);
//WLAN_SUSPEND_LINK Related
pMac->lim.gpLimSuspendCallback = NULL;
@@ -152,7 +153,8 @@
static void __limInitBssVars(tpAniSirGlobal pMac)
{
- palZeroMemory(pMac->hHdd, (void*)pMac->lim.gpSession, sizeof(*pMac->lim.gpSession)*pMac->lim.maxBssId);
+ vos_mem_set((void*)pMac->lim.gpSession,
+ sizeof(*pMac->lim.gpSession)*pMac->lim.maxBssId, 0);
//pMac->lim.gpLimStartBssReq = NULL;
@@ -165,9 +167,9 @@
// Place holder for BSS description that we're
// currently joined with
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimCurrentBssId, sizeof(tSirMacAddr));
+ vos_mem_set(&pMac->lim.gLimCurrentBssId, sizeof(tSirMacAddr), 0);
pMac->lim.gLimCurrentChannelId = HAL_INVALID_CHANNEL_ID;
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimCurrentSSID, sizeof(tSirMacSSid));
+ vos_mem_set(&pMac->lim.gLimCurrentSSID, sizeof(tSirMacSSid), 0);
pMac->lim.gLimCurrentBssCaps = 0;
QosCaps is a bit map of various qos capabilities - see defn above
pMac->lim.gLimCurrentBssQosCaps = 0;
@@ -176,9 +178,9 @@
// Place holder for BSS description that
// we're currently Reassociating
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimReassocBssId, sizeof(tSirMacAddr));
+ vos_mem_set(&pMac->lim.gLimReassocBssId, sizeof(tSirMacAddr), 0);
pMac->lim.gLimReassocChannelId = 0;
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimReassocSSID, sizeof(tSirMacSSid));
+ vos_mem_set(&pMac->lim.gLimReassocSSID, sizeof(tSirMacSSid), 0);
pMac->lim.gLimReassocBssCaps = 0;
pMac->lim.gLimReassocBssQosCaps = 0;
pMac->lim.gLimReassocBssPropCap = 0;
@@ -214,7 +216,8 @@
pMac->lim.gLimHeartBeatCount = 0;
// Statistics to keep track of no. beacons rcvd in heart beat interval
- palZeroMemory(pMac->hHdd, pMac->lim.gLimHeartBeatBeaconStats, sizeof(pMac->lim.gLimHeartBeatBeaconStats));
+ vos_mem_set(pMac->lim.gLimHeartBeatBeaconStats,
+ sizeof(pMac->lim.gLimHeartBeatBeaconStats), 0);
#ifdef WLAN_DEBUG
// Debug counters
@@ -224,7 +227,7 @@
pMac->lim.numLearn = 0;
pMac->lim.numLearnIgnore = 0;
pMac->lim.numSme = 0;
- palZeroMemory(pMac->hHdd, pMac->lim.numMAC, sizeof(pMac->lim.numMAC));
+ vos_mem_set(pMac->lim.numMAC, sizeof(pMac->lim.numMAC), 0);
pMac->lim.gLimNumAssocReqDropInvldState = 0;
pMac->lim.gLimNumAssocReqDropACRejectTS = 0;
pMac->lim.gLimNumAssocReqDropACRejectSta = 0;
@@ -271,17 +274,17 @@
* when SME_START_BSS_REQ is received.
*/
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimOverlap11gParams, sizeof(tLimProtStaParams));
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimOverlap11aParams, sizeof(tLimProtStaParams));
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimOverlapHt20Params, sizeof(tLimProtStaParams));
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimOverlapNonGfParams, sizeof(tLimProtStaParams));
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimNoShortParams, sizeof(tLimNoShortParams));
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimNoShortSlotParams, sizeof(tLimNoShortSlotParams));
+ vos_mem_set(&pMac->lim.gLimOverlap11gParams, sizeof(tLimProtStaParams), 0);
+ vos_mem_set(&pMac->lim.gLimOverlap11aParams, sizeof(tLimProtStaParams), 0);
+ vos_mem_set(&pMac->lim.gLimOverlapHt20Params, sizeof(tLimProtStaParams), 0);
+ vos_mem_set(&pMac->lim.gLimOverlapNonGfParams, sizeof(tLimProtStaParams), 0);
+ vos_mem_set(&pMac->lim.gLimNoShortParams, sizeof(tLimNoShortParams), 0);
+ vos_mem_set(&pMac->lim.gLimNoShortSlotParams, sizeof(tLimNoShortSlotParams), 0);
pMac->lim.gLimPhyMode = 0;
pMac->lim.scanStartTime = 0; // used to measure scan time
- palZeroMemory(pMac->hHdd, pMac->lim.gLimMyMacAddr, sizeof(pMac->lim.gLimMyMacAddr));
+ vos_mem_set(pMac->lim.gLimMyMacAddr, sizeof(pMac->lim.gLimMyMacAddr), 0);
pMac->lim.ackPolicy = 0;
#if 0 /* Moving all these to session specific elements */
@@ -304,22 +307,22 @@
// WDS info
pMac->lim.gLimNumWdsInfoInd = 0;
pMac->lim.gLimNumWdsInfoSet = 0;
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimWdsInfo, sizeof(tSirWdsInfo));
+ vos_mem_set(&pMac->lim.gLimWdsInfo, sizeof(tSirWdsInfo), 0);
/* initialize some parameters */
limInitWdsInfoParams(pMac);
// Deferred Queue Paramters
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimDeferredMsgQ, sizeof(tSirAddtsReq));
+ vos_mem_set(&pMac->lim.gLimDeferredMsgQ, sizeof(tSirAddtsReq), 0);
// addts request if any - only one can be outstanding at any time
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimAddtsReq, sizeof(tSirAddtsReq));
+ vos_mem_set(&pMac->lim.gLimAddtsReq, sizeof(tSirAddtsReq) , 0);
pMac->lim.gLimAddtsSent = 0;
pMac->lim.gLimAddtsRspTimerCount = 0;
//protection related config cache
- palZeroMemory(pMac->hHdd, &pMac->lim.cfgProtection, sizeof(tCfgProtection));
+ vos_mem_set(&pMac->lim.cfgProtection, sizeof(tCfgProtection), 0);
pMac->lim.gLimProtectionControl = 0;
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimAlternateRadio, sizeof(tSirAlternateRadioInfo));
+ vos_mem_set(&pMac->lim.gLimAlternateRadio, sizeof(tSirAlternateRadioInfo), 0);
SET_LIM_PROCESS_DEFD_MESGS(pMac, true);
#if 0
@@ -341,10 +344,11 @@
pMac->lim.pDialogueTokenHead = NULL;
pMac->lim.pDialogueTokenTail = NULL;
- palZeroMemory(pMac->hHdd, &pMac->lim.tspecInfo, sizeof(tLimTspecInfo) * LIM_NUM_TSPEC_MAX);
+ vos_mem_set(&pMac->lim.tspecInfo,
+ sizeof(tLimTspecInfo) * LIM_NUM_TSPEC_MAX, 0);
// admission control policy information
- palZeroMemory(pMac->hHdd, &pMac->lim.admitPolicyInfo, sizeof(tLimAdmitPolicyInfo));
+ vos_mem_set(&pMac->lim.admitPolicyInfo, sizeof(tLimAdmitPolicyInfo), 0);
pMac->lim.gLastBeaconDtimCount = 0;
pMac->lim.gLastBeaconDtimPeriod = 0;
@@ -357,8 +361,8 @@
{
tANI_U32 val;
#if 0
- palZeroMemory(pMac->hHdd, pMac->lim.gpLimAIDpool,
- sizeof(*pMac->lim.gpLimAIDpool) * (WNI_CFG_ASSOC_STA_LIMIT_STAMAX+1));
+ vos_mem_set(pMac->lim.gpLimAIDpool,
+ sizeof(*pMac->lim.gpLimAIDpool) * (WNI_CFG_ASSOC_STA_LIMIT_STAMAX+1), 0);
pMac->lim.freeAidHead = 0;
pMac->lim.freeAidTail = 0;
#endif
@@ -376,9 +380,9 @@
/// MAC level Pre-authentication related globals
pMac->lim.gLimPreAuthChannelNumber = 0;
pMac->lim.gLimPreAuthType = eSIR_OPEN_SYSTEM;
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimPreAuthPeerAddr, sizeof(tSirMacAddr));
+ vos_mem_set(&pMac->lim.gLimPreAuthPeerAddr, sizeof(tSirMacAddr), 0);
pMac->lim.gLimNumPreAuthContexts = 0;
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimPreAuthTimerTable, sizeof(tLimPreAuthTable));
+ vos_mem_set(&pMac->lim.gLimPreAuthTimerTable, sizeof(tLimPreAuthTable), 0);
// Placed holder to deauth reason
pMac->lim.gLimDeauthReasonCode = 0;
@@ -391,8 +395,10 @@
pMac->lim.gLimDisassocFrameCredit = 0;
//One cache for each overlap and associated case.
- palZeroMemory(pMac->hHdd, pMac->lim.protStaOverlapCache, sizeof(tCacheParams) * LIM_PROT_STA_OVERLAP_CACHE_SIZE);
- palZeroMemory(pMac->hHdd, pMac->lim.protStaCache, sizeof(tCacheParams) * LIM_PROT_STA_CACHE_SIZE);
+ vos_mem_set(pMac->lim.protStaOverlapCache,
+ sizeof(tCacheParams) * LIM_PROT_STA_OVERLAP_CACHE_SIZE, 0);
+ vos_mem_set(pMac->lim.protStaCache,
+ sizeof(tCacheParams) * LIM_PROT_STA_CACHE_SIZE, 0);
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
pMac->lim.pSessionEntry = NULL;
@@ -405,7 +411,7 @@
static void __limInitTitanVars(tpAniSirGlobal pMac)
{
#if 0
- palZeroMemory(pMac->hHdd, &pMac->lim.gLimChannelSwitch, sizeof(tLimChannelSwitchInfo));
+ vos_mem_set(&pMac->lim.gLimChannelSwitch, sizeof(tLimChannelSwitchInfo), 0);
pMac->lim.gLimChannelSwitch.state = eLIM_CHANNEL_SWITCH_IDLE;
pMac->lim.gLimChannelSwitch.secondarySubBand = PHY_SINGLE_CHANNEL_CENTERED;
#endif
@@ -583,8 +589,8 @@
/* WNI_CFG_MAX_PS_POLL */
/* Allocate and fill in power save configuration. */
- if (palAllocateMemory(pMac->hHdd, (void **)&pPowerSaveConfig,
- sizeof(tSirPowerSaveCfg)) != eHAL_STATUS_SUCCESS)
+ pPowerSaveConfig = vos_mem_malloc(sizeof(tSirPowerSaveCfg));
+ if (NULL == pPowerSaveConfig)
{
PELOGE(limLog(pMac, LOGE, FL("LIM: Cannot allocate memory for power save "
"configuration"));)
@@ -595,8 +601,7 @@
* already dispatched during initialization process. Re-using the present
* configuration mask
*/
- palCopyMemory(pMac->hHdd, pPowerSaveConfig, (tANI_U8 *)&pMac->pmm.gPmmCfg,
- sizeof(tSirPowerSaveCfg));
+ vos_mem_copy(pPowerSaveConfig, (tANI_U8 *)&pMac->pmm.gPmmCfg, sizeof(tSirPowerSaveCfg));
/* Note: it is okay to do this since DAL/HAL is alrady started */
if ( (pmmSendPowerSaveCfg(pMac, pPowerSaveConfig)) != eSIR_SUCCESS)
@@ -828,7 +833,7 @@
VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO,
FL("Fixing leak! Deallocating pLimMgmtRegistration node"));
- palFreeMemory(pMac, pLimMgmtRegistration);
+ vos_mem_free(pLimMgmtRegistration);
}
vos_list_destroy(&pMac->lim.gLimMgmtFrameRegistratinQueue);
@@ -839,7 +844,7 @@
// free up preAuth table
if (pMac->lim.gLimPreAuthTimerTable.pTable != NULL)
{
- palFreeMemory(pMac->hHdd, pMac->lim.gLimPreAuthTimerTable.pTable);
+ vos_mem_free(pMac->lim.gLimPreAuthTimerTable.pTable);
pMac->lim.gLimPreAuthTimerTable.pTable = NULL;
pMac->lim.gLimPreAuthTimerTable.numEntry = 0;
}
@@ -851,42 +856,42 @@
if(NULL != pMac->lim.pDialogueTokenTail)
{
- palFreeMemory(pMac->hHdd, (void *) pMac->lim.pDialogueTokenTail);
+ vos_mem_free(pMac->lim.pDialogueTokenTail);
pMac->lim.pDialogueTokenTail = NULL;
}
# if 0
if (pMac->lim.gpLimStartBssReq != NULL)
{
- palFreeMemory(pMac->hHdd, pMac->lim.gpLimStartBssReq);
+ vos_mem_free(pMac->lim.gpLimStartBssReq);
pMac->lim.gpLimStartBssReq = NULL;
}
#endif
if (pMac->lim.gpLimMlmSetKeysReq != NULL)
{
- palFreeMemory(pMac->hHdd, pMac->lim.gpLimMlmSetKeysReq);
+ vos_mem_free(pMac->lim.gpLimMlmSetKeysReq);
pMac->lim.gpLimMlmSetKeysReq = NULL;
}
#if 0
if (pMac->lim.gpLimJoinReq != NULL)
{
- palFreeMemory(pMac->hHdd, pMac->lim.gpLimJoinReq);
+ vos_mem_free(pMac->lim.gpLimJoinReq);
pMac->lim.gpLimJoinReq = NULL;
}
#endif
if (pMac->lim.gpLimMlmAuthReq != NULL)
{
- palFreeMemory(pMac->hHdd, pMac->lim.gpLimMlmAuthReq);
+ vos_mem_free(pMac->lim.gpLimMlmAuthReq);
pMac->lim.gpLimMlmAuthReq = NULL;
}
#if 0
if (pMac->lim.gpLimMlmJoinReq != NULL)
{
- palFreeMemory(pMac->hHdd, pMac->lim.gpLimMlmJoinReq);
+ vos_mem_free(pMac->lim.gpLimMlmJoinReq);
pMac->lim.gpLimMlmJoinReq = NULL;
}
#endif
@@ -894,40 +899,40 @@
#if 0
if (pMac->lim.gpLimReassocReq != NULL)
{
- palFreeMemory(pMac->hHdd, pMac->lim.gpLimReassocReq);
+ vos_mem_free(pMac->lim.gpLimReassocReq);
pMac->lim.gpLimReassocReq = NULL;
}
#endif
if (pMac->lim.gpLimMlmRemoveKeyReq != NULL)
{
- palFreeMemory(pMac->hHdd, pMac->lim.gpLimMlmRemoveKeyReq);
+ vos_mem_free(pMac->lim.gpLimMlmRemoveKeyReq);
pMac->lim.gpLimMlmRemoveKeyReq = NULL;
}
if (pMac->lim.gpDefdSmeMsgForNOA != NULL)
{
- palFreeMemory(pMac->hHdd, pMac->lim.gpDefdSmeMsgForNOA);
+ vos_mem_free(pMac->lim.gpDefdSmeMsgForNOA);
pMac->lim.gpDefdSmeMsgForNOA = NULL;
}
if (pMac->lim.gpLimMlmScanReq != NULL)
{
- palFreeMemory(pMac->hHdd, pMac->lim.gpLimMlmScanReq);
+ vos_mem_free(pMac->lim.gpLimMlmScanReq);
pMac->lim.gpLimMlmScanReq = NULL;
}
#if 0
if(NULL != pMac->lim.beacon)
{
- palFreeMemory(pMac->hHdd, (void*) pMac->lim.beacon);
+ vos_mem_free((void*) pMac->lim.beacon);
pMac->lim.beacon = NULL;
}
#endif
#if 0
if(NULL != pMac->lim.assocReq)
{
- palFreeMemory(pMac->hHdd, (void*) pMac->lim.assocReq);
+ vos_mem_free((void*) pMac->lim.assocReq);
pMac->lim.assocReq= NULL;
}
#endif
@@ -935,7 +940,7 @@
#if 0
if(NULL != pMac->lim.assocRsp)
{
- palFreeMemory(pMac->hHdd, (void*) pMac->lim.assocRsp);
+ vos_mem_free((void*) pMac->lim.assocRsp);
pMac->lim.assocRsp= NULL;
}
#endif
@@ -978,55 +983,53 @@
return eSIR_FAILURE;
}
- if (eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
- (void **) &pMac->lim.limTimers.gpLimCnfWaitTimer, sizeof(TX_TIMER)*pMac->lim.maxStation))
+ pMac->lim.limTimers.gpLimCnfWaitTimer = vos_mem_malloc(sizeof(TX_TIMER) * pMac->lim.maxStation);
+ if (NULL == pMac->lim.limTimers.gpLimCnfWaitTimer)
{
PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!"));)
return eSIR_FAILURE;
}
#if 0
- if (eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
- (void **) &pMac->lim.gpLimAIDpool,
- sizeof(*pMac->lim.gpLimAIDpool) * (WNI_CFG_ASSOC_STA_LIMIT_STAMAX+1)))
+ pMac->lim.gpLimAIDpool = vos_mem_malloc(sizeof(*pMac->lim.gpLimAIDpool) * (WNI_CFG_ASSOC_STA_LIMIT_STAMAX+1));
+ if (NULL == pMac->lim.gpLimAIDpool)
{
PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!"));)
return eSIR_FAILURE;
}
#endif
- if (eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
- (void **) &pMac->lim.gpSession, sizeof(tPESession)* pMac->lim.maxBssId))
+ pMac->lim.gpSession = vos_mem_malloc(sizeof(tPESession)* pMac->lim.maxBssId);
+ if (NULL == pMac->lim.gpSession)
{
limLog(pMac, LOGE, FL("memory allocate failed!"));
return eSIR_FAILURE;
}
- palZeroMemory(pMac->hHdd, pMac->lim.gpSession, sizeof(tPESession)*pMac->lim.maxBssId);
+ vos_mem_set(pMac->lim.gpSession, sizeof(tPESession)*pMac->lim.maxBssId, 0);
/*
- if (eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
- (void **) &pMac->dph.dphHashTable.pHashTable, sizeof(tpDphHashNode)*pMac->lim.maxStation))
+ pMac->dph.dphHashTable.pHashTable = vos_mem_malloc(sizeof(tpDphHashNode)*pMac->lim.maxStation);
+ if (NULL == pMac->dph.dphHashTable.pHashTable)
{
PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!"));)
return eSIR_FAILURE;
}
- if (eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
- (void **) &pMac->dph.dphHashTable.pDphNodeArray, sizeof(tDphHashNode)*pMac->lim.maxStation))
+ pMac->dph.dphHashTable.pDphNodeArray = vos_mem_malloc(sizeof(tDphHashNode)*pMac->lim.maxStation);
+ if (NULL == pMac->dph.dphHashTable.pDphNodeArray)
{
PELOGE(limLog(pMac, LOGE, FL("memory allocate failed!"));)
return eSIR_FAILURE;
}
*/
-
- if (eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
- (void **) &pMac->pmm.gPmmTim.pTim, sizeof(tANI_U8)*pMac->lim.maxStation))
+ pMac->pmm.gPmmTim.pTim = vos_mem_malloc(sizeof(tANI_U8)*pMac->lim.maxStation);
+ if (NULL == pMac->pmm.gPmmTim.pTim)
{
PELOGE(limLog(pMac, LOGE, FL("memory allocate failed for pTim!"));)
return eSIR_FAILURE;
}
- palZeroMemory(pMac->hHdd, pMac->pmm.gPmmTim.pTim, sizeof(tANI_U8)*pMac->lim.maxStation);
+ vos_mem_set(pMac->pmm.gPmmTim.pTim, sizeof(tANI_U8)*pMac->lim.maxStation, 0);
pMac->lim.mgmtFrameSessionId = 0xff;
pMac->lim.deferredMsgCnt = 0;
@@ -1061,22 +1064,22 @@
peDeleteSession(pMac,&pMac->lim.gpSession[i]);
}
}
- palFreeMemory(pMac->hHdd, pMac->lim.limTimers.gpLimCnfWaitTimer);
+ vos_mem_free(pMac->lim.limTimers.gpLimCnfWaitTimer);
pMac->lim.limTimers.gpLimCnfWaitTimer = NULL;
#if 0
- palFreeMemory(pMac->hHdd, pMac->lim.gpLimAIDpool);
+ vos_mem_free(pMac->lim.gpLimAIDpool);
pMac->lim.gpLimAIDpool = NULL;
#endif
- palFreeMemory(pMac->hHdd, pMac->lim.gpSession);
+ vos_mem_free(pMac->lim.gpSession);
pMac->lim.gpSession = NULL;
/*
- palFreeMemory(pMac->hHdd, pMac->dph.dphHashTable.pHashTable);
+ vos_mem_free(pMac->dph.dphHashTable.pHashTable);
pMac->dph.dphHashTable.pHashTable = NULL;
- palFreeMemory(pMac->hHdd, pMac->dph.dphHashTable.pDphNodeArray);
+ vos_mem_free(pMac->dph.dphHashTable.pDphNodeArray);
pMac->dph.dphHashTable.pDphNodeArray = NULL;
*/
- palFreeMemory(pMac->hHdd, pMac->pmm.gPmmTim.pTim);
+ vos_mem_free(pMac->pmm.gPmmTim.pTim);
pMac->pmm.gPmmTim.pTim = NULL;
if( !VOS_IS_STATUS_SUCCESS( vos_lock_destroy( &pMac->lim.lkPeGlobalLock ) ) )
{
@@ -1607,9 +1610,9 @@
int i;
if (!pStaParams->numSta)
{
- palCopyMemory( pMac->hHdd, pMac->lim.protStaOverlapCache[0].addr,
- bssId,
- sizeof(tSirMacAddr));
+ vos_mem_copy(pMac->lim.protStaOverlapCache[0].addr,
+ bssId,
+ sizeof(tSirMacAddr));
pMac->lim.protStaOverlapCache[0].active = true;
pStaParams->numSta = 1;
@@ -1621,7 +1624,7 @@
{
if (pMac->lim.protStaOverlapCache[i].active)
{
- if (palEqualMemory( pMac->hHdd,pMac->lim.protStaOverlapCache[i].addr,
+ if (vos_mem_compare( pMac->lim.protStaOverlapCache[i].addr,
bssId,
sizeof(tSirMacAddr))) {
return; }
@@ -1636,9 +1639,9 @@
}
else
{
- palCopyMemory( pMac->hHdd, pMac->lim.protStaOverlapCache[i].addr,
- bssId,
- sizeof(tSirMacAddr));
+ vos_mem_copy(pMac->lim.protStaOverlapCache[i].addr,
+ bssId,
+ sizeof(tSirMacAddr));
pMac->lim.protStaOverlapCache[i].active = true;
pStaParams->numSta++;
@@ -1808,9 +1811,9 @@
3 * sizeof(tANI_U8) + // reserved fields
pBeacon->ssId.length + 1;
- palCopyMemory( pMac->hHdd, apNewCaps.bssId,
- psessionEntry->bssId,
- sizeof(tSirMacAddr));
+ vos_mem_copy(apNewCaps.bssId,
+ psessionEntry->bssId,
+ sizeof(tSirMacAddr));
if (newChannel != psessionEntry->currentOperChannel)
{
PELOGE(limLog(pMac, LOGE, FL("Channel Change from %d --> %d - "
@@ -1838,8 +1841,8 @@
}
else
apNewCaps.channelId = psessionEntry->currentOperChannel;
- palCopyMemory( pMac->hHdd, (tANI_U8 *) &apNewCaps.ssId,
- (tANI_U8 *) &pBeacon->ssId,
+ vos_mem_copy((tANI_U8 *) &apNewCaps.ssId,
+ (tANI_U8 *) &pBeacon->ssId,
pBeacon->ssId.length + 1);
psessionEntry->fIgnoreCapsChange = false;
@@ -2086,10 +2089,8 @@
return;
}
- if (eHAL_STATUS_SUCCESS !=
- palAllocateMemory(pMac->hHdd,
- (void **) &pSirSmeMicFailureInd,
- sizeof(tSirSmeMicFailureInd)))
+ pSirSmeMicFailureInd = vos_mem_malloc(sizeof(tSirSmeMicFailureInd));
+ if (NULL == pSirSmeMicFailureInd)
{
// Log error
limLog(pMac, LOGP,
@@ -2102,24 +2103,24 @@
pSirSmeMicFailureInd->sessionId = psessionEntry->smeSessionId;
vos_mem_copy(pSirSmeMicFailureInd->bssId,
- pSirMicFailureInd->bssId,
- sizeof(tSirMacAddr));
+ pSirMicFailureInd->bssId,
+ sizeof(tSirMacAddr));
vos_mem_copy(pSirSmeMicFailureInd->info.srcMacAddr,
- pSirMicFailureInd->info.srcMacAddr,
- sizeof(tSirMacAddr));
+ pSirMicFailureInd->info.srcMacAddr,
+ sizeof(tSirMacAddr));
vos_mem_copy(pSirSmeMicFailureInd->info.taMacAddr,
- pSirMicFailureInd->info.taMacAddr,
- sizeof(tSirMacAddr));
+ pSirMicFailureInd->info.taMacAddr,
+ sizeof(tSirMacAddr));
vos_mem_copy(pSirSmeMicFailureInd->info.dstMacAddr,
- pSirMicFailureInd->info.dstMacAddr,
- sizeof(tSirMacAddr));
+ pSirMicFailureInd->info.dstMacAddr,
+ sizeof(tSirMacAddr));
vos_mem_copy(pSirSmeMicFailureInd->info.rxMacAddr,
- pSirMicFailureInd->info.rxMacAddr,
- sizeof(tSirMacAddr));
+ pSirMicFailureInd->info.rxMacAddr,
+ sizeof(tSirMacAddr));
pSirSmeMicFailureInd->info.multicast =
pSirMicFailureInd->info.multicast;
@@ -2131,7 +2132,7 @@
pSirMicFailureInd->info.IV1;
vos_mem_copy(pSirSmeMicFailureInd->info.TSC,
- pSirMicFailureInd->info.TSC,SIR_CIPHER_SEQ_CTR_SIZE);
+ pSirMicFailureInd->info.TSC,SIR_CIPHER_SEQ_CTR_SIZE);
mmhMsg.type = eWNI_SME_MIC_FAILURE_IND;
mmhMsg.bodyptr = pSirSmeMicFailureInd;