summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirav Shah <nnshah@qti.qualcomm.com>2014-02-12 17:55:05 +0530
committerAkash Patel <c_akashp@qca.qualcomm.com>2014-02-12 19:20:35 -0800
commit5f2ce7867c8bc334c5bbe47aae0ba8e37248e8ca (patch)
tree206f3c6c0f406d56eeb7922b5623f57479c500a2
parent05a5f3e57cd4a2c51815e5669bf2f8e55ce42ef5 (diff)
WMA: Changes to use adf_os_mem_alloc in interrupt context
Replace vos_mem_alloc with adf_os_mem_alloc in interrupt conext to allocate memory Change-Id: Ia413964dd4746ee81892287e9ab5c82b46d8261c CRs-fixed: 614898
-rw-r--r--CORE/SERVICES/WMA/wma.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index e8029e9fa767..8f5b4d544e3d 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -848,9 +848,10 @@ static int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len)
if (kickout_event->reason == WMI_PEER_STA_KICKOUT_REASON_IBSS_DISCONNECT) {
p_inactivity = (tpSirIbssPeerInactivityInd)
- vos_mem_malloc(sizeof(tSirIbssPeerInactivityInd));
+ adf_os_mem_alloc(NULL,
+ sizeof(tSirIbssPeerInactivityInd));
if (!p_inactivity) {
- WMA_LOGE("VOS MEM Alloc Failed for tSirIbssPeerInactivity");
+ WMA_LOGE("Memory Alloc Failed for tSirIbssPeerInactivity");
return -EINVAL;
}
@@ -860,9 +861,10 @@ static int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len)
}
else {
del_sta_ctx =
- (tpDeleteStaContext)vos_mem_malloc(sizeof(tDeleteStaContext));
+ (tpDeleteStaContext)adf_os_mem_alloc(NULL,
+ sizeof(tDeleteStaContext));
if (!del_sta_ctx) {
- WMA_LOGE("VOS MEM Alloc Failed for tDeleteStaContext");
+ WMA_LOGE("Memory Alloc Failed for tDeleteStaContext");
return -EINVAL;
}
@@ -1743,7 +1745,7 @@ static int wma_oem_capability_event_callback(void *handle,
return -EINVAL;
}
- pStartOemDataRsp = vos_mem_malloc(sizeof(tStartOemDataRsp));
+ pStartOemDataRsp = adf_os_mem_alloc(NULL, sizeof(tStartOemDataRsp));
if (!pStartOemDataRsp) {
WMA_LOGE("%s: Failed to alloc pStartOemDataRsp", __func__);
return -ENOMEM;
@@ -1795,7 +1797,7 @@ static int wma_oem_measurement_report_event_callback(void *handle,
return -EINVAL;
}
- pStartOemDataRsp = vos_mem_malloc(sizeof(tStartOemDataRsp));
+ pStartOemDataRsp = adf_os_mem_alloc(NULL, sizeof(tStartOemDataRsp));
if (!pStartOemDataRsp) {
WMA_LOGE("%s: Failed to alloc pStartOemDataRsp", __func__);
return -ENOMEM;
@@ -1847,7 +1849,7 @@ static int wma_oem_error_report_event_callback(void *handle,
return -EINVAL;
}
- pStartOemDataRsp = vos_mem_malloc(sizeof(tStartOemDataRsp));
+ pStartOemDataRsp = adf_os_mem_alloc(NULL, sizeof(tStartOemDataRsp));
if (!pStartOemDataRsp) {
WMA_LOGE("%s: Failed to alloc pStartOemDataRsp", __func__);
return -ENOMEM;
@@ -1953,7 +1955,7 @@ static int wma_tdls_event_handler(void *handle, u_int8_t *event, u_int32_t len)
}
tdls_event = (tSirTdlsEventNotify *)
- vos_mem_malloc(sizeof(tSirTdlsEventNotify));
+ adf_os_mem_alloc(NULL, sizeof(tSirTdlsEventNotify));
if (!tdls_event) {
WMA_LOGE("%s: failed to allocate memory for tdls_event", __func__);
return -1;
@@ -2156,7 +2158,7 @@ static int wma_unified_bcntx_status_event_handler(void *handle, u_int8_t *cmd_pa
}
beacon_tx_complete_ind = (tSirFirstBeaconTxCompleteInd *)
- vos_mem_malloc(sizeof(tSirFirstBeaconTxCompleteInd));
+ adf_os_mem_alloc(NULL, sizeof(tSirFirstBeaconTxCompleteInd));
if (!beacon_tx_complete_ind) {
WMA_LOGE("%s: Failed to alloc beacon_tx_complete_ind", __func__);
return -ENOMEM;