qcacld-3.0: Add QDF status
Replace CDF status with QDF status
Change-Id: I7170c8ae4c5bd97a8f0f383af637bb2ec312f082
CRs-Fixed: 981188
diff --git a/core/mac/src/pe/lim/lim_admit_control.c b/core/mac/src/pe/lim/lim_admit_control.c
index 2f13a41..7dd6fca 100644
--- a/core/mac/src/pe/lim/lim_admit_control.c
+++ b/core/mac/src/pe/lim/lim_admit_control.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1087,7 +1087,7 @@
goto end;
}
- if (pAddTsRspMsg->status == CDF_STATUS_SUCCESS) {
+ if (pAddTsRspMsg->status == QDF_STATUS_SUCCESS) {
PELOG1(lim_log
(pMac, LOG1,
FL("Received successful ADDTS response from HAL "));
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index 0fcf378..fc694a5 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -766,7 +766,7 @@
pMac->lim.mgmtFrameSessionId = 0xff;
pMac->lim.deferredMsgCnt = 0;
- if (!CDF_IS_STATUS_SUCCESS(cdf_mutex_init(&pMac->lim.lkPeGlobalLock))) {
+ if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init(&pMac->lim.lkPeGlobalLock))) {
PELOGE(lim_log(pMac, LOGE, FL("pe lock init failed!"));)
status = eSIR_FAILURE;
goto pe_open_lock_fail;
@@ -829,7 +829,7 @@
cdf_mem_free(pMac->lim.gpSession);
pMac->lim.gpSession = NULL;
- if (!CDF_IS_STATUS_SUCCESS
+ if (!QDF_IS_STATUS_SUCCESS
(cdf_mutex_destroy(&pMac->lim.lkPeGlobalLock))) {
return eSIR_FAILURE;
}
@@ -987,18 +987,18 @@
* @return None
*/
-CDF_STATUS pe_handle_mgmt_frame(void *p_cds_gctx, void *cds_buff)
+QDF_STATUS pe_handle_mgmt_frame(void *p_cds_gctx, void *cds_buff)
{
tpAniSirGlobal pMac;
tpSirMacMgmtHdr mHdr;
tSirMsgQ msg;
cds_pkt_t *pVosPkt;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint8_t *pRxPacketInfo;
pVosPkt = (cds_pkt_t *) cds_buff;
if (NULL == pVosPkt) {
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
pMac = cds_get_context(CDF_MODULE_ID_PE);
@@ -1006,16 +1006,16 @@
/* cannot log a failure without a valid pMac */
cds_pkt_return_packet(pVosPkt);
pVosPkt = NULL;
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
- cdf_status =
+ qdf_status =
wma_ds_peek_rx_packet_info(pVosPkt, (void *)&pRxPacketInfo, false);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
cds_pkt_return_packet(pVosPkt);
pVosPkt = NULL;
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
/*
@@ -1065,10 +1065,10 @@
lim_log(pMac, LOGW,
FL
("sys_bbt_process_message_core failed to process SIR_BB_XPORT_MGMT_MSG"));
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
/**
@@ -1081,20 +1081,20 @@
void pe_register_wma_handle(tpAniSirGlobal pMac, tSirSmeReadyReq *ready_req)
{
void *p_cds_gctx;
- CDF_STATUS retStatus;
+ QDF_STATUS retStatus;
p_cds_gctx = cds_get_global_context();
retStatus = wma_register_mgmt_frm_client(p_cds_gctx,
pe_handle_mgmt_frame);
- if (retStatus != CDF_STATUS_SUCCESS)
+ if (retStatus != QDF_STATUS_SUCCESS)
lim_log(pMac, LOGP,
FL("Registering the PE Handle with WMA has failed"));
retStatus = wma_register_roaming_callbacks(p_cds_gctx,
ready_req->csr_roam_synch_cb,
ready_req->pe_roam_synch_cb);
- if (retStatus != CDF_STATUS_SUCCESS)
+ if (retStatus != QDF_STATUS_SUCCESS)
lim_log(pMac, LOGP,
FL("Registering roaming callbacks with WMA failed"));
}
@@ -1836,7 +1836,7 @@
#endif
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
-CDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac,
+QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac,
roam_offload_synch_ind *roam_offload_synch_ind_ptr,
tpSirBssDescription bss_desc_ptr)
{
@@ -1852,7 +1852,7 @@
(tpSirProbeRespBeacon) cdf_mem_malloc(sizeof(tSirProbeRespBeacon));
if (NULL == parsed_frm_ptr) {
lim_log(pMac, LOGE, "fail to allocate memory for frame");
- return CDF_STATUS_E_NOMEM;
+ return QDF_STATUS_E_NOMEM;
}
if (roam_offload_synch_ind_ptr->beaconProbeRespLength <=
@@ -1861,7 +1861,7 @@
"few bytes in synchInd beacon / probe resp frame! length=%d",
__func__, roam_offload_synch_ind_ptr->beaconProbeRespLength);
cdf_mem_free(parsed_frm_ptr);
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
@@ -1879,7 +1879,7 @@
"Parse error Beacon, length=%d",
roam_offload_synch_ind_ptr->beaconProbeRespLength);
cdf_mem_free(parsed_frm_ptr);
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
} else {
if (sir_convert_probe_frame2_struct(pMac,
@@ -1891,7 +1891,7 @@
"Parse error ProbeResponse, length=%d",
roam_offload_synch_ind_ptr->beaconProbeRespLength);
cdf_mem_free(parsed_frm_ptr);
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
}
/* 24 byte MAC header and 12 byte to ssid IE */
@@ -1983,7 +1983,7 @@
ie_len);
}
cdf_mem_free(parsed_frm_ptr);
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
/**
* pe_roam_synch_callback() - PE level callback for roam synch propagation
@@ -1997,7 +1997,7 @@
*
* Return: Success or Failure status
*/
-CDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx,
+QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx,
roam_offload_synch_ind *roam_sync_ind_ptr,
tpSirBssDescription bss_desc)
{
@@ -2008,7 +2008,7 @@
uint16_t aid;
tpAddBssParams add_bss_params;
uint8_t local_nss;
- CDF_STATUS status = CDF_STATUS_E_FAILURE;
+ QDF_STATUS status = QDF_STATUS_E_FAILURE;
if (!roam_sync_ind_ptr) {
lim_log(mac_ctx, LOGE, FL("LFR3:roam_sync_ind_ptr is NULL"));
@@ -2030,11 +2030,11 @@
return status;
}
status = lim_roam_fill_bss_descr(mac_ctx, roam_sync_ind_ptr, bss_desc);
- if (!CDF_IS_STATUS_SUCCESS(status)) {
+ if (!QDF_IS_STATUS_SUCCESS(status)) {
lim_log(mac_ctx, LOGE, FL("LFR3:Failed to fill Bss Descr"));
return status;
}
- status = CDF_STATUS_E_FAILURE;
+ status = QDF_STATUS_E_FAILURE;
ft_session_ptr = pe_create_session(mac_ctx, bss_desc->bssId,
&session_id, mac_ctx->lim.maxStation,
eSIR_INFRASTRUCTURE_MODE);
@@ -2096,7 +2096,7 @@
if (NULL == mac_ctx->roam.pReassocResp) {
lim_log(mac_ctx, LOGE, FL("LFR3:assoc resp mem alloc failed"));
ft_session_ptr->bRoamSynchInProgress = false;
- return CDF_STATUS_E_NOMEM;
+ return QDF_STATUS_E_NOMEM;
}
cdf_mem_copy(mac_ctx->roam.pReassocResp,
(uint8_t *)roam_sync_ind_ptr +
@@ -2137,7 +2137,7 @@
if (mac_ctx->roam.pReassocResp)
cdf_mem_free(mac_ctx->roam.pReassocResp);
mac_ctx->roam.pReassocResp = NULL;
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
#endif
@@ -2259,26 +2259,26 @@
return eMGMT_DROP_NO_DROP;
}
-CDF_STATUS pe_acquire_global_lock(tAniSirLim *psPe)
+QDF_STATUS pe_acquire_global_lock(tAniSirLim *psPe)
{
- CDF_STATUS status = CDF_STATUS_E_INVAL;
+ QDF_STATUS status = QDF_STATUS_E_INVAL;
if (psPe) {
- if (CDF_IS_STATUS_SUCCESS
+ if (QDF_IS_STATUS_SUCCESS
(cdf_mutex_acquire(&psPe->lkPeGlobalLock))) {
- status = CDF_STATUS_SUCCESS;
+ status = QDF_STATUS_SUCCESS;
}
}
return status;
}
-CDF_STATUS pe_release_global_lock(tAniSirLim *psPe)
+QDF_STATUS pe_release_global_lock(tAniSirLim *psPe)
{
- CDF_STATUS status = CDF_STATUS_E_INVAL;
+ QDF_STATUS status = QDF_STATUS_E_INVAL;
if (psPe) {
- if (CDF_IS_STATUS_SUCCESS
+ if (QDF_IS_STATUS_SUCCESS
(cdf_mutex_release(&psPe->lkPeGlobalLock))) {
- status = CDF_STATUS_SUCCESS;
+ status = QDF_STATUS_SUCCESS;
}
}
return status;
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 7625e46..e9cdcd7 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -1980,7 +1980,7 @@
lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
tSirMacRateSet *oper_rate_set, tSirMacRateSet *ext_rate_set,
uint8_t *supported_mcs_set, tpPESession session_entry,
- tDot11fIEVHTCaps * vht_caps)
+ tDot11fIEVHTCaps *vht_caps)
#else
tSirRetStatus
lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds,
@@ -2348,7 +2348,7 @@
add_sta_params->updateSta = update_entry;
- add_sta_params->status = CDF_STATUS_SUCCESS;
+ add_sta_params->status = QDF_STATUS_SUCCESS;
add_sta_params->respReqd = 1;
/* Update HT Capability */
@@ -2757,7 +2757,7 @@
cdf_mem_copy((uint8_t *) pDelStaParams->staMac,
(uint8_t *) pStaDs->staAddr, sizeof(tSirMacAddr));
- pDelStaParams->status = CDF_STATUS_SUCCESS;
+ pDelStaParams->status = QDF_STATUS_SUCCESS;
msgQ.type = WMA_DELETE_STA_REQ;
msgQ.reserved = 0;
msgQ.bodyptr = pDelStaParams;
@@ -2908,7 +2908,7 @@
pAddStaParams->assocId = psessionEntry->limAID;
pAddStaParams->staType = STA_ENTRY_SELF;
- pAddStaParams->status = CDF_STATUS_SUCCESS;
+ pAddStaParams->status = QDF_STATUS_SUCCESS;
pAddStaParams->respReqd = 1;
/* Update PE session ID */
@@ -3586,7 +3586,7 @@
lim_deactivate_and_change_timer(pMac, eLIM_JOIN_FAIL_TIMER);
}
- pDelBssParams->status = CDF_STATUS_SUCCESS;
+ pDelBssParams->status = QDF_STATUS_SUCCESS;
pDelBssParams->respReqd = 1;
cdf_mem_copy(pDelBssParams->bssid, psessionEntry->bssId,
sizeof(tSirMacAddr));
@@ -4213,7 +4213,7 @@
lim_log(pMac, LOG2, FL("maxTxPower: %d"), pAddBssParams->maxTxPower);
#endif
/* FIXME_GEN4 - Any other value that can be used for initialization? */
- pAddBssParams->status = CDF_STATUS_SUCCESS;
+ pAddBssParams->status = QDF_STATUS_SUCCESS;
pAddBssParams->respReqd = true;
/* update persona */
pAddBssParams->halPersona = (uint8_t) psessionEntry->pePersona;
@@ -4744,7 +4744,7 @@
lim_log(pMac, LOG2, FL("maxTxPower: %d"), pAddBssParams->maxTxPower);
#endif
- pAddBssParams->status = CDF_STATUS_SUCCESS;
+ pAddBssParams->status = QDF_STATUS_SUCCESS;
pAddBssParams->respReqd = true;
pAddBssParams->staContext.smesessionId = psessionEntry->smeSessionId;
diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index 1cda53d..8941504 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -50,7 +50,7 @@
#include "wma.h"
extern void lim_send_set_sta_key_req(tpAniSirGlobal pMac,
- tLimMlmSetKeysReq *pMlmSetKeysReq,
+ tLimMlmSetKeysReq * pMlmSetKeysReq,
uint16_t staIdx,
uint8_t defWEPIdx,
tpPESession sessionEntry, bool sendRsp);
@@ -283,7 +283,7 @@
FL("Performing pre-auth on same channel (session %p)"),
session);
/* We are in the same channel. Perform pre-auth */
- lim_perform_ft_pre_auth(mac_ctx, CDF_STATUS_SUCCESS, NULL,
+ lim_perform_ft_pre_auth(mac_ctx, QDF_STATUS_SUCCESS, NULL,
session);
}
@@ -294,7 +294,7 @@
* Send the Auth1
* Receive back Auth2
*------------------------------------------------------------------*/
-void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, CDF_STATUS status,
+void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, QDF_STATUS status,
uint32_t *data, tpPESession psessionEntry)
{
tSirMacAuthFrameBody authFrame;
@@ -314,7 +314,7 @@
}
}
- if (status != CDF_STATUS_SUCCESS) {
+ if (status != QDF_STATUS_SUCCESS) {
lim_log(pMac, LOGE,
FL(" Change channel not successful for FT pre-auth"));
goto preauth_fail;
@@ -404,7 +404,7 @@
cdf_mem_free(pBeaconStruct);
lim_log(pMac, LOGP,
FL("Unable to allocate memory for creating ADD_BSS"));
- return (eSIR_MEM_ALLOC_FAILED);
+ return eSIR_MEM_ALLOC_FAILED;
}
cdf_mem_set((uint8_t *) pAddBssParams, sizeof(tAddBssParams), 0);
@@ -726,7 +726,7 @@
}
#endif
- pAddBssParams->status = CDF_STATUS_SUCCESS;
+ pAddBssParams->status = QDF_STATUS_SUCCESS;
pAddBssParams->respReqd = true;
pAddBssParams->staContext.sessionId = pftSessionEntry->peSessionId;
@@ -1012,7 +1012,7 @@
/*------------------------------------------------------------------
* Resume Link Call Back
*------------------------------------------------------------------*/
-void lim_ft_process_pre_auth_result(tpAniSirGlobal pMac, CDF_STATUS status,
+void lim_ft_process_pre_auth_result(tpAniSirGlobal pMac, QDF_STATUS status,
tpPESession psessionEntry)
{
if (NULL == psessionEntry ||
@@ -1172,10 +1172,11 @@
pbssDescription =
psessionEntry->ftPEContext.pFTPreAuthReq->pbssDescription;
lim_print_mac_addr(pMac, pbssDescription->bssId, LOG1);
- if ((pftSessionEntry =
+ pftSessionEntry =
pe_create_session(pMac, pbssDescription->bssId,
&sessionId, pMac->lim.maxStation,
- psessionEntry->bssType)) == NULL) {
+ psessionEntry->bssType);
+ if (pftSessionEntry == NULL) {
lim_log(pMac, LOGE, FL(
"Session not created for pre-auth 11R AP"));
status = eSIR_FAILURE;
@@ -1655,7 +1656,7 @@
}
for (i = 0; i < HAL_QOS_NUM_AC_MAX; i++) {
if ((((1 << i) & pAggrQosRspMsg->tspecIdx)) &&
- (pAggrQosRspMsg->status[i] != CDF_STATUS_SUCCESS)) {
+ (pAggrQosRspMsg->status[i] != QDF_STATUS_SUCCESS)) {
sir_copy_mac_addr(peerMacAddr, psessionEntry->bssId);
addTsParam.staIdx = pAggrQosRspMsg->staIdx;
addTsParam.sessionId = pAggrQosRspMsg->sessionId;
@@ -1878,7 +1879,7 @@
*
* Return: Status of sending message to WMA.
*/
-CDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx,
uint8_t session_id,
tSirFTPreAuthReq *ft_preauth_req)
{
@@ -1890,7 +1891,7 @@
if (NULL == scan_offload_req) {
lim_log(mac_ctx, LOGE,
FL("Memory allocation failed for pScanOffloadReq"));
- return CDF_STATUS_E_NOMEM;
+ return QDF_STATUS_E_NOMEM;
}
cdf_mem_zero(scan_offload_req, sizeof(tSirScanOffloadReq));
@@ -1932,10 +1933,10 @@
if (rc != eSIR_SUCCESS) {
lim_log(mac_ctx, LOGE, FL("START_SCAN_OFFLOAD failed %u"), rc);
cdf_mem_free(scan_offload_req);
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
@@ -1982,13 +1983,13 @@
* after successful auth, or timed out. Either way, STA
* is back to home channel. Data traffic can continue.
*/
- lim_ft_process_pre_auth_result(mac_ctx, CDF_STATUS_SUCCESS,
+ lim_ft_process_pre_auth_result(mac_ctx, QDF_STATUS_SUCCESS,
session_entry);
break;
case SCAN_EVENT_FOREIGN_CHANNEL:
/* Sta is on candidate channel. Send auth */
- lim_perform_ft_pre_auth(mac_ctx, CDF_STATUS_SUCCESS, NULL,
+ lim_perform_ft_pre_auth(mac_ctx, QDF_STATUS_SUCCESS, NULL,
session_entry);
break;
default:
diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
index e12252b..4d674fd 100644
--- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
+++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1088,7 +1088,7 @@
return eSIR_FAILURE;
}
- if (pAddStaParams->status != CDF_STATUS_SUCCESS) {
+ if (pAddStaParams->status != QDF_STATUS_SUCCESS) {
PELOGE(lim_log
(pMac, LOGE, FL("IBSS: ADD_STA_RSP error (%x) "),
pAddStaParams->status);
@@ -1137,7 +1137,7 @@
goto end;
}
- if (pDelBss->status != CDF_STATUS_SUCCESS) {
+ if (pDelBss->status != QDF_STATUS_SUCCESS) {
lim_log(pMac, LOGE,
FL("IBSS: DEL_BSS_RSP(coalesce) error (%x) Bss %d "),
pDelBss->status, pDelBss->bssIdx);
@@ -1234,7 +1234,7 @@
return;
}
- if (pDelBss->status != CDF_STATUS_SUCCESS) {
+ if (pDelBss->status != QDF_STATUS_SUCCESS) {
PELOGE(lim_log
(pMac, LOGE, FL("IBSS: DEL_BSS_RSP error (%x) Bss %d "),
pDelBss->status, pDelBss->bssIdx);
diff --git a/core/mac/src/pe/lim/lim_p2p.c b/core/mac/src/pe/lim/lim_p2p.c
index 5e06023..3a7dba6 100644
--- a/core/mac/src/pe/lim/lim_p2p.c
+++ b/core/mac/src/pe/lim/lim_p2p.c
@@ -26,7 +26,7 @@
*/
/*===========================================================================
- L I M _ P 2 P . C
+ L I M _ P 2 P . C
OVERVIEW:
@@ -36,7 +36,7 @@
/*===========================================================================
- EDIT HISTORY FOR FILE
+ EDIT HISTORY FOR FILE
This section contains comments describing changes made to the module.
Notice that changes are listed in reverse chronological order.
@@ -46,7 +46,7 @@
when who what, where, why
---------- --- --------------------------------------------------------
2011-05-02 djindal Corrected file indentation and changed remain on channel
- handling for concurrency.
+ handling for concurrency.
===========================================================================*/
#include "lim_utils.h"
@@ -63,21 +63,21 @@
received Beacon/Prpbe Resp. */
#define MAX_TIME_TO_BE_ACTIVE_CHANNEL 9000
-void lim_exit_remain_on_channel(tpAniSirGlobal pMac, CDF_STATUS status,
+void lim_exit_remain_on_channel(tpAniSirGlobal pMac, QDF_STATUS status,
uint32_t *data, tpPESession psessionEntry);
extern tSirRetStatus lim_set_link_state(tpAniSirGlobal pMac, tSirLinkState state,
tSirMacAddr bssId, tSirMacAddr selfMacAddr,
tpSetLinkStateCallback callback,
void *callbackArg);
-CDF_STATUS lim_p2p_action_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess);
+QDF_STATUS lim_p2p_action_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess);
/*------------------------------------------------------------------
*
* Below function is called if hdd requests a remain on channel.
*
*------------------------------------------------------------------*/
-static CDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac,
+static QDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac,
tSirRemainOnChnReq *
pRemOnChnReq)
{
@@ -89,7 +89,7 @@
if (NULL == pScanOffloadReq) {
lim_log(pMac, LOGE,
FL("Memory allocation failed for pScanOffloadReq"));
- return CDF_STATUS_E_NOMEM;
+ return QDF_STATUS_E_NOMEM;
}
cdf_mem_zero(pScanOffloadReq, sizeof(tSirScanOffloadReq));
@@ -122,10 +122,10 @@
lim_log(pMac, LOGE, FL("wma_post_ctrl_msg() return failure %u"),
rc);
cdf_mem_free(pScanOffloadReq);
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
/*------------------------------------------------------------------
@@ -137,11 +137,11 @@
int lim_process_remain_on_chnl_req(tpAniSirGlobal pMac, uint32_t *pMsg)
{
tSirRemainOnChnReq *msgbuff = (tSirRemainOnChnReq *) pMsg;
- CDF_STATUS status;
+ QDF_STATUS status;
pMac->lim.gpLimRemainOnChanReq = msgbuff;
status = lim_send_hal_req_remain_on_chan_offload(pMac, msgbuff);
- if (status != CDF_STATUS_SUCCESS) {
+ if (status != QDF_STATUS_SUCCESS) {
/* Post the meessage to Sme */
lim_send_sme_rsp(pMac, eWNI_SME_REMAIN_ON_CHN_RSP,
status, msgbuff->sessionId, msgbuff->scan_id);
@@ -250,14 +250,13 @@
/* get the previous valid LINK state */
if (lim_set_link_state(mac_ctx, eSIR_LINK_IDLE_STATE, null_bssid,
- mac_ctx->lim.gSelfMacAddr, NULL, NULL) != eSIR_SUCCESS)
- {
+ mac_ctx->lim.gSelfMacAddr, NULL, NULL) != eSIR_SUCCESS) {
lim_log(mac_ctx, LOGE, FL("Unable to change link state"));
return;
}
if (mac_ctx->lim.gLimMlmState != eLIM_MLM_P2P_LISTEN_STATE) {
- lim_remain_on_chn_rsp(mac_ctx, CDF_STATUS_SUCCESS, NULL);
+ lim_remain_on_chn_rsp(mac_ctx, QDF_STATUS_SUCCESS, NULL);
} else {
session = pe_find_session_by_session_id(mac_ctx,
roc_timer->sessionId);
@@ -269,11 +268,11 @@
goto error;
}
- lim_exit_remain_on_channel(mac_ctx, CDF_STATUS_SUCCESS, NULL,
+ lim_exit_remain_on_channel(mac_ctx, QDF_STATUS_SUCCESS, NULL,
session);
return;
error:
- lim_remain_on_chn_rsp(mac_ctx, CDF_STATUS_E_FAILURE, NULL);
+ lim_remain_on_chn_rsp(mac_ctx, QDF_STATUS_E_FAILURE, NULL);
}
return;
}
@@ -285,21 +284,21 @@
*
*------------------------------------------------------------------*/
-void lim_exit_remain_on_channel(tpAniSirGlobal pMac, CDF_STATUS status,
+void lim_exit_remain_on_channel(tpAniSirGlobal pMac, QDF_STATUS status,
uint32_t *data, tpPESession psessionEntry)
{
- if (status != CDF_STATUS_SUCCESS) {
+ if (status != QDF_STATUS_SUCCESS) {
PELOGE(lim_log(pMac, LOGE, "Remain on Channel Failed");)
goto error;
}
/* Set the resume channel to Any valid channel (invalid). */
/* This will instruct HAL to set it to any previous valid channel. */
pe_set_resume_channel(pMac, 0, 0);
- lim_remain_on_chn_rsp(pMac, CDF_STATUS_SUCCESS, NULL);
+ lim_remain_on_chn_rsp(pMac, QDF_STATUS_SUCCESS, NULL);
return;
error:
- lim_remain_on_chn_rsp(pMac, CDF_STATUS_E_FAILURE, NULL);
+ lim_remain_on_chn_rsp(pMac, QDF_STATUS_E_FAILURE, NULL);
return;
}
@@ -308,7 +307,7 @@
* Send remain on channel respone: Success/ Failure
*
*------------------------------------------------------------------*/
-void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, CDF_STATUS status, uint32_t *data)
+void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data)
{
tpPESession psessionEntry;
uint8_t sessionId;
@@ -324,7 +323,7 @@
}
/* Incase of the Remain on Channel Failure Case */
/* Cleanup Everything */
- if (CDF_STATUS_E_FAILURE == status) {
+ if (QDF_STATUS_E_FAILURE == status) {
/* Deactivate Remain on Channel Timer */
lim_deactivate_and_change_timer(pMac, eLIM_REMAIN_CHN_TIMER);
@@ -342,10 +341,11 @@
}
/* delete the session */
- if ((psessionEntry = pe_find_session_by_bssid(pMac,
+ psessionEntry = pe_find_session_by_bssid(pMac,
MsgRemainonChannel->
selfMacAddr.bytes,
- &sessionId)) != NULL) {
+ &sessionId);
+ if (psessionEntry != NULL) {
if (LIM_IS_P2P_DEVICE_ROLE(psessionEntry)) {
pe_delete_session(pMac, psessionEntry);
}
@@ -412,7 +412,7 @@
return;
}
-CDF_STATUS lim_p2p_action_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess)
+QDF_STATUS lim_p2p_action_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess)
{
if (pMac->lim.mgmtFrameSessionId != 0xff) {
/* The session entry might be invalid(0xff) action confirmation received after
@@ -424,7 +424,7 @@
pMac->lim.mgmtFrameSessionId = 0xff;
}
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
/**
@@ -445,7 +445,7 @@
{
uint8_t tx_flag = 0;
tpSirMacFrameCtl fc = (tpSirMacFrameCtl) mb_msg->data;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint8_t sme_session_id = 0;
uint16_t channel_freq;
@@ -459,7 +459,7 @@
if ((SIR_MAC_MGMT_PROBE_RSP == fc->subType) ||
(mb_msg->noack)) {
- cdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) msg_len,
+ qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) msg_len,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS, 7, lim_tx_complete,
frame, tx_flag, sme_session_id,
@@ -468,11 +468,11 @@
if (!mb_msg->noack)
lim_send_sme_rsp(mac_ctx,
eWNI_SME_ACTION_FRAME_SEND_CNF,
- cdf_status, mb_msg->sessionId, 0);
+ qdf_status, mb_msg->sessionId, 0);
mac_ctx->lim.mgmtFrameSessionId = 0xff;
} else {
mac_ctx->lim.mgmtFrameSessionId = mb_msg->sessionId;
- cdf_status =
+ qdf_status =
wma_tx_frameWithTxComplete(mac_ctx, packet,
(uint16_t) msg_len,
TXRX_FRM_802_11_MGMT,
@@ -481,12 +481,12 @@
sme_session_id, false,
channel_freq);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(mac_ctx, LOGE,
FL("couldn't send action frame"));
lim_send_sme_rsp(mac_ctx,
eWNI_SME_ACTION_FRAME_SEND_CNF,
- cdf_status, mb_msg->sessionId, 0);
+ qdf_status, mb_msg->sessionId, 0);
mac_ctx->lim.mgmtFrameSessionId = 0xff;
} else {
mac_ctx->lim.mgmtFrameSessionId = mb_msg->sessionId;
@@ -516,7 +516,7 @@
uint32_t msg_len;
uint8_t *frame;
void *packet;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
tpSirMacFrameCtl fc = (tpSirMacFrameCtl) mb_msg->data;
uint8_t noa_len = 0;
uint8_t noa_stream[SIR_MAX_NOA_ATTR_LEN + (2 * SIR_P2P_IE_HEADER_LEN)];
@@ -541,7 +541,7 @@
lim_log(mac_ctx, LOGE,
FL("RemainOnChannel is not running\n"));
lim_send_sme_rsp(mac_ctx, eWNI_SME_ACTION_FRAME_SEND_CNF,
- CDF_STATUS_E_FAILURE, mb_msg->sessionId, 0);
+ QDF_STATUS_E_FAILURE, mb_msg->sessionId, 0);
return;
}
sme_session_id = mb_msg->sessionId;
@@ -654,9 +654,9 @@
msg_len - PROBE_RSP_IE_OFFSET);
/* Ok-- try to allocate some memory: */
- cdf_status = cds_packet_alloc((uint16_t) msg_len, (void **)&frame,
+ qdf_status = cds_packet_alloc((uint16_t) msg_len, (void **)&frame,
(void **)&packet);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(mac_ctx, LOGE,
FL("Failed to allocate %d bytes for a Probe Request."),
msg_len);
@@ -720,7 +720,7 @@
FL("Dropping SA Query - PE Session not found"));
lim_send_sme_rsp(mac_ctx,
eWNI_SME_ACTION_FRAME_SEND_CNF,
- CDF_STATUS_E_FAILURE, mb_msg->sessionId, 0);
+ QDF_STATUS_E_FAILURE, mb_msg->sessionId, 0);
cds_packet_free((void *)packet);
return;
}
@@ -734,7 +734,7 @@
FL("Dropping SA Query due to non PMF conne."));
lim_send_sme_rsp(mac_ctx,
eWNI_SME_ACTION_FRAME_SEND_CNF,
- CDF_STATUS_E_FAILURE, mb_msg->sessionId, 0);
+ QDF_STATUS_E_FAILURE, mb_msg->sessionId, 0);
cds_packet_free((void *)packet);
return;
}
diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
index 5d97eaa..19b3889 100644
--- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
+++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
@@ -811,8 +811,7 @@
/* Stop Association failure timer */
if (subtype == LIM_ASSOC)
lim_deactivate_and_change_timer(mac_ctx, eLIM_ASSOC_FAIL_TIMER);
- else
- {
+ else {
/* Stop Reassociation failure timer */
mac_ctx->lim.reAssocRetryAttempt = 0;
if ((NULL != mac_ctx->lim.pSessionEntry)
@@ -893,7 +892,7 @@
FL("ASSOC res with eSIR_MAC_TRY_AGAIN_LATER "
" recvd.Starting timer to wait timeout=%d."),
timeout_value);
- if (CDF_STATUS_SUCCESS !=
+ if (QDF_STATUS_SUCCESS !=
cdf_mc_timer_start(
&session_entry->pmfComebackTimer,
timeout_value)) {
diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c
index 2543a3b..1723a7b 100644
--- a/core/mac/src/pe/lim/lim_process_auth_frame.c
+++ b/core/mac/src/pe/lim/lim_process_auth_frame.c
@@ -200,7 +200,7 @@
* get random bytes and use as challenge text.
* If it fails we already have random stack bytes.
*/
- if (!CDF_IS_STATUS_SUCCESS(cds_rand_get_bytes(0,
+ if (!QDF_IS_STATUS_SUCCESS(cds_rand_get_bytes(0,
(uint8_t *) challenge_txt_arr,
SIR_MAC_AUTH_CHALLENGE_LENGTH)))
lim_log(mac_ctx, LOGE,
diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c
index 11bca80..aa8f16c 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -1018,9 +1018,9 @@
***NOTE:
*
* @param pMac Pointer to Global MAC structure
- * @return CDF_STATUS_SUCCESS or CDF_STATUS_E_FAILURE
+ * @return QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE
*/
-CDF_STATUS lim_send_stop_scan_offload_req(tpAniSirGlobal pMac,
+QDF_STATUS lim_send_stop_scan_offload_req(tpAniSirGlobal pMac,
uint8_t SessionId, uint32_t scan_id, uint32_t scan_requestor_id)
{
tSirMsgQ msg;
@@ -1031,7 +1031,7 @@
if (NULL == pAbortScanParams) {
lim_log(pMac, LOGP,
FL("Memory allocation failed for AbortScanParams"));
- return CDF_STATUS_E_NOMEM;
+ return QDF_STATUS_E_NOMEM;
}
pAbortScanParams->SessionId = SessionId;
@@ -1045,11 +1045,11 @@
if (rc != eSIR_SUCCESS) {
lim_log(pMac, LOGE, FL("wma_post_ctrl_msg() return failure"));
cdf_mem_free(pAbortScanParams);
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
lim_log(pMac, LOG1, FL("Abort ongoing offload scan."));
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
@@ -1110,10 +1110,10 @@
#ifdef FEATURE_OEM_DATA_SUPPORT
-void lim_oem_data_rsp_handle_resume_link_rsp(tpAniSirGlobal pMac, CDF_STATUS status,
+void lim_oem_data_rsp_handle_resume_link_rsp(tpAniSirGlobal pMac, QDF_STATUS status,
uint32_t *mlmOemDataRsp)
{
- if (status != CDF_STATUS_SUCCESS) {
+ if (status != QDF_STATUS_SUCCESS) {
lim_log(pMac, LOGE,
FL
("OEM Data Rsp failed to get the response for resume link"));
@@ -1175,7 +1175,7 @@
tLinkStateParams *link_state_param;
uint16_t pkt_len = 0;
cds_pkt_t *body_ptr = NULL;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
tSirMsgQ new_msg;
tSirSmeScanAbortReq *req_msg = NULL;
uint8_t session_id;
@@ -1261,10 +1261,10 @@
body_ptr = (cds_pkt_t *) new_msg.bodyptr;
cds_pkt_get_packet_length(body_ptr, &pkt_len);
- cdf_status = wma_ds_peek_rx_packet_info(body_ptr,
+ qdf_status = wma_ds_peek_rx_packet_info(body_ptr,
(void **) &new_msg.bodyptr, false);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
cds_pkt_return_packet(body_ptr);
break;
}
@@ -1407,13 +1407,13 @@
p2p_go_exists = 1;
cdf_mem_copy(&session_entry->p2pGoPsNoaStartInd,
msg->bodyptr, sizeof(tSirP2PNoaStart));
- cdf_status =
+ qdf_status =
session_entry->p2pGoPsNoaStartInd.status;
- if (cdf_status != CDF_STATUS_SUCCESS)
+ if (qdf_status != QDF_STATUS_SUCCESS)
CDF_TRACE(CDF_MODULE_ID_PE, LOGW,
FL(
"GO NOA start status %d by FW"),
- cdf_status);
+ qdf_status);
break;
}
}
diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
index a4ce9e2..649402b 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
@@ -674,7 +674,7 @@
addbss_param->bssId, addbss_param->htCapable,
session);
- addbss_param->status = CDF_STATUS_SUCCESS;
+ addbss_param->status = QDF_STATUS_SUCCESS;
addbss_param->respReqd = 1;
/* Set a new state for MLME */
@@ -941,14 +941,14 @@
*/
static void
lim_process_mlm_post_join_suspend_link(tpAniSirGlobal mac_ctx,
- CDF_STATUS status,
+ QDF_STATUS status,
uint32_t *ctx)
{
tLimMlmJoinCnf mlm_join_cnf;
tpPESession session = (tpPESession) ctx;
tSirLinkState lnk_state;
- if (CDF_STATUS_SUCCESS != status) {
+ if (QDF_STATUS_SUCCESS != status) {
lim_log(mac_ctx, LOGE,
FL("Sessionid %d Suspend link(NOTIFY_BSS) failed. Still proceeding with join"),
session->peSessionId);
@@ -1057,7 +1057,7 @@
goto error;
}
lim_process_mlm_post_join_suspend_link(mac_ctx,
- CDF_STATUS_SUCCESS, (uint32_t *)session);
+ QDF_STATUS_SUCCESS, (uint32_t *)session);
} else {
lim_log(mac_ctx, LOG1, FL("No need to Suspend link"));
/*
@@ -1070,7 +1070,7 @@
FL("SessionId:%d Join req on current chan"),
sessionid);
lim_process_mlm_post_join_suspend_link(mac_ctx,
- CDF_STATUS_SUCCESS, (uint32_t *)session);
+ QDF_STATUS_SUCCESS, (uint32_t *)session);
}
return;
} else {
@@ -1578,7 +1578,7 @@
*/
static void
lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx,
- CDF_STATUS suspend_status, uint32_t *msg)
+ QDF_STATUS suspend_status, uint32_t *msg)
{
uint16_t aid;
struct cdf_mac_addr curr_bssid;
@@ -1590,7 +1590,7 @@
tLimMlmStates mlm_state;
tSirSmeDisassocRsp *sme_disassoc_rsp;
- if (CDF_STATUS_SUCCESS != suspend_status)
+ if (QDF_STATUS_SUCCESS != suspend_status)
lim_log(mac_ctx, LOGE, FL("Suspend Status is not success %X"),
suspend_status);
@@ -1655,7 +1655,7 @@
msg = (uint32_t *)sme_disassoc_rsp;
lim_send_sme_disassoc_deauth_ntf(mac_ctx,
- CDF_STATUS_SUCCESS, msg);
+ QDF_STATUS_SUCCESS, msg);
return;
}
@@ -1907,7 +1907,7 @@
mlm_disassoc_req->sessionId,
MAC_ADDR_ARRAY(mlm_disassoc_req->peer_macaddr.bytes));
- lim_process_mlm_disassoc_req_ntf(mac_ctx, CDF_STATUS_SUCCESS,
+ lim_process_mlm_disassoc_req_ntf(mac_ctx, QDF_STATUS_SUCCESS,
(uint32_t *) msg_buf);
}
@@ -1925,7 +1925,7 @@
*/
static void
lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx,
- CDF_STATUS suspend_status, uint32_t *msg_buf)
+ QDF_STATUS suspend_status, uint32_t *msg_buf)
{
uint16_t aid;
tSirMacAddr curr_bssId;
@@ -1936,7 +1936,7 @@
tpPESession session;
tSirSmeDeauthRsp *sme_deauth_rsp;
- if (CDF_STATUS_SUCCESS != suspend_status)
+ if (QDF_STATUS_SUCCESS != suspend_status)
lim_log(mac_ctx, LOGE, FL("Suspend Status is not success %X"),
suspend_status);
@@ -2016,7 +2016,7 @@
msg_buf = (uint32_t *)sme_deauth_rsp;
lim_send_sme_disassoc_deauth_ntf(mac_ctx,
- CDF_STATUS_SUCCESS, msg_buf);
+ QDF_STATUS_SUCCESS, msg_buf);
return;
}
@@ -2212,7 +2212,7 @@
mlm_deauth_req->sessionId);
return;
}
- lim_process_mlm_deauth_req_ntf(mac_ctx, CDF_STATUS_SUCCESS,
+ lim_process_mlm_deauth_req_ntf(mac_ctx, QDF_STATUS_SUCCESS,
(uint32_t *) msg_buf);
}
diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
index 918ed85..03c3c60 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
@@ -1720,7 +1720,7 @@
if (true == session_entry->fDeauthReceived) {
lim_log(mac_ctx, LOGE,
FL("Received Deauth frame in ADD_STA_RESP state"));
- if (CDF_STATUS_SUCCESS == add_sta_params->status) {
+ if (QDF_STATUS_SUCCESS == add_sta_params->status) {
lim_log(mac_ctx, LOGE,
FL("ADD_STA success, send update result code with eSIR_SME_JOIN_DEAUTH_FROM_AP_DURING_ADD_STA staIdx: %d limMlmState: %d"),
add_sta_params->staIdx,
@@ -1744,7 +1744,7 @@
}
}
- if (CDF_STATUS_SUCCESS == add_sta_params->status) {
+ if (QDF_STATUS_SUCCESS == add_sta_params->status) {
if (eLIM_MLM_WT_ADD_STA_RSP_STATE !=
session_entry->limMlmState) {
lim_log(mac_ctx, LOGE,
@@ -1783,8 +1783,7 @@
sta_ds->mlmStaContext.mlmState =
eLIM_MLM_LINK_ESTABLISHED_STATE;
sta_ds->nss = add_sta_params->nss;
- }
- else
+ } else
lim_log(mac_ctx, LOGW,
FL("Fail to get DPH Hash Entry for AID - %d"),
DPH_STA_HASH_INDEX_PEER);
@@ -1880,7 +1879,7 @@
lim_log(pMac, LOGE, FL("Invalid body pointer in message"));
goto end;
}
- if (CDF_STATUS_SUCCESS == pDelBssParams->status) {
+ if (QDF_STATUS_SUCCESS == pDelBssParams->status) {
PELOGW(lim_log(pMac, LOGW,
FL("STA received the DEL_BSS_RSP for BSSID: %X."),
pDelBssParams->bssIdx);
@@ -1980,7 +1979,7 @@
rc = eSIR_SME_REFUSED;
goto end;
}
- if (pDelBss->status != CDF_STATUS_SUCCESS) {
+ if (pDelBss->status != QDF_STATUS_SUCCESS) {
lim_log(pMac, LOGE, FL("BSS: DEL_BSS_RSP error (%x) Bss %d "),
pDelBss->status, pDelBss->bssIdx);
rc = eSIR_SME_STOP_BSS_FAILURE;
@@ -2087,7 +2086,7 @@
}
lim_log(pMac, LOG1, FL("Received del Sta Rsp in StaD MlmState : %d"),
pStaDs->mlmStaContext.mlmState);
- if (CDF_STATUS_SUCCESS == pDelStaParams->status) {
+ if (QDF_STATUS_SUCCESS == pDelStaParams->status) {
lim_log(pMac, LOGW,
FL("AP received the DEL_STA_RSP for assocID: %X."),
pDelStaParams->assocId);
@@ -2184,7 +2183,7 @@
lim_log(pMac, LOG1, FL("Del STA RSP received. Status:%d AssocID:%d"),
pDelStaParams->status, pDelStaParams->assocId);
- if (CDF_STATUS_SUCCESS != pDelStaParams->status)
+ if (QDF_STATUS_SUCCESS != pDelStaParams->status)
lim_log(pMac, LOGE, FL(
"Del STA failed! Status:%d, proceeding with Del BSS"),
pDelStaParams->status);
@@ -2258,7 +2257,7 @@
pStaDs->mlmStaContext.mlmState);
goto end;
}
- if (CDF_STATUS_SUCCESS != pAddStaParams->status) {
+ if (QDF_STATUS_SUCCESS != pAddStaParams->status) {
PELOGE(lim_log
(pMac, LOGE,
FL("Error! rcvd delSta rsp from HAL with status %d"),
@@ -2358,10 +2357,10 @@
}
/* Update PE session Id */
mlmStartCnf.sessionId = pAddBssParams->sessionId;
- if (CDF_STATUS_SUCCESS == pAddBssParams->status) {
+ if (QDF_STATUS_SUCCESS == pAddBssParams->status) {
PELOG2(lim_log
(pMac, LOG2,
- FL("WMA_ADD_BSS_RSP returned with CDF_STATUS_SUCCESS"));
+ FL("WMA_ADD_BSS_RSP returned with QDF_STATUS_SUCCESS"));
)
if (lim_set_link_state
(pMac, eSIR_LINK_AP_STATE, psessionEntry->bssId,
@@ -2490,10 +2489,10 @@
lim_log(pMac, LOGE, FL("Invalid body pointer in message"));
goto end;
}
- if (CDF_STATUS_SUCCESS == pAddBssParams->status) {
+ if (QDF_STATUS_SUCCESS == pAddBssParams->status) {
PELOG1(lim_log
(pMac, LOG1,
- FL("WMA_ADD_BSS_RSP returned with CDF_STATUS_SUCCESS"));
+ FL("WMA_ADD_BSS_RSP returned with QDF_STATUS_SUCCESS"));
)
if (lim_set_link_state
(pMac, eSIR_LINK_IBSS_STATE, psessionEntry->bssId,
@@ -2569,7 +2568,7 @@
lim_log(mac_ctx, LOGE, FL("Invalid body pointer in message"));
goto joinFailure;
}
- if (CDF_STATUS_SUCCESS == pAddBssParams->status) {
+ if (QDF_STATUS_SUCCESS == pAddBssParams->status) {
pStaDs = dph_add_hash_entry(mac_ctx,
pAddBssParams->staContext.staMac,
DPH_STA_HASH_INDEX_PEER,
@@ -2797,7 +2796,7 @@
psessionEntry->bssId, sizeof(tSirMacAddr));
pAddStaParams->staType = STA_ENTRY_SELF;
- pAddStaParams->status = CDF_STATUS_SUCCESS;
+ pAddStaParams->status = QDF_STATUS_SUCCESS;
pAddStaParams->respReqd = 1;
/* Update PE session ID */
@@ -2981,7 +2980,7 @@
"LFR3:lim_process_sta_mlm_add_bss_rsp");
#endif
- if (CDF_STATUS_SUCCESS == add_bss_params->status) {
+ if (QDF_STATUS_SUCCESS == add_bss_params->status) {
if (eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE ==
session_entry->limMlmState) {
lim_log(mac_ctx, LOG1, FL("Mlm=%d %d"),
@@ -3385,7 +3384,7 @@
*/
static void lim_process_switch_channel_re_assoc_req(tpAniSirGlobal pMac,
tpPESession psessionEntry,
- CDF_STATUS status)
+ QDF_STATUS status)
{
tLimMlmReassocCnf mlmReassocCnf;
tLimMlmReassocReq *pMlmReassocReq;
@@ -3399,7 +3398,7 @@
goto end;
}
- if (status != CDF_STATUS_SUCCESS) {
+ if (status != QDF_STATUS_SUCCESS) {
PELOGE(lim_log(pMac, LOGE, FL("Change channel failed!!"));)
mlmReassocCnf.resultCode = eSIR_SME_CHANNEL_SWITCH_FAIL;
goto end;
@@ -3456,11 +3455,11 @@
*/
static void lim_process_switch_channel_join_req(
tpAniSirGlobal mac_ctx, tpPESession session_entry,
- CDF_STATUS status)
+ QDF_STATUS status)
{
tSirMacSSid ssId;
tLimMlmJoinCnf join_cnf;
- if (status != CDF_STATUS_SUCCESS) {
+ if (status != QDF_STATUS_SUCCESS) {
PELOGE(lim_log(mac_ctx, LOGE, FL("Change channel failed!!"));)
goto error;
}
@@ -3505,23 +3504,23 @@
* If sendDeauthBeforeCon is enabled, Send Deauth first to AP if last
* disconnection was caused by HB failure.
*/
- if(mac_ctx->roam.configParam.sendDeauthBeforeCon) {
+ if (mac_ctx->roam.configParam.sendDeauthBeforeCon) {
int apCount;
- for(apCount = 0; apCount < 2; apCount++) {
+ for (apCount = 0; apCount < 2; apCount++) {
if (cdf_mem_compare(session_entry->pLimMlmJoinReq->bssDescription.bssId,
mac_ctx->lim.gLimHeartBeatApMac[apCount], sizeof(tSirMacAddr))) {
lim_log(mac_ctx, LOGE, FL("Index %d Sessionid: %d Send deauth on "
- "channel %d to BSSID: "MAC_ADDRESS_STR ), apCount,
+ "channel %d to BSSID: "MAC_ADDRESS_STR), apCount,
session_entry->peSessionId, session_entry->currentOperChannel,
MAC_ADDR_ARRAY(session_entry->pLimMlmJoinReq->bssDescription.
bssId));
lim_send_deauth_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_REASON,
session_entry->pLimMlmJoinReq->bssDescription.bssId,
- session_entry, false );
+ session_entry, false);
cdf_mem_zero(mac_ctx->lim.gLimHeartBeatApMac[apCount],
sizeof(tSirMacAddr));
@@ -3625,7 +3624,7 @@
void lim_process_switch_channel_rsp(tpAniSirGlobal pMac, void *body)
{
tpSwitchChannelParams pChnlParams = NULL;
- CDF_STATUS status;
+ QDF_STATUS status;
uint16_t channelChangeReasonCode;
uint8_t peSessionId;
tpPESession psessionEntry;
@@ -3872,9 +3871,9 @@
lim_log(pMac, LOGE, FL("Invalid body pointer in message"));
goto end;
}
- if (CDF_STATUS_SUCCESS == pAddBssParams->status) {
+ if (QDF_STATUS_SUCCESS == pAddBssParams->status) {
lim_log(pMac, LOG2,
- FL("WMA_ADD_BSS_RSP returned with CDF_STATUS_SUCCESS"));
+ FL("WMA_ADD_BSS_RSP returned with QDF_STATUS_SUCCESS"));
if (psessionEntry->bssType == eSIR_BTAMP_AP_MODE) {
if (lim_set_link_state
(pMac, eSIR_LINK_BTAMP_AP_STATE,
@@ -4131,7 +4130,7 @@
msg.bodyptr = NULL;
msg.bodyval = sessionId;
- if (!CDF_IS_STATUS_SUCCESS
+ if (!QDF_IS_STATUS_SUCCESS
(cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)))
CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
"%s: Not able to post WMA_SME_SCAN_CACHE_UPDATED message to WMA",
@@ -4165,7 +4164,7 @@
case SCAN_EVENT_COMPLETED:
if (ROC_SCAN_REQUESTOR_ID == pScanEvent->requestor) {
lim_send_sme_roc_rsp(pMac, eWNI_SME_REMAIN_ON_CHN_RSP,
- CDF_STATUS_SUCCESS,
+ QDF_STATUS_SUCCESS,
pScanEvent->sessionId,
pScanEvent->scanId);
cdf_mem_free(pMac->lim.gpLimRemainOnChanReq);
@@ -4196,7 +4195,7 @@
if (pMac->lim.gpLimRemainOnChanReq) {
lim_send_sme_roc_rsp(pMac,
eWNI_SME_REMAIN_ON_CHN_RDY_IND,
- CDF_STATUS_SUCCESS,
+ QDF_STATUS_SUCCESS,
pScanEvent->sessionId,
pScanEvent->scanId);
} else {
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index 581b47d..060eea4 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -127,11 +127,11 @@
*
* Send the set HW mode command to WMA
*
- * Return: CDF_STATUS_SUCCESS if message posting is successful
+ * Return: QDF_STATUS_SUCCESS if message posting is successful
*/
-static CDF_STATUS lim_process_set_hw_mode(tpAniSirGlobal mac, uint32_t *msg)
+static QDF_STATUS lim_process_set_hw_mode(tpAniSirGlobal mac, uint32_t *msg)
{
- CDF_STATUS status = CDF_STATUS_SUCCESS;
+ QDF_STATUS status = QDF_STATUS_SUCCESS;
cds_msg_t cds_message;
struct sir_hw_mode *req_msg;
uint32_t len;
@@ -154,7 +154,7 @@
/* Free the active command list
* Probably the malloc is going to fail there as well?!
*/
- return CDF_STATUS_E_NOMEM;
+ return QDF_STATUS_E_NOMEM;
}
cdf_mem_zero(req_msg, len);
@@ -168,7 +168,7 @@
lim_log(mac, LOG1, FL("Posting SIR_HAL_SOC_SET_HW_MOD to WMA"));
status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
- if (!CDF_IS_STATUS_SUCCESS(status)) {
+ if (!QDF_IS_STATUS_SUCCESS(status)) {
lim_log(mac, LOGE,
FL("vos_mq_post_message failed!(err=%d)"),
status);
@@ -180,7 +180,7 @@
param = cdf_mem_malloc(sizeof(*param));
if (!param) {
lim_log(mac, LOGE, FL("HW mode resp failed"));
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
param->status = SET_HW_MODE_STATUS_ECANCELED;
param->cfgd_hw_mode_index = 0;
@@ -189,7 +189,7 @@
resp_msg.bodyptr = param;
resp_msg.bodyval = 0;
lim_sys_process_mmh_msg_api(mac, &resp_msg, ePROT);
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
/**
@@ -199,12 +199,12 @@
*
* Send the set dual mac config command to WMA
*
- * Return: CDF_STATUS_SUCCESS if message posting is successful
+ * Return: QDF_STATUS_SUCCESS if message posting is successful
*/
-static CDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac,
+static QDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac,
uint32_t *msg)
{
- CDF_STATUS status = CDF_STATUS_SUCCESS;
+ QDF_STATUS status = QDF_STATUS_SUCCESS;
cds_msg_t cds_message;
struct sir_dual_mac_config *req_msg;
uint32_t len;
@@ -227,7 +227,7 @@
/* Free the active command list
* Probably the malloc is going to fail there as well?!
*/
- return CDF_STATUS_E_NOMEM;
+ return QDF_STATUS_E_NOMEM;
}
cdf_mem_zero(req_msg, len);
@@ -243,7 +243,7 @@
FL("Post SIR_HAL_SOC_DUAL_MAC_CFG_REQ to WMA: %x %x"),
req_msg->scan_config, req_msg->fw_mode_config);
status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
- if (!CDF_IS_STATUS_SUCCESS(status)) {
+ if (!QDF_IS_STATUS_SUCCESS(status)) {
lim_log(mac, LOGE,
FL("vos_mq_post_message failed!(err=%d)"),
status);
@@ -255,14 +255,14 @@
param = cdf_mem_malloc(sizeof(*param));
if (!param) {
lim_log(mac, LOGE, FL("Dual mac config resp failed"));
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
param->status = SET_HW_MODE_STATUS_ECANCELED;
resp_msg.type = eWNI_SME_SET_DUAL_MAC_CFG_RESP;
resp_msg.bodyptr = param;
resp_msg.bodyval = 0;
lim_sys_process_mmh_msg_api(mac, &resp_msg, ePROT);
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
/**
@@ -1150,7 +1150,7 @@
cdf_mem_copy(data, (uint8_t *) random, sizeof(tSirMacAddr));
}
-static CDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac,
+static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac,
tpSirSmeScanReq pScanReq)
{
tSirScanOffloadReq *pScanOffloadReq;
@@ -1223,7 +1223,7 @@
if (NULL == pScanOffloadReq) {
lim_log(pMac, LOGE,
FL("AllocateMemory failed for pScanOffloadReq"));
- return CDF_STATUS_E_NOMEM;
+ return QDF_STATUS_E_NOMEM;
}
cdf_mem_set((uint8_t *) pScanOffloadReq, len, 0);
@@ -1239,7 +1239,7 @@
FL("Invalid value (%d) for numSsid"),
SIR_SCAN_MAX_NUM_SSID);
cdf_mem_free(pScanOffloadReq);
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
pScanOffloadReq->numSsid = pScanReq->numSsid;
@@ -1318,12 +1318,12 @@
if (rc != eSIR_SUCCESS) {
lim_log(pMac, LOGE, FL("wma_post_ctrl_msg() return failure"));
cdf_mem_free(pScanOffloadReq);
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
lim_log(pMac, LOG1, FL("Processed Offload Scan Request Successfully"));
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
/**
@@ -1415,7 +1415,7 @@
mac_ctx->lim.gLimReturnUniqueResults =
((scan_req->returnUniqueResults) > 0 ? true : false);
- if (CDF_STATUS_SUCCESS !=
+ if (QDF_STATUS_SUCCESS !=
lim_send_hal_start_scan_offload_req(mac_ctx,
scan_req)) {
lim_log(mac_ctx, LOGE, FL(
@@ -3182,7 +3182,7 @@
}
sap_get_wpspbc_event = &sap_event.sapevt.sapGetWPSPBCSessionEvent;
- sap_get_wpspbc_event->status = CDF_STATUS_E_FAULT;
+ sap_get_wpspbc_event->status = QDF_STATUS_E_FAULT;
cdf_mem_copy(&get_wps_pbc_sessions_req, msg_buf,
sizeof(struct sSirSmeGetWPSPBCSessionsReq));
@@ -3230,7 +3230,7 @@
lim_print_mac_addr(mac_ctx,
sap_get_wpspbc_event->addr.bytes, LOG4);
- sap_get_wpspbc_event->status = CDF_STATUS_SUCCESS;
+ sap_get_wpspbc_event->status = QDF_STATUS_SUCCESS;
lim_get_wpspbc_sessions_end:
sap_event_cb =
@@ -4350,7 +4350,7 @@
msg.type = WMA_UPDATE_OP_MODE;
msg.reserved = 0;
msg.bodyptr = pHtOpMode;
- if (!CDF_IS_STATUS_SUCCESS
+ if (!QDF_IS_STATUS_SUCCESS
(cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) {
lim_log(pMac, LOGE,
FL
@@ -5719,7 +5719,7 @@
static void lim_process_set_ie_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
{
struct send_extcap_ie *msg;
- CDF_STATUS status;
+ QDF_STATUS status;
if (msg_buf == NULL) {
lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL"));
@@ -5728,7 +5728,7 @@
msg = (struct send_extcap_ie *)msg_buf;
status = lim_send_ext_cap_ie(mac_ctx, msg->session_id, NULL, false);
- if (CDF_STATUS_SUCCESS != status)
+ if (QDF_STATUS_SUCCESS != status)
lim_log(mac_ctx, LOGE, FL("Unable to send ExtCap to FW"));
}
diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c
index bbabde1..498ab62 100644
--- a/core/mac/src/pe/lim/lim_process_tdls.c
+++ b/core/mac/src/pe/lim/lim_process_tdls.c
@@ -319,7 +319,7 @@
/*
* TX Complete for Management frames
*/
-CDF_STATUS lim_mgmt_tx_complete(tpAniSirGlobal pMac, uint32_t txCompleteSuccess)
+QDF_STATUS lim_mgmt_tx_complete(tpAniSirGlobal pMac, uint32_t txCompleteSuccess)
{
tpPESession psessionEntry = NULL;
@@ -330,13 +330,13 @@
if (NULL == psessionEntry) {
lim_log(pMac, LOGE, FL("sessionID %d is not found"),
pMac->lim.mgmtFrameSessionId);
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
lim_send_sme_mgmt_tx_completion(pMac, psessionEntry,
txCompleteSuccess);
pMac->lim.mgmtFrameSessionId = 0xff;
}
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
/*
@@ -356,7 +356,7 @@
uint32_t header_offset = 0;
uint8_t *pFrame;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
#ifndef NO_PAD_TDLS_MIN_8023_SIZE
uint32_t padLen = 0;
#endif
@@ -437,9 +437,9 @@
/* Ok-- try to allocate memory from MGMT PKT pool */
- cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
+ qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGP,
FL(
"Failed to allocate %d bytes for a TDLS Discovery Request."
@@ -509,7 +509,7 @@
MAC_ADDR_ARRAY(peer_mac.bytes));
pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
- cdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes,
+ qdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_DATA,
ANI_TXDIR_TODS,
TID_AC_VI,
@@ -517,7 +517,7 @@
lim_mgmt_tx_complete,
HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME,
smeSessionId, false, 0);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
pMac->lim.mgmtFrameSessionId = 0xff;
lim_log(pMac, LOGE,
FL("could not send TDLS Discovery Request frame"));
@@ -606,7 +606,7 @@
uint32_t nBytes = 0;
uint8_t *pFrame;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint32_t selfDot11Mode;
/* Placeholder to support different channel bonding mode of TDLS than AP. */
/* Today, WNI_CFG_CHANNEL_BONDING_MODE will be overwritten when connecting to AP */
@@ -717,9 +717,9 @@
nBytes = nPayload + sizeof(tSirMacMgmtHdr) + addIeLen;
/* Ok-- try to allocate memory from MGMT PKT pool */
- cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
+ qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
FL(
"Failed to allocate %d bytes for a TDLS Discovery Request."
@@ -790,7 +790,7 @@
* wma does not do header conversion to 802.3 before calling tx/rx
* routine and subsequenly target also sends frame as is OTA
*/
- cdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes,
+ qdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_IBSS,
0,
@@ -798,7 +798,7 @@
lim_mgmt_tx_complete,
HAL_USE_SELF_STA_REQUESTED_MASK,
smeSessionId, false, 0);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
pMac->lim.mgmtFrameSessionId = 0xff;
lim_log(pMac, LOGE,
FL("could not send TDLS Discovery Response frame!"));
@@ -867,7 +867,7 @@
uint32_t header_offset = 0;
uint8_t *pFrame;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint32_t selfDot11Mode;
uint8_t smeSessionId = 0;
/* Placeholder to support different channel bonding mode of TDLS than AP. */
@@ -1039,9 +1039,9 @@
+ PAYLOAD_TYPE_TDLS_SIZE + addIeLen;
/* Ok-- try to allocate memory from MGMT PKT pool */
- cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
+ qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
FL(
"Failed to allocate %d bytes for a TDLS Setup Request."
@@ -1110,7 +1110,7 @@
pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
- cdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes,
+ qdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_DATA,
ANI_TXDIR_TODS,
TID_AC_VI,
@@ -1119,7 +1119,7 @@
HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME,
smeSessionId, false, 0);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
pMac->lim.mgmtFrameSessionId = 0xff;
lim_log(pMac, LOGE,
FL("could not send TDLS Setup Request frame!"));
@@ -1148,7 +1148,7 @@
uint32_t header_offset = 0;
uint8_t *pFrame;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
#ifndef NO_PAD_TDLS_MIN_8023_SIZE
uint32_t padLen = 0;
#endif
@@ -1224,9 +1224,9 @@
#endif
/* Ok-- try to allocate memory from MGMT PKT pool */
- cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
+ qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
FL(
"Failed to allocate %d bytes for a TDLS Teardown Frame."
@@ -1312,7 +1312,7 @@
pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
- cdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes,
+ qdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_DATA,
ANI_TXDIR_TODS,
TID_AC_VI,
@@ -1321,7 +1321,7 @@
HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME,
smeSessionId, false, 0);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
pMac->lim.mgmtFrameSessionId = 0xff;
lim_log(pMac, LOGE,
FL("could not send TDLS Teardown frame"));
@@ -1350,7 +1350,7 @@
uint32_t nBytes = 0;
uint8_t *pFrame;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint32_t selfDot11Mode;
/* Placeholder to support different channel bonding mode of TDLS than AP. */
/* Today, WNI_CFG_CHANNEL_BONDING_MODE will be overwritten when connecting to AP */
@@ -1521,9 +1521,9 @@
+ PAYLOAD_TYPE_TDLS_SIZE + addIeLen;
/* Ok-- try to allocate memory from MGMT PKT pool */
- cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
+ qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
FL(
"Failed to allocate %d bytes for a TDLS Setup Response."
@@ -1590,7 +1590,7 @@
pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
- cdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes,
+ qdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_DATA,
ANI_TXDIR_TODS,
TID_AC_VI,
@@ -1599,7 +1599,7 @@
HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME,
smeSessionId, false, 0);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
pMac->lim.mgmtFrameSessionId = 0xff;
lim_log(pMac, LOGE,
FL("could not send TDLS Dis Request frame!"));
@@ -1627,7 +1627,7 @@
uint32_t header_offset = 0;
uint8_t *pFrame;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
#ifndef NO_PAD_TDLS_MIN_8023_SIZE
uint32_t padLen = 0;
#endif
@@ -1728,9 +1728,9 @@
#endif
/* Ok-- try to allocate memory from MGMT PKT pool */
- cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
+ qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
FL(
"Failed to allocate %d bytes for a TDLS Setup Confirm."
@@ -1810,7 +1810,7 @@
pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId;
- cdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes,
+ qdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_DATA,
ANI_TXDIR_TODS,
TID_AC_VI,
@@ -1819,7 +1819,7 @@
HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME,
smeSessionId, false, 0);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
pMac->lim.mgmtFrameSessionId = 0xff;
lim_log(pMac, LOGE,
FL("could not send TDLS Setup Confirm frame"));
@@ -2470,7 +2470,7 @@
/*
* Once Link is setup with PEER, send Add STA ind to SME
*/
-static CDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac,
+static QDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac,
uint8_t sessionId,
tSirMacAddr peerMac,
uint8_t updateSta,
@@ -2483,7 +2483,7 @@
addStaRsp = cdf_mem_malloc(sizeof(tSirTdlsAddStaRsp));
if (NULL == addStaRsp) {
lim_log(pMac, LOGE, FL("Failed to allocate memory"));
- return CDF_STATUS_E_NOMEM;
+ return QDF_STATUS_E_NOMEM;
}
addStaRsp->sessionId = sessionId;
@@ -2509,13 +2509,13 @@
mmhMsg.bodyval = 0;
lim_sys_process_mmh_msg_api(pMac, &mmhMsg, ePROT);
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
/*
* STA RSP received from HAL
*/
-CDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal pMac, void *msg,
+QDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal pMac, void *msg,
tpPESession psessionEntry)
{
tAddStaParams *pAddStaParams = (tAddStaParams *) msg;
@@ -2528,7 +2528,7 @@
pAddStaParams->staIdx,
MAC_ADDR_ARRAY(pAddStaParams->staMac));
- if (pAddStaParams->status != CDF_STATUS_SUCCESS) {
+ if (pAddStaParams->status != QDF_STATUS_SUCCESS) {
CDF_ASSERT(0);
lim_log(pMac, LOGE, FL("Add sta failed "));
status = eSIR_FAILURE;
@@ -2876,7 +2876,7 @@
/*
* Once link is teardown, send Del Peer Ind to SME
*/
-static CDF_STATUS lim_send_sme_tdls_del_sta_rsp(tpAniSirGlobal pMac,
+static QDF_STATUS lim_send_sme_tdls_del_sta_rsp(tpAniSirGlobal pMac,
uint8_t sessionId,
struct cdf_mac_addr peerMac,
tDphHashNode *pStaDs, uint8_t status)
@@ -2888,7 +2888,7 @@
pDelSta = cdf_mem_malloc(sizeof(tSirTdlsDelStaRsp));
if (NULL == pDelSta) {
lim_log(pMac, LOGE, FL("Failed to allocate memory"));
- return CDF_STATUS_E_NOMEM;
+ return QDF_STATUS_E_NOMEM;
}
pDelSta->sessionId = sessionId;
@@ -2907,7 +2907,7 @@
mmhMsg.bodyval = 0;
lim_sys_process_mmh_msg_api(pMac, &mmhMsg, ePROT);
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c
index a26a289..623a900 100644
--- a/core/mac/src/pe/lim/lim_scan_result_utils.c
+++ b/core/mac/src/pe/lim/lim_scan_result_utils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -76,13 +76,13 @@
* @return None
*/
#if defined WLAN_FEATURE_VOWIFI
-CDF_STATUS
+QDF_STATUS
lim_collect_bss_description(tpAniSirGlobal pMac,
tSirBssDescription *pBssDescr,
tpSirProbeRespBeacon pBPR,
uint8_t *pRxPacketInfo, uint8_t fScanning)
#else
-CDF_STATUS
+QDF_STATUS
lim_collect_bss_description(tpAniSirGlobal pMac,
tSirBssDescription *pBssDescr,
tpSirProbeRespBeacon pBPR, uint8_t *pRxPacketInfo)
@@ -100,7 +100,7 @@
if (SIR_MAC_B_PR_SSID_OFFSET > WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo)) {
CDF_ASSERT(WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo) >=
SIR_MAC_B_PR_SSID_OFFSET);
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
ieLen =
WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo) - SIR_MAC_B_PR_SSID_OFFSET;
@@ -237,7 +237,7 @@
FL("Collected BSS Description for Channel(%1d), length(%u), IE Fields(%u)"),
pBssDescr->channelId, pBssDescr->length, ieLen);
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
} /*** end lim_collect_bss_description() ***/
/**
@@ -257,8 +257,8 @@
* NA
*
* @param pMac - Pointer to Global MAC structure
- * @param ssId - SSID Received in beacons/Probe responses that is compared against the
- requeusted SSID in scan list
+ * @param ssId - SSID Received in beacons/Probe responses that is compared
+ * against therequeusted SSID in scan list
* ---------------------------------------------
*
* @return bool - true if SSID is present in requested list, false otherwise
@@ -306,7 +306,7 @@
tSirBssDescription *bssdescr = NULL;
uint32_t frame_len, ie_len = 0;
uint8_t rx_chan_in_beacon = 0;
- CDF_STATUS status;
+ QDF_STATUS status;
uint8_t dont_update_all = 0;
uint8_t rf_band = 0;
uint8_t rx_chan_bd = 0;
@@ -400,12 +400,12 @@
#if defined WLAN_FEATURE_VOWIFI
status = lim_collect_bss_description(mac_ctx, bssdescr,
bpr, rx_packet_info, scanning);
- if (CDF_STATUS_SUCCESS != status)
+ if (QDF_STATUS_SUCCESS != status)
goto last;
#else
status = lim_collect_bss_description(mac_ctx, bssdescr,
bpr, rx_packet_info);
- if (CDF_STATUS_SUCCESS != status)
+ if (QDF_STATUS_SUCCESS != status)
goto last;
#endif
bssdescr->fProbeRsp = fProbeRsp;
@@ -419,7 +419,7 @@
} else {
lim_log(mac_ctx, LOGE,
FL("No CSR callback routine to send beacons"));
- status = CDF_STATUS_E_INVAL;
+ status = QDF_STATUS_E_INVAL;
}
last:
cdf_mem_free(bssdescr);
diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.h b/core/mac/src/pe/lim/lim_scan_result_utils.h
index c622dc2..74fb3b0 100644
--- a/core/mac/src/pe/lim/lim_scan_result_utils.h
+++ b/core/mac/src/pe/lim/lim_scan_result_utils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012, 2014-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -47,11 +47,11 @@
void lim_check_and_add_bss_description(tpAniSirGlobal, tpSirProbeRespBeacon,
uint8_t *, bool, uint8_t);
#if defined WLAN_FEATURE_VOWIFI
-CDF_STATUS lim_collect_bss_description(tpAniSirGlobal,
+QDF_STATUS lim_collect_bss_description(tpAniSirGlobal,
tSirBssDescription *,
tpSirProbeRespBeacon, uint8_t *, uint8_t);
#else
-CDF_STATUS lim_collect_bss_description(tpAniSirGlobal,
+QDF_STATUS lim_collect_bss_description(tpAniSirGlobal,
tSirBssDescription *,
tpSirProbeRespBeacon, uint8_t *);
#endif
diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c
index 9037fb6..b04183a 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -217,7 +217,7 @@
uint32_t status, bytes, payload;
uint8_t *frame;
void *packet;
- CDF_STATUS cdf_status, extcap_status;
+ QDF_STATUS qdf_status, extcap_status;
tpPESession pesession;
uint8_t sessionid;
uint8_t *p2pie = NULL;
@@ -365,7 +365,7 @@
if (addn_ielen) {
extcap_status = lim_strip_extcap_ie(mac_ctx, additional_ie,
&addn_ielen, NULL);
- if (CDF_STATUS_SUCCESS != extcap_status)
+ if (QDF_STATUS_SUCCESS != extcap_status)
lim_log(mac_ctx, LOGE,
FL("Error:%d stripping extcap IE"), extcap_status);
}
@@ -373,9 +373,9 @@
bytes = payload + sizeof(tSirMacMgmtHdr) + addn_ielen;
/* Ok-- try to allocate some memory: */
- cdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame,
+ qdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame,
(void **)&packet);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(mac_ctx, LOGP, FL("Failed to allocate %d bytes for a Probe Request."), bytes);
return eSIR_MEM_ALLOC_FAILED;
}
@@ -422,13 +422,13 @@
txflag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
- cdf_status =
+ qdf_status =
wma_tx_frame(mac_ctx, packet,
(uint16_t) sizeof(tSirMacMgmtHdr) + payload,
TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
lim_tx_complete, frame, txflag, sme_sessionid,
0);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(mac_ctx, LOGE,
FL("could not send Probe Request frame!"));
/* Pkt will be freed up by the callback */
@@ -525,7 +525,7 @@
tpSirMacMgmtHdr mac_hdr;
uint8_t *frame;
void *packet;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint32_t addn_ie_present = false;
uint16_t addn_ie_len = 0;
@@ -768,9 +768,9 @@
}
}
- cdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame,
+ qdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame,
(void **)&packet);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(mac_ctx, LOGP, FL("Probe Response allocation failed"));
goto err_ret;
}
@@ -841,7 +841,7 @@
tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
/* Queue Probe Response frame in high priority WQ */
- cdf_status = wma_tx_frame((tHalHandle) mac_ctx, packet,
+ qdf_status = wma_tx_frame((tHalHandle) mac_ctx, packet,
(uint16_t) bytes,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS,
@@ -849,7 +849,7 @@
sme_sessionid, 0);
/* Pkt will be freed up by the callback */
- if (!CDF_IS_STATUS_SUCCESS(cdf_status))
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status))
lim_log(mac_ctx, LOGE, FL("Could not send Probe Response."));
if (add_ie != NULL)
@@ -884,7 +884,7 @@
#ifdef FEATURE_WLAN_ESE
uint32_t phyMode;
#endif
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint8_t txFlag = 0;
uint8_t smeSessionId = 0;
@@ -997,9 +997,9 @@
nBytes = nPayload + sizeof(tSirMacMgmtHdr);
- cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
+ qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for an Ad"
"d TS Request."), nBytes);
return;
@@ -1069,17 +1069,17 @@
psessionEntry->peSessionId, pMacHdr->fc.subType));
/* Queue Addts Response frame in high priority WQ */
- cdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
+ qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS,
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- psessionEntry->peSessionId, cdf_status));
+ psessionEntry->peSessionId, qdf_status));
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE, FL("*** Could not send an Add TS Request"
- " (%X) ***"), cdf_status);
+ " (%X) ***"), qdf_status);
/* Pkt will be freed up by the callback */
}
@@ -1113,7 +1113,7 @@
tHalBitVal qos_mode, wme_mode;
uint32_t payload, bytes, status;
void *packet;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
tUpdateBeaconParams beacon_params;
uint8_t tx_flag = 0;
uint32_t addn_ie_len = 0;
@@ -1330,9 +1330,9 @@
FL("addn_ie_len = %d for Assoc Resp : %d"),
addn_ie_len, assoc_req->addIEPresent);
}
- cdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame,
+ qdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame,
(void **)&packet);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(mac_ctx, LOGP, FL("cds_packet_alloc failed."));
return;
}
@@ -1391,19 +1391,19 @@
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
pe_session->peSessionId, mac_hdr->fc.subType));
/* Queue Association Response frame in high priority WQ */
- cdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) bytes,
+ qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) bytes,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS,
7, lim_tx_complete, frame, tx_flag,
sme_session, 0);
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- pe_session->peSessionId, cdf_status));
+ pe_session->peSessionId, qdf_status));
/* Pkt will be freed up by the callback */
- if (!CDF_IS_STATUS_SUCCESS(cdf_status))
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status))
lim_log(mac_ctx, LOGE,
FL("*** Could not Send Re/AssocRsp, retCode=%X ***"),
- cdf_status);
+ qdf_status);
/*
* update the ANI peer station count.
@@ -1427,7 +1427,7 @@
tDot11fWMMDelTS WMMDelTS;
uint32_t nBytes, nPayload, nStatus;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint8_t txFlag = 0;
uint8_t smeSessionId = 0;
@@ -1483,10 +1483,10 @@
nBytes = nPayload + sizeof(tSirMacMgmtHdr);
- cdf_status =
+ qdf_status =
cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for an Ad"
"d TS Response."), nBytes);
return;
@@ -1554,17 +1554,17 @@
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
- cdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
+ qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS,
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- psessionEntry->peSessionId, cdf_status));
+ psessionEntry->peSessionId, qdf_status));
/* Pkt will be freed up by the callback */
- if (!CDF_IS_STATUS_SUCCESS(cdf_status))
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status))
lim_log(pMac, LOGE, FL("Failed to send Del TS (%X)!"),
- cdf_status);
+ qdf_status);
} /* End lim_send_delts_req_action_frame. */
@@ -1592,7 +1592,7 @@
uint32_t bytes, payload, status;
uint8_t qos_enabled, wme_enabled, wsm_enabled;
void *packet;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint16_t add_ie_len;
uint8_t *add_ie;
uint8_t *wps_ie = NULL;
@@ -1860,9 +1860,9 @@
bytes = payload + sizeof(tSirMacMgmtHdr) + add_ie_len;
- cdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame,
+ qdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame,
(void **)&packet);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(mac_ctx, LOGP, FL("Failed to allocate %d bytes."),
bytes);
@@ -1952,18 +1952,18 @@
mac_hdr = (tpSirMacMgmtHdr) frame;
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
pe_session->peSessionId, mac_hdr->fc.subType));
- cdf_status =
+ qdf_status =
wma_tx_frame(mac_ctx, packet,
(uint16_t) (sizeof(tSirMacMgmtHdr) + payload),
TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
lim_tx_complete, frame, tx_flag, sme_sessionid, 0);
MTRACE(cdf_trace
(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- pe_session->peSessionId, cdf_status));
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ pe_session->peSessionId, qdf_status));
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(mac_ctx, LOGE,
FL("Failed to send Association Request (%X)!"),
- cdf_status);
+ qdf_status);
/* Pkt will be freed up by the callback */
cdf_mem_free(frm);
return;
@@ -2000,7 +2000,7 @@
uint32_t bytes, payload, status;
uint8_t qos_enabled, wme_enabled, wsm_enabled;
void *packet;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
#if defined WLAN_FEATURE_VOWIFI
uint8_t power_caps_populated = false;
#endif
@@ -2275,9 +2275,9 @@
ft_ies_length = ft_sme_context->reassoc_ft_ies_length;
#endif
- cdf_status = cds_packet_alloc((uint16_t) bytes + ft_ies_length,
+ qdf_status = cds_packet_alloc((uint16_t) bytes + ft_ies_length,
(void **)&frame, (void **)&packet);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
pe_session->limMlmState = pe_session->limPrevMlmState;
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE,
pe_session->peSessionId,
@@ -2386,17 +2386,17 @@
#endif
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
pe_session->peSessionId, mac_hdr->fc.subType));
- cdf_status = wma_tx_frame(mac_ctx, packet,
+ qdf_status = wma_tx_frame(mac_ctx, packet,
(uint16_t) (bytes + ft_ies_length),
TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
lim_tx_complete, frame, tx_flag, sme_sessionid,
0);
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- pe_session->peSessionId, cdf_status));
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ pe_session->peSessionId, qdf_status));
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(mac_ctx, LOGE,
FL("Failed to send Re-Assoc Request (%X)!"),
- cdf_status);
+ qdf_status);
}
end:
@@ -2475,7 +2475,7 @@
uint32_t nBytes, nPayload, nStatus;
uint8_t fQosEnabled, fWmeEnabled, fWsmEnabled;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint16_t nAddIELen;
uint8_t *pAddIE;
uint8_t *wpsIe = NULL;
@@ -2641,9 +2641,9 @@
nBytes = nPayload + sizeof(tSirMacMgmtHdr) + nAddIELen;
- cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
+ qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
psessionEntry->limMlmState = psessionEntry->limPrevMlmState;
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE,
psessionEntry->peSessionId,
@@ -2722,18 +2722,18 @@
#endif
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
- cdf_status =
+ qdf_status =
wma_tx_frame(pMac, pPacket,
(uint16_t) (sizeof(tSirMacMgmtHdr) + nPayload),
TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
lim_tx_complete, pFrame, txFlag, smeSessionId, 0);
MTRACE(cdf_trace
(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- psessionEntry->peSessionId, cdf_status));
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ psessionEntry->peSessionId, qdf_status));
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
FL("Failed to send Re-Association Request (%X)!"),
- cdf_status);
+ qdf_status);
/* Pkt will be freed up by the callback */
}
@@ -2769,7 +2769,7 @@
uint32_t frame_len = 0, body_len = 0;
tpSirMacMgmtHdr mac_hdr;
void *packet;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint8_t tx_flag = 0;
uint8_t sme_sessionid = 0;
uint16_t ft_ies_length = 0;
@@ -2901,10 +2901,10 @@
break;
} /* switch (auth_frame->authTransactionSeqNumber) */
- cdf_status = cds_packet_alloc((uint16_t) frame_len, (void **)&frame,
+ qdf_status = cds_packet_alloc((uint16_t) frame_len, (void **)&frame,
(void **)&packet);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(mac_ctx, LOGP,
FL("call to bufAlloc failed for AUTH frame"));
return;
@@ -3019,21 +3019,21 @@
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
session->peSessionId, mac_hdr->fc.subType));
/* Queue Authentication frame in high priority WQ */
- cdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) frame_len,
+ qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) frame_len,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS, 7, lim_tx_complete,
frame, tx_flag, sme_sessionid, 0);
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- session->peSessionId, cdf_status));
- if (!CDF_IS_STATUS_SUCCESS(cdf_status))
+ session->peSessionId, qdf_status));
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status))
lim_log(mac_ctx, LOGE,
FL("*** Could not send Auth frame, retCode=%X ***"),
- cdf_status);
+ qdf_status);
return;
}
-CDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac)
+QDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac)
{
uint16_t aid;
tpDphHashNode pStaDs;
@@ -3109,7 +3109,7 @@
cdf_mem_free(pMlmDeauthReq);
pMac->lim.limDisassocDeauthCnfReq.pMlmDeauthReq = NULL;
}
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
end:
cdf_copy_macaddr(&mlmDeauthCnf.peer_macaddr,
&pMlmDeauthReq->peer_macaddr);
@@ -3123,7 +3123,7 @@
lim_post_sme_message(pMac,
LIM_MLM_DEAUTH_CNF, (uint32_t *) &mlmDeauthCnf);
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
/**
@@ -3134,10 +3134,10 @@
* Sends disassoc confirmation to SME. Removes disassoc request stored
* in lim.
*
- * Return: CDF_STATUS_SUCCESS
+ * Return: QDF_STATUS_SUCCESS
*/
-CDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx)
+QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx)
{
uint16_t aid;
tpDphHashNode sta_ds;
@@ -3215,9 +3215,9 @@
/* Free up buffer allocated for mlmDisassocReq */
cdf_mem_free(disassoc_req);
mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq = NULL;
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
} else {
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
end:
cdf_mem_copy((uint8_t *) &disassoc_cnf.peerMacAddr,
@@ -3237,16 +3237,16 @@
lim_post_sme_message(mac_ctx, LIM_MLM_DISASSOC_CNF,
(uint32_t *) &disassoc_cnf);
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
-CDF_STATUS lim_disassoc_tx_complete_cnf(tpAniSirGlobal pMac,
+QDF_STATUS lim_disassoc_tx_complete_cnf(tpAniSirGlobal pMac,
uint32_t txCompleteSuccess)
{
return lim_send_disassoc_cnf(pMac);
}
-CDF_STATUS lim_deauth_tx_complete_cnf(tpAniSirGlobal pMac,
+QDF_STATUS lim_deauth_tx_complete_cnf(tpAniSirGlobal pMac,
uint32_t txCompleteSuccess)
{
return lim_send_deauth_cnf(pMac);
@@ -3278,7 +3278,7 @@
tpSirMacMgmtHdr pMacHdr;
uint32_t nBytes, nPayload, nStatus;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint8_t txFlag = 0;
uint32_t val = 0;
uint8_t smeSessionId = 0;
@@ -3319,9 +3319,9 @@
nBytes = nPayload + sizeof(tSirMacMgmtHdr);
- cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
+ qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a Dis"
"association."), nBytes);
return;
@@ -3377,7 +3377,7 @@
pMacHdr->fc.subType));
/* Queue Disassociation frame in high priority WQ */
/* get the duration from the request */
- cdf_status =
+ qdf_status =
wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS, 7, lim_tx_complete,
@@ -3385,7 +3385,7 @@
txFlag, smeSessionId, false, 0);
MTRACE(cdf_trace
(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- psessionEntry->peSessionId, cdf_status));
+ psessionEntry->peSessionId, qdf_status));
val = SYS_MS_TO_TICKS(LIM_DISASSOC_DEAUTH_ACK_TIMEOUT);
@@ -3409,7 +3409,7 @@
psessionEntry->peSessionId,
pMacHdr->fc.subType));
/* Queue Disassociation frame in high priority WQ */
- cdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
+ qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS,
7,
@@ -3417,11 +3417,11 @@
smeSessionId, 0);
MTRACE(cdf_trace
(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- psessionEntry->peSessionId, cdf_status));
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ psessionEntry->peSessionId, qdf_status));
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
FL("Failed to send Disassociation (%X)!"),
- cdf_status);
+ qdf_status);
/* Pkt will be freed up by the callback */
}
}
@@ -3452,7 +3452,7 @@
tpSirMacMgmtHdr pMacHdr;
uint32_t nBytes, nPayload, nStatus;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint8_t txFlag = 0;
uint32_t val = 0;
#ifdef FEATURE_WLAN_TDLS
@@ -3498,9 +3498,9 @@
nBytes = nPayload + sizeof(tSirMacMgmtHdr);
- cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
+ qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a De-"
"Authentication."), nBytes);
return;
@@ -3558,7 +3558,7 @@
psessionEntry->peSessionId,
pMacHdr->fc.subType));
/* Queue Disassociation frame in high priority WQ */
- cdf_status =
+ qdf_status =
wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS, 7, lim_tx_complete,
@@ -3566,12 +3566,12 @@
txFlag, smeSessionId, false, 0);
MTRACE(cdf_trace
(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- psessionEntry->peSessionId, cdf_status));
+ psessionEntry->peSessionId, qdf_status));
/* Pkt will be freed up by the callback lim_tx_complete */
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
FL("Failed to send De-Authentication (%X)!"),
- cdf_status);
+ qdf_status);
/* Call lim_process_deauth_ack_timeout which will send
* DeauthCnf for this frame
@@ -3605,7 +3605,7 @@
if ((NULL != pStaDs)
&& (STA_ENTRY_TDLS_PEER == pStaDs->staType)) {
/* Queue Disassociation frame in high priority WQ */
- cdf_status =
+ qdf_status =
wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT, ANI_TXDIR_IBSS,
7, lim_tx_complete, pFrame, txFlag,
@@ -3613,7 +3613,7 @@
} else {
#endif
/* Queue Disassociation frame in high priority WQ */
- cdf_status =
+ qdf_status =
wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS,
7, lim_tx_complete, pFrame, txFlag,
@@ -3622,11 +3622,11 @@
}
#endif
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- psessionEntry->peSessionId, cdf_status));
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ psessionEntry->peSessionId, qdf_status));
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
FL("Failed to send De-Authentication (%X)!"),
- cdf_status);
+ qdf_status);
/* Pkt will be freed up by the callback */
}
}
@@ -3658,7 +3658,7 @@
tpSirMacMgmtHdr pMacHdr;
uint32_t nBytes, nPayload, nStatus;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0);
@@ -3707,11 +3707,11 @@
nBytes = nPayload + sizeof(tSirMacMgmtHdr);
- cdf_status =
+ qdf_status =
cds_packet_alloc(pMac->hHdd, TXRX_FRM_802_11_MGMT,
(uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a De-"
"Authentication."), nBytes);
return eSIR_FAILURE;
@@ -3748,18 +3748,18 @@
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
((psessionEntry) ? psessionEntry->
peSessionId : NO_SESSION), pMacHdr->fc.subType));
- cdf_status =
+ qdf_status =
wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
lim_tx_complete, pFrame, 0, 0);
MTRACE(cdf_trace
(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION),
- cdf_status));
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ qdf_status));
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
FL("Failed to send a Measurement Report (%X)!"),
- cdf_status);
+ qdf_status);
/* Pkt will be freed up by the callback */
return eSIR_FAILURE; /* just allocated... */
}
@@ -3788,7 +3788,7 @@
tpSirMacMgmtHdr pMacHdr;
uint32_t nBytes, nPayload, nStatus;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0);
@@ -3811,11 +3811,11 @@
nBytes = nPayload + sizeof(tSirMacMgmtHdr);
- cdf_status =
+ qdf_status =
cds_packet_alloc(pMac->hHdd, TXRX_FRM_802_11_MGMT,
(uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a TPC"
" Request."), nBytes);
return;
@@ -3851,18 +3851,18 @@
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
((psessionEntry) ? psessionEntry->
peSessionId : NO_SESSION), pMacHdr->fc.subType));
- cdf_status =
+ qdf_status =
wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
lim_tx_complete, pFrame, 0, 0);
MTRACE(cdf_trace
(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION),
- cdf_status));
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ qdf_status));
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
FL("Failed to send a TPC Request (%X)!"),
- cdf_status);
+ qdf_status);
/* Pkt will be freed up by the callback */
}
@@ -3891,7 +3891,7 @@
tpSirMacMgmtHdr pMacHdr;
uint32_t nBytes, nPayload, nStatus;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0);
@@ -3917,11 +3917,11 @@
nBytes = nPayload + sizeof(tSirMacMgmtHdr);
- cdf_status =
+ qdf_status =
cds_packet_alloc(pMac->hHdd, TXRX_FRM_802_11_MGMT,
(uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a TPC"
" Report."), nBytes);
return eSIR_FAILURE;
@@ -3958,18 +3958,18 @@
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
((psessionEntry) ? psessionEntry->
peSessionId : NO_SESSION), pMacHdr->fc.subType));
- cdf_status =
+ qdf_status =
wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
lim_tx_complete, pFrame, 0, 0);
MTRACE(cdf_trace
(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION),
- cdf_status));
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ qdf_status));
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
FL("Failed to send a TPC Report (%X)!"),
- cdf_status);
+ qdf_status);
/* Pkt will be freed up by the callback */
return eSIR_FAILURE; /* just allocated... */
}
@@ -4010,7 +4010,7 @@
tpSirMacMgmtHdr pMacHdr;
uint32_t nBytes, nPayload, nStatus; /* , nCfg; */
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint8_t txFlag = 0;
uint8_t smeSessionId = 0;
@@ -4045,10 +4045,10 @@
nBytes = nPayload + sizeof(tSirMacMgmtHdr);
- cdf_status =
+ qdf_status =
cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a TPC"
" Report."), nBytes);
return eSIR_FAILURE;
@@ -4091,17 +4091,17 @@
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
- cdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
+ qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS,
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- psessionEntry->peSessionId, cdf_status));
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ psessionEntry->peSessionId, qdf_status));
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
FL("Failed to send a Channel Switch (%X)!"),
- cdf_status);
+ qdf_status);
/* Pkt will be freed up by the callback */
return eSIR_FAILURE;
}
@@ -4135,7 +4135,7 @@
tpSirMacMgmtHdr mac_hdr;
uint32_t num_bytes, n_payload, status;
void *packet;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint8_t txFlag = 0;
uint8_t sme_session_id = 0;
@@ -4173,10 +4173,10 @@
num_bytes = n_payload + sizeof(tSirMacMgmtHdr);
- cdf_status = cds_packet_alloc((uint16_t)num_bytes,
+ qdf_status = cds_packet_alloc((uint16_t)num_bytes,
(void **) &frame, (void **) &packet);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(mac_ctx, LOGP,
FL("Failed to allocate %d bytes for a Ext Channel Switch."),
num_bytes);
@@ -4225,18 +4225,18 @@
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
session_entry->peSessionId, mac_hdr->fc.subType));
- cdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) num_bytes,
+ qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) num_bytes,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS,
7,
lim_tx_complete, frame,
txFlag, sme_session_id, 0);
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- session_entry->peSessionId, cdf_status));
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ session_entry->peSessionId, qdf_status));
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(mac_ctx, LOGE,
FL("Failed to send a Ext Channel Switch %X!"),
- cdf_status);
+ qdf_status);
/* Pkt will be freed up by the callback */
return eSIR_FAILURE;
}
@@ -4253,7 +4253,7 @@
tpSirMacMgmtHdr pMacHdr;
uint32_t nBytes, nPayload = 0, nStatus; /* , nCfg; */
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint8_t txFlag = 0;
uint8_t smeSessionId = 0;
@@ -4287,10 +4287,10 @@
nBytes = nPayload + sizeof(tSirMacMgmtHdr);
- cdf_status =
+ qdf_status =
cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGP,
FL("Failed to allocate %d bytes for a Operating Mode"
" Report."), nBytes);
@@ -4334,17 +4334,17 @@
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
- cdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
+ qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS,
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- psessionEntry->peSessionId, cdf_status));
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ psessionEntry->peSessionId, qdf_status));
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGE,
FL("Failed to send a Channel Switch (%X)!"),
- cdf_status);
+ qdf_status);
/* Pkt will be freed up by the callback */
return eSIR_FAILURE;
}
@@ -4382,7 +4382,7 @@
tpSirMacMgmtHdr pMacHdr;
uint32_t nBytes, nPayload, nStatus;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint8_t txFlag = 0;
uint8_t smeSessionId = 0;
@@ -4419,10 +4419,10 @@
nBytes = nPayload + sizeof(tSirMacMgmtHdr);
- cdf_status =
+ qdf_status =
cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGP,
FL("Failed to allocate %d bytes for a Neighbor "
"Report Request."), nBytes);
@@ -4478,7 +4478,7 @@
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
- cdf_status = wma_tx_frame(pMac,
+ qdf_status = wma_tx_frame(pMac,
pPacket,
(uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
@@ -4486,11 +4486,11 @@
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- psessionEntry->peSessionId, cdf_status));
- if (CDF_STATUS_SUCCESS != cdf_status) {
+ psessionEntry->peSessionId, qdf_status));
+ if (QDF_STATUS_SUCCESS != qdf_status) {
PELOGE(lim_log
(pMac, LOGE, FL("wma_tx_frame FAILED! Status [%d]"),
- cdf_status);
+ qdf_status);
)
statusCode = eSIR_FAILURE;
/* Pkt will be freed up by the callback */
@@ -4532,7 +4532,7 @@
tpSirMacMgmtHdr pMacHdr;
uint32_t nBytes, nPayload, nStatus;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint8_t txFlag = 0;
uint8_t smeSessionId = 0;
@@ -4579,10 +4579,10 @@
nBytes = nPayload + sizeof(tSirMacMgmtHdr);
- cdf_status =
+ qdf_status =
cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a Link "
"Report."), nBytes);
return eSIR_FAILURE;
@@ -4635,7 +4635,7 @@
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
- cdf_status = wma_tx_frame(pMac,
+ qdf_status = wma_tx_frame(pMac,
pPacket,
(uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
@@ -4643,11 +4643,11 @@
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- psessionEntry->peSessionId, cdf_status));
- if (CDF_STATUS_SUCCESS != cdf_status) {
+ psessionEntry->peSessionId, qdf_status));
+ if (QDF_STATUS_SUCCESS != qdf_status) {
PELOGE(lim_log
(pMac, LOGE, FL("wma_tx_frame FAILED! Status [%d]"),
- cdf_status);
+ qdf_status);
)
statusCode = eSIR_FAILURE;
/* Pkt will be freed up by the callback */
@@ -4695,7 +4695,7 @@
tpSirMacMgmtHdr pMacHdr;
uint32_t nBytes, nPayload, nStatus;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint8_t i;
uint8_t txFlag = 0;
uint8_t smeSessionId = 0;
@@ -4771,10 +4771,10 @@
nBytes = nPayload + sizeof(tSirMacMgmtHdr);
- cdf_status =
+ qdf_status =
cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame,
(void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGP,
FL("Failed to allocate %d bytes for a Radio Measure "
"Report."), nBytes);
@@ -4830,7 +4830,7 @@
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
- cdf_status = wma_tx_frame(pMac,
+ qdf_status = wma_tx_frame(pMac,
pPacket,
(uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
@@ -4838,11 +4838,11 @@
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- psessionEntry->peSessionId, cdf_status));
- if (CDF_STATUS_SUCCESS != cdf_status) {
+ psessionEntry->peSessionId, qdf_status));
+ if (QDF_STATUS_SUCCESS != qdf_status) {
PELOGE(lim_log
(pMac, LOGE, FL("wma_tx_frame FAILED! Status [%d]"),
- cdf_status);
+ qdf_status);
)
statusCode = eSIR_FAILURE;
/* Pkt will be freed up by the callback */
@@ -4891,7 +4891,7 @@
tpSirMacMgmtHdr pMacHdr;
uint32_t nBytes, nPayload, nStatus;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint8_t txFlag = 0;
uint8_t smeSessionId = 0;
@@ -4918,9 +4918,9 @@
}
nBytes = nPayload + sizeof(tSirMacMgmtHdr);
- cdf_status =
+ qdf_status =
cds_packet_alloc(nBytes, (void **)&pFrame, (void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGP,
FL("Failed to allocate %d bytes for a SA Query Request "
"action frame"), nBytes);
@@ -4977,17 +4977,17 @@
}
smeSessionId = psessionEntry->smeSessionId;
- cdf_status = wma_tx_frame(pMac,
+ qdf_status = wma_tx_frame(pMac,
pPacket,
(uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS,
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
- if (CDF_STATUS_SUCCESS != cdf_status) {
+ if (QDF_STATUS_SUCCESS != qdf_status) {
PELOGE(lim_log
(pMac, LOGE, FL("wma_tx_frame FAILED! Status [%d]"),
- cdf_status);
+ qdf_status);
)
nSirStatus = eSIR_FAILURE;
/* Pkt will be freed up by the callback */
@@ -5030,7 +5030,7 @@
tpSirMacMgmtHdr pMacHdr;
uint32_t nBytes, nPayload, nStatus;
void *pPacket;
- CDF_STATUS cdf_status;
+ QDF_STATUS qdf_status;
uint8_t txFlag = 0;
uint8_t smeSessionId = 0;
@@ -5060,9 +5060,9 @@
}
nBytes = nPayload + sizeof(tSirMacMgmtHdr);
- cdf_status =
+ qdf_status =
cds_packet_alloc(nBytes, (void **)&pFrame, (void **)&pPacket);
- if (!CDF_IS_STATUS_SUCCESS(cdf_status)) {
+ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
lim_log(pMac, LOGP,
FL("Failed to allocate %d bytes for a SA query response"
" action frame"), nBytes);
@@ -5118,7 +5118,7 @@
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
psessionEntry->peSessionId, pMacHdr->fc.subType));
- cdf_status = wma_tx_frame(pMac,
+ qdf_status = wma_tx_frame(pMac,
pPacket,
(uint16_t) nBytes,
TXRX_FRM_802_11_MGMT,
@@ -5126,11 +5126,11 @@
7, lim_tx_complete, pFrame, txFlag,
smeSessionId, 0);
MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
- psessionEntry->peSessionId, cdf_status));
- if (CDF_STATUS_SUCCESS != cdf_status) {
+ psessionEntry->peSessionId, qdf_status));
+ if (QDF_STATUS_SUCCESS != qdf_status) {
PELOGE(lim_log
(pMac, LOGE, FL("wma_tx_frame FAILED! Status [%d]"),
- cdf_status);
+ qdf_status);
)
nSirStatus = eSIR_FAILURE;
/* Pkt will be freed up by the callback */
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
index f514619..13f86da 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
@@ -231,7 +231,7 @@
* Return: None
*/
static void lim_send_sme_join_reassoc_rsp_after_resume(tpAniSirGlobal mac_ctx,
- CDF_STATUS status, uint32_t *ctx)
+ QDF_STATUS status, uint32_t *ctx)
{
tSirMsgQ msg;
tpSirSmeJoinRsp sme_join_rsp = (tpSirSmeJoinRsp) ctx;
@@ -513,7 +513,7 @@
sme_join_rsp->sessionId = sme_session_id;
sme_join_rsp->transactionId = sme_transaction_id;
- lim_send_sme_join_reassoc_rsp_after_resume(mac_ctx, CDF_STATUS_SUCCESS,
+ lim_send_sme_join_reassoc_rsp_after_resume(mac_ctx, QDF_STATUS_SUCCESS,
(uint32_t *)sme_join_rsp);
}
@@ -854,7 +854,7 @@
#endif
void lim_send_sme_disassoc_deauth_ntf(tpAniSirGlobal pMac,
- CDF_STATUS status, uint32_t *pCtx)
+ QDF_STATUS status, uint32_t *pCtx)
{
tSirMsgQ mmhMsg;
tSirMsgQ *pMsg = (tSirMsgQ *) pCtx;
@@ -1019,7 +1019,7 @@
}
if (false == failure)
- lim_send_sme_disassoc_deauth_ntf(pMac, CDF_STATUS_SUCCESS,
+ lim_send_sme_disassoc_deauth_ntf(pMac, QDF_STATUS_SUCCESS,
(uint32_t *) pMsg);
} /*** end lim_send_sme_disassoc_ntf() ***/
@@ -1462,7 +1462,7 @@
pe_delete_session(pMac, psessionEntry);
}
- lim_send_sme_disassoc_deauth_ntf(pMac, CDF_STATUS_SUCCESS,
+ lim_send_sme_disassoc_deauth_ntf(pMac, QDF_STATUS_SUCCESS,
(uint32_t *) pMsg);
} /*** end lim_send_sme_deauth_ntf() ***/
@@ -2489,7 +2489,7 @@
pChanSwTxResponse->sessionId =
psessionEntry->smeSessionId;
pChanSwTxResponse->chanSwIeTxStatus =
- CDF_STATUS_SUCCESS;
+ QDF_STATUS_SUCCESS;
mmhMsg.type = eWNI_SME_DFS_CSAIE_TX_COMPLETE_IND;
mmhMsg.bodyptr = pChanSwTxResponse;
@@ -2514,7 +2514,7 @@
sizeof(*beacon_tx_comp_rsp_ptr), 0);
beacon_tx_comp_rsp_ptr->session_id =
psessionEntry->smeSessionId;
- beacon_tx_comp_rsp_ptr->tx_status = CDF_STATUS_SUCCESS;
+ beacon_tx_comp_rsp_ptr->tx_status = QDF_STATUS_SUCCESS;
mmhMsg.type = eWNI_SME_NSS_UPDATE_RSP;
mmhMsg.bodyptr = beacon_tx_comp_rsp_ptr;
mmhMsg.bodyval = 0;
diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c
index 7dcde47..4885b60 100644
--- a/core/mac/src/pe/lim/lim_session.c
+++ b/core/mac/src/pe/lim/lim_session.c
@@ -162,8 +162,7 @@
cdf_mem_zero(&beacon_params, sizeof(tUpdateBeaconParams));
/* index 0, is self node, peers start from 1 */
- for (i = 1 ; i <= mac_ctx->lim.gLimAssocStaLimit ; i++)
- {
+ for (i = 1 ; i <= mac_ctx->lim.gLimAssocStaLimit ; i++) {
station_hash_node = dph_get_hash_entry(mac_ctx, i,
&pe_session_entry->dph.dphHashTable);
if (NULL == station_hash_node)
@@ -217,7 +216,7 @@
if (cdf_mc_timer_start(&pe_session_entry->
protection_fields_reset_timer,
SCH_PROTECTION_RESET_TIME)
- != CDF_STATUS_SUCCESS) {
+ != QDF_STATUS_SUCCESS) {
CDF_TRACE(CDF_MODULE_ID_PE,
CDF_TRACE_LEVEL_ERROR,
FL("cannot create or start protectionFieldsResetTimer\n"));
@@ -242,7 +241,7 @@
pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId,
uint16_t numSta, tSirBssType bssType)
{
- CDF_STATUS status;
+ QDF_STATUS status;
uint8_t i;
tpPESession session_ptr;
for (i = 0; i < pMac->lim.maxBssId; i++) {
@@ -371,12 +370,12 @@
&session_ptr->protection_fields_reset_timer,
CDF_TIMER_TYPE_SW, pe_reset_protection_callback,
(void *)&pMac->lim.gpSession[i]);
- if (status == CDF_STATUS_SUCCESS) {
+ if (status == QDF_STATUS_SUCCESS) {
status = cdf_mc_timer_start(
&session_ptr->protection_fields_reset_timer,
SCH_PROTECTION_RESET_TIME);
}
- if (status != CDF_STATUS_SUCCESS)
+ if (status != QDF_STATUS_SUCCESS)
CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
FL("cannot create or start protectionFieldsResetTimer\n"));
}
@@ -386,7 +385,7 @@
status = cdf_mc_timer_init(&session_ptr->pmfComebackTimer,
CDF_TIMER_TYPE_SW, lim_pmf_comeback_timer_callback,
(void *)&session_ptr->pmfComebackTimerInfo);
- if (!CDF_IS_STATUS_SUCCESS(status))
+ if (!QDF_IS_STATUS_SUCCESS(status))
lim_log(pMac, LOGE, FL("cannot init pmf comeback timer."));
return &pMac->lim.gpSession[i];
@@ -414,16 +413,16 @@
for (i = 0; i < pMac->lim.maxBssId; i++) {
/* If BSSID matches return corresponding tables address */
if ((pMac->lim.gpSession[i].valid)
- && (sir_compare_mac_addr(pMac->lim.gpSession[i].bssId, bssid)))
- {
+ && (sir_compare_mac_addr(pMac->lim.gpSession[i].bssId,
+ bssid))) {
*sessionId = i;
- return (&pMac->lim.gpSession[i]);
+ return &pMac->lim.gpSession[i];
}
}
lim_log(pMac, LOG4, FL("Session lookup fails for BSSID: \n "));
lim_print_mac_addr(pMac, bssid, LOG4);
- return (NULL);
+ return NULL;
}
@@ -468,12 +467,12 @@
{
if (sessionId >= pMac->lim.maxBssId) {
lim_log(pMac, LOGE, FL("Invalid sessionId: %d \n "), sessionId);
- return (NULL);
+ return NULL;
}
if ((pMac->lim.gpSession[sessionId].valid == true)) {
- return (&pMac->lim.gpSession[sessionId]);
+ return &pMac->lim.gpSession[sessionId];
}
- return (NULL);
+ return NULL;
}
diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h
index 514b70c..3a3161f 100644
--- a/core/mac/src/pe/lim/lim_types.h
+++ b/core/mac/src/pe/lim/lim_types.h
@@ -469,8 +469,8 @@
#endif
void lim_send_delts_req_action_frame(tpAniSirGlobal pMac, tSirMacAddr peer,
uint8_t wmmTspecPresent,
- tSirMacTSInfo *pTsinfo,
- tSirMacTspecIE *pTspecIe,
+ tSirMacTSInfo * pTsinfo,
+ tSirMacTspecIE * pTspecIe,
tpPESession psessionEntry);
void lim_send_addts_req_action_frame(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr,
tSirAddtsReqInfo *addts, tpPESession);
@@ -530,7 +530,7 @@
uint32_t txCompleteStatus);
tSirRetStatus lim_delete_tdls_peers(tpAniSirGlobal mac_ctx,
tpPESession session_entry);
-CDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession);
+QDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession);
#else
static inline tSirRetStatus lim_delete_tdls_peers(tpAniSirGlobal mac_ctx,
tpPESession session_entry)
@@ -829,11 +829,11 @@
void lim_process_disassoc_ack_timeout(tpAniSirGlobal pMac);
void lim_process_deauth_ack_timeout(tpAniSirGlobal pMac);
-CDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal pMac);
-CDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac);
-CDF_STATUS lim_disassoc_tx_complete_cnf(tpAniSirGlobal pMac,
+QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal pMac);
+QDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac);
+QDF_STATUS lim_disassoc_tx_complete_cnf(tpAniSirGlobal pMac,
uint32_t txCompleteSuccess);
-CDF_STATUS lim_deauth_tx_complete_cnf(tpAniSirGlobal pMac,
+QDF_STATUS lim_deauth_tx_complete_cnf(tpAniSirGlobal pMac,
uint32_t txCompleteSuccess);
#ifdef WLAN_FEATURE_VOWIFI_11R
@@ -845,9 +845,9 @@
void lim_process_rx_scan_event(tpAniSirGlobal mac, void *buf);
int lim_process_remain_on_chnl_req(tpAniSirGlobal pMac, uint32_t *pMsg);
-void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, CDF_STATUS status, uint32_t *data);
+void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data);
void lim_send_sme_disassoc_deauth_ntf(tpAniSirGlobal mac_ctx,
- CDF_STATUS status, uint32_t *ctx);
+ QDF_STATUS status, uint32_t *ctx);
/* / Bit value data structure */
typedef enum sHalBitVal /* For Bit operations */
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index 98cb551..c53efd0 100644
--- a/core/mac/src/pe/lim/lim_utils.c
+++ b/core/mac/src/pe/lim/lim_utils.c
@@ -1155,7 +1155,7 @@
* characters in SSID are spaces to consider it as NULL SSID
*/
if ((ASCII_SPACE_CHARACTER == ssid->ssId[0]) &&
- (ssid->length == 1)){
+ (ssid->length == 1)) {
fnull_ssid = true;
return fnull_ssid;
} else {
@@ -2653,7 +2653,7 @@
* @param psessionEntry Session information
* @return NONE
*/
-void lim_switch_channel_cback(tpAniSirGlobal pMac, CDF_STATUS status,
+void lim_switch_channel_cback(tpAniSirGlobal pMac, QDF_STATUS status,
uint32_t *data, tpPESession psessionEntry)
{
tSirMsgQ mmhMsg = { 0 };
@@ -3487,7 +3487,7 @@
overlap, beaconparams, session_entry);
if (session_entry->gLimHt20Params.
protectionEnabled) {
- if(eHT_CHANNEL_WIDTH_20MHZ ==
+ if (eHT_CHANNEL_WIDTH_20MHZ ==
session_entry->htSupportedChannelWidthSet)
session_entry->htOperMode =
eSIR_HT_OP_MODE_PURE;
@@ -3896,7 +3896,7 @@
psessionEntry);
if (psessionEntry->gLimHt20Params.protectionEnabled) {
- if(eHT_CHANNEL_WIDTH_20MHZ ==
+ if (eHT_CHANNEL_WIDTH_20MHZ ==
psessionEntry->htSupportedChannelWidthSet)
psessionEntry->htOperMode =
eSIR_HT_OP_MODE_PURE;
@@ -4313,7 +4313,7 @@
session_entry->htOperMode)) {
if (session_entry->gLimHt20Params.
protectionEnabled) {
- if(eHT_CHANNEL_WIDTH_20MHZ ==
+ if (eHT_CHANNEL_WIDTH_20MHZ ==
session_entry->htSupportedChannelWidthSet)
session_entry->htOperMode =
eSIR_HT_OP_MODE_PURE;
@@ -5591,7 +5591,7 @@
\param type - Which way we want to stop/ resume tx.
\param mode - To stop/resume.
-------------------------------------------------------*/
-static CDF_STATUS
+static QDF_STATUS
__lim_fill_tx_control_params(tpAniSirGlobal pMac, tpTxControlParams pTxCtrlMsg,
tLimQuietTxMode type, tLimControlTx mode)
{
@@ -5626,10 +5626,10 @@
/* Fall thru... */
default:
PELOGW(lim_log(pMac, LOGW, FL("Invalid case: Not Handled"));)
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
/**
@@ -5654,7 +5654,7 @@
tLimControlTx mode)
{
- CDF_STATUS status = CDF_STATUS_E_FAILURE;
+ QDF_STATUS status = QDF_STATUS_E_FAILURE;
tpTxControlParams pTxCtrlMsg;
tSirMsgQ msgQ;
uint8_t nBytes = 0; /* No of bytes required for station bitmap. */
@@ -5671,7 +5671,7 @@
cdf_mem_set((void *)pTxCtrlMsg, (sizeof(*pTxCtrlMsg) + nBytes), 0);
status = __lim_fill_tx_control_params(pMac, pTxCtrlMsg, type, mode);
- if (status != CDF_STATUS_SUCCESS) {
+ if (status != QDF_STATUS_SUCCESS) {
cdf_mem_free(pTxCtrlMsg);
lim_log(pMac, LOGP,
FL("__lim_fill_tx_control_params failed, status = %d"),
@@ -6898,9 +6898,9 @@
* of. Since STA/SAP can have different Extended capabilities set, this function
* is called per vdev creation.
*
- * Return: CDF_STATUS
+ * Return: QDF_STATUS
*/
-CDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx,
+QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx,
uint32_t session_id,
tDot11fIEExtCap *extra_extcap, bool merge)
{
@@ -6920,7 +6920,7 @@
NULL);
if (eSIR_SUCCESS != status) {
lim_log(mac_ctx, LOGE, FL("Failed to populate ext cap IE"));
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
num_bytes = ext_cap_data.num_bytes;
@@ -6935,7 +6935,7 @@
vdev_ie = cdf_mem_malloc(sizeof(*vdev_ie) + num_bytes);
if (!vdev_ie) {
lim_log(mac_ctx, LOGE, FL("Failed to allocate memory"));
- return CDF_STATUS_E_NOMEM;
+ return QDF_STATUS_E_NOMEM;
}
vdev_ie->vdev_id = session_id;
@@ -6955,15 +6955,15 @@
msg.bodyptr = vdev_ie;
msg.reserved = 0;
- if (CDF_STATUS_SUCCESS !=
+ if (QDF_STATUS_SUCCESS !=
cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) {
lim_log(mac_ctx, LOGE,
FL("Not able to post WMA_SET_IE_INFO to WDA"));
cdf_mem_free(vdev_ie);
- return CDF_STATUS_E_FAILURE;
+ return QDF_STATUS_E_FAILURE;
}
- return CDF_STATUS_SUCCESS;
+ return QDF_STATUS_SUCCESS;
}
/**
diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h
index ae5cd6a..9200313 100644
--- a/core/mac/src/pe/lim/lim_utils.h
+++ b/core/mac/src/pe/lim/lim_utils.h
@@ -244,7 +244,7 @@
void lim_prepare_for11h_channel_switch(tpAniSirGlobal pMac,
tpPESession psessionEntry);
-void lim_switch_channel_cback(tpAniSirGlobal pMac, CDF_STATUS status,
+void lim_switch_channel_cback(tpAniSirGlobal pMac, QDF_STATUS status,
uint32_t *data, tpPESession psessionEntry);
static inline tSirRFBand lim_get_rf_band(uint8_t channel)
@@ -576,7 +576,7 @@
void lim_check_and_reset_protection_params(tpAniSirGlobal mac_ctx);
-CDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, uint32_t session_id,
+QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, uint32_t session_id,
tDot11fIEExtCap *extracted_extcap, bool merge);
tSirRetStatus lim_strip_extcap_ie(tpAniSirGlobal mac_ctx, uint8_t *addn_ie,