diff --git a/core/bmi/inc/bmi.h b/core/bmi/inc/bmi.h index b016e87695..7ceb675a0e 100644 --- a/core/bmi/inc/bmi.h +++ b/core/bmi/inc/bmi.h @@ -38,7 +38,7 @@ #include "hif.h" struct ol_context; -CDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx); +QDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx); void ol_cds_free(void); /** @@ -64,22 +64,22 @@ void ol_init_ini_config(struct ol_context *ol_ctx, struct ol_config_info *cfg); #ifdef HIF_PCI void bmi_cleanup(struct ol_context *scn); -CDF_STATUS bmi_done(struct ol_context *ol_ctx); -CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx); +QDF_STATUS bmi_done(struct ol_context *ol_ctx); +QDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx); #else static inline void bmi_cleanup(struct ol_context *scn) { return; } -static inline CDF_STATUS bmi_done(struct ol_context *ol_ctx) +static inline QDF_STATUS bmi_done(struct ol_context *ol_ctx) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) +static inline QDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif #endif /* _BMI_H_ */ diff --git a/core/bmi/inc/ol_fw.h b/core/bmi/inc/ol_fw.h index c26c26aaf2..322c0e0928 100644 --- a/core/bmi/inc/ol_fw.h +++ b/core/bmi/inc/ol_fw.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -48,9 +48,9 @@ #define AR6320_DEV_VERSION 0x1000000 #ifdef HIF_PCI -void ol_target_failure(void *instance, CDF_STATUS status); +void ol_target_failure(void *instance, QDF_STATUS status); #else -static inline void ol_target_failure(void *instance, CDF_STATUS status) +static inline void ol_target_failure(void *instance, QDF_STATUS status) { return; } diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c index 782792fb2c..3e72c76af9 100644 --- a/core/bmi/src/bmi.c +++ b/core/bmi/src/bmi.c @@ -37,7 +37,7 @@ /* Enable BMI_TEST COMMANDs; The Value 0x09 is randomly choosen */ #define BMI_TEST_ENABLE (0x09) -static CDF_STATUS +static QDF_STATUS bmi_command_test(uint32_t command, uint32_t address, uint8_t *data, uint32_t length, struct ol_context *ol_ctx) { @@ -53,10 +53,10 @@ bmi_command_test(uint32_t command, uint32_t address, uint8_t *data, default: break; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS bmi_init(struct ol_context *ol_ctx) +QDF_STATUS bmi_init(struct ol_context *ol_ctx) { struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); struct hif_opaque_softc *scn = ol_ctx->scn; @@ -65,12 +65,12 @@ CDF_STATUS bmi_init(struct ol_context *ol_ctx) if (!scn) { BMI_ERR("Invalid scn Context"); bmi_assert(0); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } if (!cdf_dev->dev) { BMI_ERR("%s: Invalid Device Pointer", __func__); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } info->bmi_done = false; @@ -81,7 +81,7 @@ CDF_STATUS bmi_init(struct ol_context *ol_ctx) &info->bmi_cmd_da, 0); if (!info->bmi_cmd_buff) { BMI_ERR("No Memory for BMI Command"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } } @@ -94,12 +94,12 @@ CDF_STATUS bmi_init(struct ol_context *ol_ctx) goto end; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; end: cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_cmd_buff, info->bmi_cmd_da, 0); info->bmi_cmd_buff = NULL; - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } void bmi_cleanup(struct ol_context *ol_ctx) @@ -128,22 +128,22 @@ void bmi_cleanup(struct ol_context *ol_ctx) } -CDF_STATUS bmi_done(struct ol_context *ol_ctx) +QDF_STATUS bmi_done(struct ol_context *ol_ctx) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (NO_BMI) return status; status = bmi_done_local(ol_ctx); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) BMI_ERR("BMI_DONE Failed status:%d", status); return status; } -CDF_STATUS +QDF_STATUS bmi_get_target_info(struct bmi_target_info *targ_info, struct ol_context *ol_ctx) { @@ -158,12 +158,12 @@ bmi_get_target_info(struct bmi_target_info *targ_info, if (info->bmi_done) { BMI_ERR("BMI Phase is Already Done"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("%s:BMI CMD/RSP Buffer is NULL", __func__); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } cid = BMI_GET_TARGET_INFO; @@ -175,11 +175,11 @@ bmi_get_target_info(struct bmi_target_info *targ_info, BMI_EXCHANGE_TIMEOUT_MS); if (status) { BMI_ERR("Failed to target info: status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(targ_info, bmi_rsp_buff, length); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_BMI_2 @@ -194,7 +194,7 @@ static inline uint32_t bmi_get_test_addr(void) } #endif -CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) +QDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) { uint8_t data[10], out[10]; uint32_t address; @@ -202,12 +202,12 @@ CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) struct hif_opaque_softc *scn = ol_ctx->scn; if (NO_BMI) - return CDF_STATUS_SUCCESS; /* no BMI for Q6 bring up */ + return QDF_STATUS_SUCCESS; /* no BMI for Q6 bring up */ if (!scn) { BMI_ERR("Invalid scn context"); bmi_assert(0); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } #ifdef CONFIG_CNSS if (BMI_TEST_ENABLE == cnss_get_bmi_setup()) { @@ -215,7 +215,7 @@ CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) BMI_DBG("ret:%d writing data:%s\n", ret, data); address = bmi_get_test_addr(); - if (bmi_init(ol_ctx) != CDF_STATUS_SUCCESS) { + if (bmi_init(ol_ctx) != QDF_STATUS_SUCCESS) { BMI_WARN("BMI_INIT Failed; No Memory!"); goto end; } @@ -229,7 +229,7 @@ end: return bmi_firmware_download(ol_ctx); } -CDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, +QDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; @@ -248,7 +248,7 @@ CDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, if (info->bmi_done) { BMI_DBG("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } BMI_DBG("BMI Read SOC Register:device: 0x%p, address: 0x%x", @@ -266,15 +266,15 @@ CDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, bmi_rsp_buff, ¶m_len, BMI_EXCHANGE_TIMEOUT_MS); if (status) { BMI_DBG("Unable to read from the device; status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(param, bmi_rsp_buff, sizeof(*param)); BMI_DBG("BMI Read SOC Register: Exit value: %d", *param); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, +QDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; @@ -292,7 +292,7 @@ CDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, if (info->bmi_done) { BMI_DBG("Command disallowed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } BMI_DBG("SOC Register Write:device:0x%p, addr:0x%x, param:%d", @@ -311,14 +311,14 @@ CDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, NULL, NULL, 0); if (status) { BMI_ERR("Unable to write to the device: status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } BMI_DBG("BMI Read SOC Register: Exit"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmilz_data(uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { uint32_t cid; @@ -337,7 +337,7 @@ bmilz_data(uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } BMI_DBG("BMI Send LZ Data: device: 0x%p, length: %d", @@ -363,17 +363,17 @@ bmilz_data(uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) if (status) { BMI_ERR("Failed to write to the device: status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } remaining -= txlen; } BMI_DBG("BMI LZ Data: Exit"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS bmi_sign_stream_start(uint32_t address, uint8_t *buffer, +QDF_STATUS bmi_sign_stream_start(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { uint32_t cid; @@ -394,7 +394,7 @@ CDF_STATUS bmi_sign_stream_start(uint32_t address, uint8_t *buffer, if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } BMI_ERR("Sign Stream start:device:0x%p, addr:0x%x, length:%d", @@ -431,16 +431,16 @@ CDF_STATUS bmi_sign_stream_start(uint32_t address, uint8_t *buffer, if (status) { BMI_ERR("Unable to write to the device: status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } remaining -= txlen; } BMI_DBG("BMI SIGN Stream Start: Exit"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmilz_stream_start(uint32_t address, struct ol_context *ol_ctx) { uint32_t cid; @@ -457,7 +457,7 @@ bmilz_stream_start(uint32_t address, struct ol_context *ol_ctx) if (info->bmi_done) { BMI_DBG("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } BMI_DBG("BMI LZ Stream Start: (device: 0x%p, address: 0x%x)", scn, address); @@ -473,23 +473,23 @@ bmilz_stream_start(uint32_t address, struct ol_context *ol_ctx) if (status) { BMI_ERR("Unable to Start LZ Stream to the device status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } BMI_DBG("BMI LZ Stream: Exit"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmi_fast_download(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t last_word = 0; uint32_t last_word_offset = length & ~0x3; uint32_t unaligned_bytes = length & 0x3; status = bmilz_stream_start(address, ol_ctx); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) goto end; /* copy the last word into a zero padded buffer */ @@ -499,13 +499,13 @@ bmi_fast_download(uint32_t address, uint8_t *buffer, status = bmilz_data(buffer, last_word_offset, ol_ctx); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) goto end; if (unaligned_bytes) status = bmilz_data((uint8_t *) &last_word, 4, ol_ctx); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) /* * Close compressed stream and open a new (fake) one. * This serves mainly to flush Target caches. @@ -517,23 +517,23 @@ end: /** * ol_cds_init() - API to initialize global CDS OL Context - * @cdf_dev: CDF Device + * @cdf_dev: QDF Device * @hif_ctx: HIF Context * * Return: Success/Failure */ -CDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx) +QDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx) { struct ol_context *ol_info; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (NO_BMI) - return CDF_STATUS_SUCCESS; /* no BMI for Q6 bring up */ + return QDF_STATUS_SUCCESS; /* no BMI for Q6 bring up */ - status = cds_alloc_context(cds_get_global_context(), CDF_MODULE_ID_BMI, + status = cds_alloc_context(cds_get_global_context(), QDF_MODULE_ID_BMI, (void **)&ol_info, sizeof(*ol_info)); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("%s: CDS Allocation failed for ol_bmi context", __func__); return status; @@ -555,10 +555,10 @@ CDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx) */ void ol_cds_free(void) { - struct ol_context *ol_info = cds_get_context(CDF_MODULE_ID_BMI); + struct ol_context *ol_info = cds_get_context(QDF_MODULE_ID_BMI); if (NO_BMI) return; - cds_free_context(cds_get_global_context(), CDF_MODULE_ID_BMI, ol_info); + cds_free_context(cds_get_global_context(), QDF_MODULE_ID_BMI, ol_info); } diff --git a/core/bmi/src/bmi_1.c b/core/bmi/src/bmi_1.c index 331d1db27d..d95dbe75b1 100644 --- a/core/bmi/src/bmi_1.c +++ b/core/bmi/src/bmi_1.c @@ -30,7 +30,7 @@ /* APIs visible to the driver */ -CDF_STATUS +QDF_STATUS bmi_read_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { @@ -48,12 +48,12 @@ bmi_read_memory(uint32_t address, if (info->bmi_done) { BMI_DBG("command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!info->bmi_cmd_buff || !info->bmi_rsp_buff) { BMI_ERR("BMI Initialization hasn't done"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + sizeof(cid) + @@ -88,7 +88,7 @@ bmi_read_memory(uint32_t address, BMI_EXCHANGE_TIMEOUT_MS); if (status) { BMI_ERR("Unable to read from the device"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (remaining == rxlen) { cdf_mem_copy(&buffer[length - remaining + align], @@ -103,10 +103,10 @@ bmi_read_memory(uint32_t address, } BMI_DBG("BMI Read Memory: Exit"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, +QDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; @@ -124,12 +124,12 @@ CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff) { BMI_ERR("BMI initialization hasn't done"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header)); @@ -170,7 +170,7 @@ CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, if (status) { BMI_ERR("Unable to write to the device; status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } remaining -= txlen; address += txlen; @@ -178,10 +178,10 @@ CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, BMI_DBG("BMI Write Memory: Exit"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmi_execute(uint32_t address, A_UINT32 *param, struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; @@ -198,12 +198,12 @@ bmi_execute(uint32_t address, A_UINT32 *param, struct ol_context *ol_ctx) if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("%s:BMI CMD/RSP Buffer is NULL", __func__); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } bmi_assert(BMI_COMMAND_FITS(size)); @@ -228,40 +228,40 @@ bmi_execute(uint32_t address, A_UINT32 *param, struct ol_context *ol_ctx) bmi_rsp_buff, ¶m_len, 0); if (status) { BMI_ERR("Unable to read from the device status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(param, bmi_rsp_buff, sizeof(*param)); BMI_DBG("BMI Execute: Exit (param: %d)", *param); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -inline CDF_STATUS +inline QDF_STATUS bmi_no_command(struct ol_context *ol_ctx) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; - CDF_STATUS status; + QDF_STATUS status; struct bmi_target_info targ_info; struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); cdf_mem_zero(&targ_info, sizeof(targ_info)); /* Initialize BMI */ status = bmi_init(ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("BMI Initialization Failed err:%d", status); return status; } /* Get target information */ status = bmi_get_target_info(&targ_info, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("BMI Target Info get failed: status:%d", status); return status; } @@ -271,19 +271,19 @@ bmi_firmware_download(struct ol_context *ol_ctx) /* Configure target */ status = ol_configure_target(ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("BMI Configure Target Failed status:%d", status); return status; } status = ol_download_firmware(ol_ctx); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) BMI_ERR("BMI Download Firmware Failed Status:%d", status); return status; } -CDF_STATUS bmi_done_local(struct ol_context *ol_ctx) +QDF_STATUS bmi_done_local(struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; int status; @@ -295,18 +295,18 @@ CDF_STATUS bmi_done_local(struct ol_context *ol_ctx) if (!scn) { BMI_ERR("Invalid scn context"); bmi_assert(0); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } if (!cdf_dev->dev) { BMI_ERR("%s: Invalid device pointer", __func__); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } info = GET_BMI_CONTEXT(ol_ctx); if (info->bmi_done) { BMI_DBG("bmi_done_local skipped"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } cmd = info->bmi_cmd_da; @@ -320,7 +320,7 @@ CDF_STATUS bmi_done_local(struct ol_context *ol_ctx) if (!info->bmi_cmd_buff) { BMI_ERR("Invalid scn BMICmdBuff"); bmi_assert(0); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } cdf_mem_copy(info->bmi_cmd_buff, &cid, sizeof(cid)); @@ -329,7 +329,7 @@ CDF_STATUS bmi_done_local(struct ol_context *ol_ctx) sizeof(cid), NULL, NULL, 0); if (status) { BMI_ERR("Failed to write to the device; status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (info->bmi_cmd_buff) { @@ -346,5 +346,5 @@ CDF_STATUS bmi_done_local(struct ol_context *ol_ctx) info->bmi_rsp_da = 0; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } diff --git a/core/bmi/src/bmi_2.c b/core/bmi/src/bmi_2.c index 79de973756..ef697ecf64 100644 --- a/core/bmi/src/bmi_2.c +++ b/core/bmi/src/bmi_2.c @@ -33,7 +33,7 @@ */ #define BMI_LOAD_IMAGE 18 -CDF_STATUS +QDF_STATUS bmi_no_command(struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; @@ -49,12 +49,12 @@ bmi_no_command(struct ol_context *ol_ctx) if (info->bmi_done) { BMI_ERR("Command disallowed: BMI DONE ALREADY"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("No Memory Allocated for BMI CMD/RSP Buffer"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } cid = BMI_NO_COMMAND; @@ -66,18 +66,18 @@ bmi_no_command(struct ol_context *ol_ctx) if (status) { BMI_ERR("Failed to write bmi no command status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&ret, bmi_rsp_buff, length); if (ret != 0) { BMI_ERR("bmi no command response error ret 0x%x", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmi_done_local(struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; @@ -94,17 +94,17 @@ bmi_done_local(struct ol_context *ol_ctx) if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("No Memory Allocated for BMI CMD/RSP Buffer"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } if (!cdf_dev->dev) { BMI_ERR("%s Invalid Device pointer", __func__); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } cid = BMI_DONE; @@ -117,13 +117,13 @@ bmi_done_local(struct ol_context *ol_ctx) if (status) { BMI_ERR("Failed to close BMI on target status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&ret, bmi_rsp_buff, length); if (ret != 0) { BMI_ERR("BMI DONE response failed:%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (info->bmi_cmd_buff) { @@ -140,10 +140,10 @@ bmi_done_local(struct ol_context *ol_ctx) info->bmi_rsp_da = 0; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, +QDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { uint32_t cid; @@ -164,12 +164,12 @@ CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("BMI Initialization is not happened"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header)); @@ -207,20 +207,20 @@ CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, BMI_EXCHANGE_TIMEOUT_MS); if (status) { BMI_ERR("BMI Write Memory Failed status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&ret, bmi_rsp_buff, rsp_len); if (ret != 0) { BMI_ERR("BMI Write memory response fail: %x", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } remaining -= txlen; address += txlen; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmi_read_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { @@ -240,11 +240,11 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("BMI Initialization is not done"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + size)); @@ -278,14 +278,14 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, if (status) { BMI_ERR("BMI Read memory failed status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&ret, bmi_rsp_buff, rsp_len); if (ret != 0) { BMI_ERR("bmi read memory response fail %x", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&buffer[length - remaining], @@ -293,10 +293,10 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, remaining -= rxlen; address += rxlen; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; @@ -312,12 +312,12 @@ bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx) if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("No Memory Allocated for bmi buffers"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } cid = BMI_EXECUTE; @@ -330,24 +330,24 @@ bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx) if (status) { BMI_ERR("Failed to do BMI_EXECUTE status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&ret, bmi_rsp_buff, length); if (ret != 0) { BMI_ERR("%s: ret 0x%x", __func__, ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS +static QDF_STATUS bmi_load_image(dma_addr_t address, uint32_t size, struct ol_context *ol_ctx) { uint32_t cid; - CDF_STATUS status; + QDF_STATUS status; uint32_t offset; uint32_t length; uint8_t ret = 0; @@ -362,12 +362,12 @@ bmi_load_image(dma_addr_t address, if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("No Memory Allocated for BMI CMD/RSP Buffer"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } bmi_assert(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); @@ -396,41 +396,41 @@ bmi_load_image(dma_addr_t address, if (status) { BMI_ERR("BMI Load Image Failed; status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&ret, bmi_rsp_buff, length); if (ret != 0) { BMI_ERR("%s: ret 0x%x", __func__, ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS bmi_enable(struct ol_context *ol_ctx) +static QDF_STATUS bmi_enable(struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; struct bmi_target_info targ_info; struct image_desc_info image_desc_info; - CDF_STATUS status; + QDF_STATUS status; struct hif_target_info *tgt_info; struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); if (!scn) { BMI_ERR("Invalid scn context"); bmi_assert(0); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } tgt_info = hif_get_target_info_handle(scn); if (info->bmi_cmd_buff == NULL || info->bmi_rsp_buff == NULL) { BMI_ERR("bmi_open failed!"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } status = bmi_get_target_info(&targ_info, ol_ctx); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) return status; BMI_DBG("%s: target type 0x%x, target ver 0x%x", __func__, @@ -441,13 +441,13 @@ static CDF_STATUS bmi_enable(struct ol_context *ol_ctx) if (cnss_get_fw_image(&image_desc_info) != 0) { BMI_ERR("Failed to get fw image"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = bmi_load_image(image_desc_info.bdata_addr, image_desc_info.bdata_size, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Load board data failed! status:%d", status); return status; } @@ -455,27 +455,27 @@ static CDF_STATUS bmi_enable(struct ol_context *ol_ctx) status = bmi_load_image(image_desc_info.fw_addr, image_desc_info.fw_size, ol_ctx); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) BMI_ERR("Load fw image failed! status:%d", status); return status; } -CDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx) +QDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx) { - CDF_STATUS status; + QDF_STATUS status; if (NO_BMI) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; status = bmi_init(ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("BMI_INIT Failed status:%d", status); goto end; } status = bmi_enable(ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("BMI_ENABLE failed status:%d\n", status); goto err_bmi_enable; } diff --git a/core/bmi/src/i_bmi.h b/core/bmi/src/i_bmi.h index caef15d1b9..2638981efc 100644 --- a/core/bmi/src/i_bmi.h +++ b/core/bmi/src/i_bmi.h @@ -75,16 +75,16 @@ /* BMI LOGGING WRAPPERS */ -#define BMI_LOG(level, args...) CDF_TRACE(CDF_MODULE_ID_BMI, \ +#define BMI_LOG(level, args...) QDF_TRACE(QDF_MODULE_ID_BMI, \ level, ##args) -#define BMI_ERR(args ...) BMI_LOG(CDF_TRACE_LEVEL_ERROR, args) -#define BMI_DBG(args ...) BMI_LOG(CDF_TRACE_LEVEL_DEBUG, args) -#define BMI_WARN(args ...) BMI_LOG(CDF_TRACE_LEVEL_WARN, args) -#define BMI_INFO(args ...) BMI_LOG(CDF_TRACE_LEVEL_INFO, args) +#define BMI_ERR(args ...) BMI_LOG(QDF_TRACE_LEVEL_ERROR, args) +#define BMI_DBG(args ...) BMI_LOG(QDF_TRACE_LEVEL_DEBUG, args) +#define BMI_WARN(args ...) BMI_LOG(QDF_TRACE_LEVEL_WARN, args) +#define BMI_INFO(args ...) BMI_LOG(QDF_TRACE_LEVEL_INFO, args) /* End of BMI Logging Wrappers */ /* BMI Assert Wrappers */ -#define bmi_assert CDF_BUG +#define bmi_assert QDF_BUG /* * Although we had envisioned BMI to run on top of HTC, this is not how the * final implementation ended up. On the Target side, BMI is a part of the BSP @@ -146,7 +146,7 @@ struct bmi_info { * struct ol_context - Structure to hold OL context * @bmi: BMI info * @cal_in_flash: For Firmware Flash Download - * @cdf_dev: CDF Device + * @cdf_dev: QDF Device * @scn: HIF Context * @ramdump_work: WorkQueue for Ramdump collection * @tgt_def: Target Defnition pointer @@ -167,26 +167,26 @@ struct ol_context { #define GET_BMI_CONTEXT(ol_ctx) ((struct bmi_info *)ol_ctx) -CDF_STATUS bmi_execute(uint32_t address, uint32_t *param, +QDF_STATUS bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx); -CDF_STATUS bmi_init(struct ol_context *ol_ctx); -CDF_STATUS bmi_no_command(struct ol_context *ol_ctx); -CDF_STATUS bmi_read_memory(uint32_t address, uint8_t *buffer, uint32_t length, +QDF_STATUS bmi_init(struct ol_context *ol_ctx); +QDF_STATUS bmi_no_command(struct ol_context *ol_ctx); +QDF_STATUS bmi_read_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx); -CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, +QDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx); -CDF_STATUS bmi_fast_download(uint32_t address, uint8_t *buffer, uint32_t length, +QDF_STATUS bmi_fast_download(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx); -CDF_STATUS bmi_read_soc_register(uint32_t address, +QDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, struct ol_context *ol_ctx); -CDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, +QDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, struct ol_context *ol_ctx); -CDF_STATUS bmi_get_target_info(struct bmi_target_info *targ_info, +QDF_STATUS bmi_get_target_info(struct bmi_target_info *targ_info, struct ol_context *ol_ctx); -CDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx); -CDF_STATUS bmi_done_local(struct ol_context *ol_ctx); -CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx); -CDF_STATUS ol_configure_target(struct ol_context *ol_ctx); +QDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx); +QDF_STATUS bmi_done_local(struct ol_context *ol_ctx); +QDF_STATUS ol_download_firmware(struct ol_context *ol_ctx); +QDF_STATUS ol_configure_target(struct ol_context *ol_ctx); void ramdump_work_handler(void *arg); struct ol_config_info *ol_get_ini_handle(struct ol_context *ol_ctx); #endif diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index 0b04d5169d..38b5674e1a 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -124,7 +124,7 @@ static int ol_check_fw_hash(const u8 *data, u32 fw_size, ATH_BIN_FILE file) digest, SHA256_DIGEST_SIZE); cdf_trace_hex_dump(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, hash, SHA256_DIGEST_SIZE); - ret = CDF_STATUS_E_FAILURE; + ret = QDF_STATUS_E_FAILURE; } #endif end: @@ -280,7 +280,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, if (!fw_entry || !fw_entry->data) { BMI_ERR("Invalid fw_entries"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } fw_entry_size = fw_entry->size; @@ -290,7 +290,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, if (ol_check_fw_hash(fw_entry->data, fw_entry_size, file)) { BMI_ERR("Hash Check failed for file:%s", filename); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto end; } #endif @@ -303,7 +303,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, if (!temp_eeprom) { BMI_ERR("%s: Memory allocation failed", __func__); release_firmware(fw_entry); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(temp_eeprom, (uint8_t *) fw_entry->data, @@ -363,7 +363,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, if (fw_entry_size < sizeof(SIGN_HEADER_T)) { BMI_ERR("Invalid binary size %d", fw_entry_size); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto end; } @@ -379,7 +379,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, sizeof(SIGN_HEADER_T), ol_ctx); if (status != EOK) { BMI_ERR("unable to start sign stream"); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto end; } @@ -449,7 +449,7 @@ end: if (status != EOK) { BMI_ERR("%s, BMI operation failed: %d", __func__, __LINE__); release_firmware(fw_entry); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } release_firmware(fw_entry); @@ -558,7 +558,7 @@ void ramdump_work_handler(void *data) hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_failure_state)), (uint8_t *)&host_interest_address, - sizeof(uint32_t)) != CDF_STATUS_SUCCESS) { + sizeof(uint32_t)) != QDF_STATUS_SUCCESS) { BMI_ERR("HifDiagReadiMem FW Dump Area Pointer failed!"); ol_copy_ramdump(ramdump_scn); cnss_device_crashed(); @@ -569,7 +569,7 @@ void ramdump_work_handler(void *data) if (hif_diag_read_mem(ramdump_scn, host_interest_address, (uint8_t *) &dram_dump_values[0], - 4 * sizeof(uint32_t)) != CDF_STATUS_SUCCESS) { + 4 * sizeof(uint32_t)) != QDF_STATUS_SUCCESS) { BMI_ERR("HifDiagReadiMem FW Dump Area failed!"); goto out_fail; } @@ -607,7 +607,7 @@ void ol_schedule_fw_indication_work(struct hif_opaque_softc *scn) } #endif -void ol_target_failure(void *instance, CDF_STATUS status) +void ol_target_failure(void *instance, QDF_STATUS status) { struct ol_context *ol_ctx = instance; struct hif_opaque_softc *scn = ol_ctx->scn; @@ -663,7 +663,7 @@ void ol_target_failure(void *instance, CDF_STATUS status) return; } -CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) +QDF_STATUS ol_configure_target(struct ol_context *ol_ctx) { uint32_t param; #ifdef CONFIG_CNSS @@ -680,18 +680,18 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_app_host_interest)), - (uint8_t *) ¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *) ¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("bmi_write_memory for htc version failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* set the firmware mode to STA/IBSS/AP */ { if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), - (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("bmi_read_memory for setting fwmode failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* TODO following parameters need to be re-visited. */ @@ -711,9 +711,9 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), - (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("BMI WRITE for setting fwmode failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } @@ -722,18 +722,18 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) /* set the firmware to disable CDC max perf WAR */ if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *) ¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *) ¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("BMI READ for setting cdc max perf failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } param |= HI_OPTION_DISABLE_CDC_MAX_PERF_WAR; if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("setting cdc max perf failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } #endif /* CONFIG_CDC_MAX_PERF_WAR */ @@ -747,19 +747,19 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) if (!ret && cap.cap_flag & CNSS_HAS_EXTERNAL_SWREG) { if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("bmi_read_memory for setting" "external SWREG failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } param |= HI_OPTION_USE_EXT_LDO; if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("BMI WRITE for setting external SWREG fail"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } #endif @@ -768,18 +768,18 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) if (ini_cfg->enable_lpass_support) { if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *) ¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *) ¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("BMI READ:Setting LPASS Support failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } param |= HI_OPTION_DBUART_SUPPORT; if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("BMI_READ for setting LPASS Support fail"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } #endif @@ -794,9 +794,9 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_be)), - (uint8_t *) ¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *) ¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("setting host CPU BE mode failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } @@ -805,12 +805,12 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_fw_swap)), - (uint8_t *) ¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *) ¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("BMI WRITE failed setting FW data/desc swap flags"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static int @@ -821,11 +821,11 @@ ol_check_dataset_patch(struct hif_opaque_softc *scn, uint32_t *address) } -CDF_STATUS ol_fw_populate_clk_settings(A_refclk_speed_t refclk, +QDF_STATUS ol_fw_populate_clk_settings(A_refclk_speed_t refclk, struct cmnos_clock_s *clock_s) { if (!clock_s) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; switch (refclk) { case SOC_REFCLK_48_MHZ: @@ -876,20 +876,20 @@ CDF_STATUS ol_fw_populate_clk_settings(A_refclk_speed_t refclk, clock_s->pll_settling_time = 1024; clock_s->refclk_hz = 0; default: - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } clock_s->refclk_hz = refclk_speed_to_hz[refclk]; clock_s->wlan_pll.refdiv = 0; clock_s->wlan_pll.outdiv = 1; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) +QDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) { struct hif_opaque_softc *hif = ol_ctx->scn; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t addr = 0; uint32_t reg_val = 0; uint32_t mem_val = 0; @@ -927,14 +927,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) addr = (RTC_SOC_BASE_ADDRESS | EFUSE_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read EFUSE Addr"); goto end; } status = ol_fw_populate_clk_settings(EFUSE_XTAL_SEL_GET(reg_val), &clock_s); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to set clock settings"); goto end; } @@ -944,7 +944,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; addr = (RTC_SOC_BASE_ADDRESS | BB_PLL_CONFIG_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read PLL_CONFIG Addr"); goto end; } @@ -954,14 +954,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val |= (BB_PLL_CONFIG_FRAC_SET(clock_s.wlan_pll.rnfrac) | BB_PLL_CONFIG_OUTDIV_SET(clock_s.wlan_pll.outdiv)); status = bmi_write_soc_register(addr, reg_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_CONFIG Addr"); goto end; } reg_val = 0; status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back PLL_CONFIG Addr"); goto end; } @@ -971,7 +971,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; addr = (RTC_WMAC_BASE_ADDRESS | WLAN_PLL_SETTLE_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read PLL_SETTLE Addr"); goto end; } @@ -980,14 +980,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val &= ~WLAN_PLL_SETTLE_TIME_MASK; reg_val |= WLAN_PLL_SETTLE_TIME_SET(clock_s.pll_settling_time); status = bmi_write_soc_register(addr, reg_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_SETTLE Addr"); goto end; } reg_val = 0; status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back PLL_SETTLE Addr"); goto end; } @@ -997,7 +997,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; addr = (RTC_SOC_BASE_ADDRESS | SOC_CORE_CLK_CTRL_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read CLK_CTRL Addr"); goto end; } @@ -1006,14 +1006,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val &= ~SOC_CORE_CLK_CTRL_DIV_MASK; reg_val |= SOC_CORE_CLK_CTRL_DIV_SET(1); status = bmi_write_soc_register(addr, reg_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write CLK_CTRL Addr"); goto end; } reg_val = 0; status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back CLK_CTRL Addr"); goto end; } @@ -1023,7 +1023,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) mem_val = 1; status = bmi_write_memory(cmnos_core_clk_div_addr, (uint8_t *) &mem_val, 4, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write CLK_DIV Addr"); goto end; } @@ -1032,7 +1032,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; addr = (RTC_WMAC_BASE_ADDRESS | WLAN_PLL_CONTROL_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read PLL_CTRL Addr"); goto end; } @@ -1044,14 +1044,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) WLAN_PLL_CONTROL_DIV_SET(clock_s.wlan_pll.div) | WLAN_PLL_CONTROL_NOPWD_SET(1)); status = bmi_write_soc_register(addr, reg_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_CTRL Addr"); goto end; } reg_val = 0; status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back PLL_CTRL Addr"); goto end; } @@ -1063,7 +1063,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; status = bmi_read_soc_register((RTC_WMAC_BASE_ADDRESS | RTC_SYNC_STATUS_OFFSET), ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read RTC_SYNC_STATUS Addr"); goto end; } @@ -1073,7 +1073,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; addr = (RTC_WMAC_BASE_ADDRESS | WLAN_PLL_CONTROL_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read PLL_CTRL Addr for CTRL_BYPASS"); goto end; } @@ -1082,14 +1082,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val &= ~WLAN_PLL_CONTROL_BYPASS_MASK; reg_val |= WLAN_PLL_CONTROL_BYPASS_SET(0); status = bmi_write_soc_register(addr, reg_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_CTRL Addr for CTRL_BYPASS"); goto end; } reg_val = 0; status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back PLL_CTRL Addr for CTRL_BYPASS"); goto end; } @@ -1100,7 +1100,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; status = bmi_read_soc_register((RTC_WMAC_BASE_ADDRESS | RTC_SYNC_STATUS_OFFSET), ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read SYNC_STATUS Addr"); goto end; } @@ -1110,7 +1110,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; addr = (RTC_SOC_BASE_ADDRESS | SOC_CPU_CLOCK_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read CPU_CLK Addr"); goto end; } @@ -1119,14 +1119,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val &= ~SOC_CPU_CLOCK_STANDARD_MASK; reg_val |= SOC_CPU_CLOCK_STANDARD_SET(1); status = bmi_write_soc_register(addr, reg_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write CPU_CLK Addr"); goto end; } reg_val = 0; status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back CPU_CLK Addr"); goto end; } @@ -1136,7 +1136,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; addr = (RTC_WMAC_BASE_ADDRESS | WLAN_PLL_CONTROL_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read PLL_CTRL Addr for NOPWD"); goto end; } @@ -1144,13 +1144,13 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val &= ~WLAN_PLL_CONTROL_NOPWD_MASK; status = bmi_write_soc_register(addr, reg_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_CTRL Addr for NOPWD"); goto end; } reg_val = 0; status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back PLL_CTRL Addr for NOPWD"); goto end; } @@ -1160,7 +1160,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) mem_val = 1; status = bmi_write_memory(cmnos_cpu_pll_init_done_addr, (uint8_t *) &mem_val, 4, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_INIT Addr"); goto end; } @@ -1168,7 +1168,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) mem_val = TARGET_CPU_FREQ; status = bmi_write_memory(cmnos_cpu_speed_addr, (uint8_t *) &mem_val, 4, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write CPU_SPEED Addr"); goto end; } @@ -1184,7 +1184,7 @@ end: void ol_transfer_codeswap_struct(struct ol_context *ol_ctx) { struct codeswap_codeseg_info wlan_codeswap; - CDF_STATUS rv; + QDF_STATUS rv; if (cnss_get_codeswap_struct(&wlan_codeswap)) { BMI_ERR("%s: failed to get codeswap structure", __func__); @@ -1195,7 +1195,7 @@ void ol_transfer_codeswap_struct(struct ol_context *ol_ctx) (uint8_t *) &wlan_codeswap, sizeof(wlan_codeswap), ol_ctx); - if (rv != CDF_STATUS_SUCCESS) { + if (rv != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to Write 0xa0000 to Target"); return; } @@ -1203,12 +1203,12 @@ void ol_transfer_codeswap_struct(struct ol_context *ol_ctx) } #endif -CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx) +QDF_STATUS ol_download_firmware(struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; uint32_t param, address = 0; int status = !EOK; - CDF_STATUS ret; + QDF_STATUS ret; struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); struct ol_config_info *ini_cfg = ol_get_ini_handle(ol_ctx); uint32_t target_type = tgt_info->target_type; @@ -1220,7 +1220,7 @@ CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx) target_type, target_version)) { BMI_ERR("%s: No FW files from CNSS driver", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #endif /* Transfer Board Data from Target EEPROM to Target RAM */ @@ -1237,7 +1237,7 @@ CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx) ret = ol_patch_pll_switch(ol_ctx); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { BMI_ERR("pll switch failed. status %d", ret); return ret; } diff --git a/core/cdf/inc/cdf_lock.h b/core/cdf/inc/cdf_lock.h index a477f9b586..cdc3ada531 100644 --- a/core/cdf/inc/cdf_lock.h +++ b/core/cdf/inc/cdf_lock.h @@ -39,7 +39,6 @@ */ /* Include Files */ -#include "cdf_status.h" #include "qdf_status.h" #include "i_cdf_lock.h" @@ -107,10 +106,10 @@ cdf_semaphore_release(cdf_device_t osdev, cdf_semaphore_t *m) * a failure. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_init(cdf_mutex_t *lock); +QDF_STATUS cdf_mutex_init(cdf_mutex_t *lock); /** * cdf_mutex_acquire () - acquire a CDF lock @@ -122,10 +121,10 @@ CDF_STATUS cdf_mutex_init(cdf_mutex_t *lock); * lock in the locked state with the calling thread as its owner. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock); +QDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock); /** * cdf_mutex_release() - release a CDF lock @@ -138,10 +137,10 @@ CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock); * initialized, an error is returned. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock); +QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock); /** * cdf_mutex_destroy() - destroy a CDF lock @@ -159,10 +158,10 @@ CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock); * been re-initialized. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock); +QDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock); /** * cdf_spinlock_init() - initialize a spinlock @@ -217,7 +216,7 @@ static inline void cdf_spin_unlock_bh(cdf_spinlock_t *lock) * CDF status success : if wake lock is initialized * CDF status fialure : if wake lock was not initialized */ -CDF_STATUS cdf_wake_lock_init(cdf_wake_lock_t *lock, const char *name); +QDF_STATUS cdf_wake_lock_init(cdf_wake_lock_t *lock, const char *name); /** * cdf_wake_lock_acquire() - acquires a wake lock @@ -228,7 +227,7 @@ CDF_STATUS cdf_wake_lock_init(cdf_wake_lock_t *lock, const char *name); * CDF status success : if wake lock is acquired * CDF status fialure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason); +QDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason); /** * cdf_wake_lock_timeout_acquire() - acquires a wake lock with a timeout @@ -239,7 +238,7 @@ CDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason); * CDF status success : if wake lock is acquired * CDF status fialure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, +QDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, uint32_t msec, uint32_t reason); /** @@ -251,7 +250,7 @@ CDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, * CDF status success : if wake lock is acquired * CDF status fialure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason); +QDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason); /** * cdf_wake_lock_destroy() - destroys a wake lock @@ -261,15 +260,15 @@ CDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason); * CDF status success : if wake lock is acquired * CDF status fialure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_destroy(cdf_wake_lock_t *pLock); +QDF_STATUS cdf_wake_lock_destroy(cdf_wake_lock_t *pLock); struct hif_pm_runtime_lock; typedef struct hif_pm_runtime_lock *cdf_runtime_lock_t; -CDF_STATUS cdf_runtime_pm_get(void); -CDF_STATUS cdf_runtime_pm_put(void); -CDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock); -CDF_STATUS cdf_runtime_pm_allow_suspend(cdf_runtime_lock_t lock); +QDF_STATUS cdf_runtime_pm_get(void); +QDF_STATUS cdf_runtime_pm_put(void); +QDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock); +QDF_STATUS cdf_runtime_pm_allow_suspend(cdf_runtime_lock_t lock); cdf_runtime_lock_t cdf_runtime_lock_init(const char *name); void cdf_runtime_lock_deinit(cdf_runtime_lock_t lock); @@ -281,7 +280,7 @@ void cdf_runtime_lock_deinit(cdf_runtime_lock_t lock); * CDF status success : if wake lock is acquired * CDF status fialure : if wake lock was not acquired */ -CDF_STATUS cdf_spinlock_acquire(cdf_spinlock_t *pLock); +QDF_STATUS cdf_spinlock_acquire(cdf_spinlock_t *pLock); /** * cdf_spinlock_release() - release a spin lock @@ -291,7 +290,7 @@ CDF_STATUS cdf_spinlock_acquire(cdf_spinlock_t *pLock); * CDF status success : if wake lock is acquired * CDF status fialure : if wake lock was not acquired */ -CDF_STATUS cdf_spinlock_release(cdf_spinlock_t *pLock); +QDF_STATUS cdf_spinlock_release(cdf_spinlock_t *pLock); #define cdf_spin_lock(_lock) __cdf_spin_lock(_lock) #define cdf_spin_unlock(_lock) __cdf_spin_unlock(_lock) diff --git a/core/cdf/inc/cdf_mc_timer.h b/core/cdf/inc/cdf_mc_timer.h index ff7a857fd1..67662966ef 100644 --- a/core/cdf/inc/cdf_mc_timer.h +++ b/core/cdf/inc/cdf_mc_timer.h @@ -36,7 +36,6 @@ /* Include Files */ #include -#include #include #include #include @@ -150,7 +149,7 @@ CDF_TIMER_STATE cdf_mc_timer_get_current_state(cdf_mc_timer_t *pTimer); * within the tx thread flow. * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ #ifdef TIMER_MANAGER @@ -158,13 +157,13 @@ CDF_TIMER_STATE cdf_mc_timer_get_current_state(cdf_mc_timer_t *pTimer); cdf_mc_timer_init_debug(timer, timerType, callback, userdata, \ __FILE__, __LINE__) -CDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, +QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, cdf_mc_timer_callback_t callback, void *userData, char *fileName, uint32_t lineNum); #else -CDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, +QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, cdf_mc_timer_callback_t callback, void *userData); #endif @@ -187,10 +186,10 @@ CDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, * been re-initialized. * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ -CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer); +QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer); /** * cdf_mc_timer_start() - start a CDF Timer object @@ -206,10 +205,10 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer); * or has been cancelled. * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ -CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime); +QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime); /** * cdf_mc_timer_stop() - stop a CDF Timer @@ -221,10 +220,10 @@ CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime); * was created and can be started again via a call to cdf_mc_timer_start(). * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ -CDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer); +QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer); /** * cdf_mc_timer_get_system_ticks() - get the system time in 10ms ticks diff --git a/core/cdf/inc/cdf_nbuf.h b/core/cdf/inc/cdf_nbuf.h index 4a5234783d..ac968498e0 100644 --- a/core/cdf/inc/cdf_nbuf.h +++ b/core/cdf/inc/cdf_nbuf.h @@ -95,7 +95,7 @@ typedef __cdf_nbuf_queue_t cdf_nbuf_queue_t; * * Return: Status of the operation */ -static inline CDF_STATUS +static inline QDF_STATUS cdf_nbuf_map(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) { return __cdf_nbuf_map(osdev, buf, dir); @@ -123,7 +123,7 @@ cdf_nbuf_unmap(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) * * Return: Status of the operation */ -static inline CDF_STATUS +static inline QDF_STATUS cdf_nbuf_map_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) { return __cdf_nbuf_map_single(osdev, buf, dir); @@ -448,7 +448,7 @@ static inline cdf_nbuf_t cdf_nbuf_copy(cdf_nbuf_t buf) * * Return: Status of the call - 0 successful */ -static inline CDF_STATUS cdf_nbuf_cat(cdf_nbuf_t dst, cdf_nbuf_t src) +static inline QDF_STATUS cdf_nbuf_cat(cdf_nbuf_t dst, cdf_nbuf_t src) { return __cdf_nbuf_cat(dst, src); } diff --git a/core/cdf/inc/cdf_status.h b/core/cdf/inc/cdf_status.h deleted file mode 100644 index 306209105b..0000000000 --- a/core/cdf/inc/cdf_status.h +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if !defined(__CDF_STATUS_H) -#define __CDF_STATUS_H - -#include -/** - * DOC: cdf_status - * - * Connectivity driver framework (CDF) status codes - * - * Basic status codes/definitions used by CDF - */ - -/** - * typedef CDF_STATUS - CDF error codes - * @CDF_STATUS_SUCCESS: success - * @CDF_STATUS_E_RESOURCES: system resource(other than memory) not available - * @CDF_STATUS_E_NOMEM: not enough memory - * @CDF_STATUS_E_AGAIN: try again - * @CDF_STATUS_E_INVAL: invalid request - * @CDF_STATUS_E_FAULT: system fault - * @CDF_STATUS_E_ALREADY: another request already in progress - * @CDF_STATUS_E_BADMSG: bad message - * @CDF_STATUS_E_BUSY: device or resource busy - * @CDF_STATUS_E_CANCELED: request cancelled - * @CDF_STATUS_E_ABORTED: request aborted - * @CDF_STATUS_E_NOSUPPORT: request not supported - * @CDF_STATUS_E_PERM: operation not permitted - * @CDF_STATUS_E_EMPTY: empty condition - * @CDF_STATUS_E_EXISTS: existence failure - * @CDF_STATUS_E_TIMEOUT: operation timeout - * @CDF_STATUS_E_FAILURE: unknown reason do not use unless nothign else applies - * @CDF_STATUS_NOT_INITIALIZED: resource not initialized - * @CDF_STATUS_E_NULL_VALUE: request is null - * @CDF_STATUS_PMC_PENDING: request pendign in pmc - * @CDF_STATUS_PMC_DISABLED: pmc is disabled - * @CDF_STATUS_PMC_NOT_NOW: pmc not ready now - * @CDF_STATUS_PMC_AC_POWER: pmc ac power - * @CDF_STATUS_PMC_SYS_ERROR: pmc system error - * @CDF_STATUS_HEARTBEAT_TMOUT: hearbeat timeout error - * @CDF_STATUS_NTH_BEACON_DELIVERY: Nth beacon delivery - * @CDF_STATUS_CSR_WRONG_STATE: csr in wrong state - * @CDF_STATUS_FT_PREAUTH_KEY_SUCCESS: ft preauth key success - * @CDF_STATUS_FT_PREAUTH_KEY_FAILED: ft preauth key failed - * @CDF_STATUS_CMD_NOT_QUEUED: command not queued - * @CDF_STATUS_FW_MSG_TIMEDOUT: target message timeout - * @CDF_STATUS_MAX: not a realy value just a place holder for max - */ -typedef enum { - CDF_STATUS_SUCCESS, - CDF_STATUS_E_RESOURCES, - CDF_STATUS_E_NOMEM, - CDF_STATUS_E_AGAIN, - CDF_STATUS_E_INVAL, - CDF_STATUS_E_FAULT, - CDF_STATUS_E_ALREADY, - CDF_STATUS_E_BADMSG, - CDF_STATUS_E_BUSY, - CDF_STATUS_E_CANCELED, - CDF_STATUS_E_ABORTED, - CDF_STATUS_E_NOSUPPORT, - CDF_STATUS_E_PERM, - CDF_STATUS_E_EMPTY, - CDF_STATUS_E_EXISTS, - CDF_STATUS_E_TIMEOUT, - CDF_STATUS_E_FAILURE, - CDF_STATUS_NOT_INITIALIZED, - CDF_STATUS_E_NULL_VALUE, - CDF_STATUS_PMC_PENDING, - CDF_STATUS_PMC_DISABLED, - CDF_STATUS_PMC_NOT_NOW, - CDF_STATUS_PMC_AC_POWER, - CDF_STATUS_PMC_SYS_ERROR, - CDF_STATUS_HEARTBEAT_TMOUT, - CDF_STATUS_NTH_BEACON_DELIVERY, - CDF_STATUS_CSR_WRONG_STATE, - CDF_STATUS_FT_PREAUTH_KEY_SUCCESS, - CDF_STATUS_FT_PREAUTH_KEY_FAILED, - CDF_STATUS_CMD_NOT_QUEUED, - CDF_STATUS_FW_MSG_TIMEDOUT, - CDF_STATUS_MAX -} CDF_STATUS; - -#define CDF_IS_STATUS_SUCCESS(status) (CDF_STATUS_SUCCESS == (status)) - -#endif /* if !defined __CDF_STATUS_H */ diff --git a/core/cdf/inc/cdf_trace.h b/core/cdf/inc/cdf_trace.h index fd0e41d44c..c32bb2e7d5 100644 --- a/core/cdf/inc/cdf_trace.h +++ b/core/cdf/inc/cdf_trace.h @@ -40,7 +40,6 @@ /* Include Files */ #include /* For CDF_MODULE_ID... */ #include /* For va_list... */ -#include #include #include #include @@ -265,7 +264,7 @@ bool cdf_trace_get_level(CDF_MODULE_ID module, CDF_TRACE_LEVEL level); typedef void (*tp_cdf_trace_cb)(void *pMac, tp_cdf_trace_record, uint16_t); void cdf_trace(uint8_t module, uint8_t code, uint16_t session, uint32_t data); void cdf_trace_register(CDF_MODULE_ID, tp_cdf_trace_cb); -CDF_STATUS cdf_trace_spin_lock_init(void); +QDF_STATUS cdf_trace_spin_lock_init(void); void cdf_trace_init(void); void cdf_trace_enable(uint32_t, uint8_t enable); void cdf_trace_dump_all(void *, uint8_t, uint8_t, uint32_t, uint32_t); diff --git a/core/cdf/inc/cdf_util.h b/core/cdf/inc/cdf_util.h index 537b1fd41b..4f44274b39 100644 --- a/core/cdf/inc/cdf_util.h +++ b/core/cdf/inc/cdf_util.h @@ -48,7 +48,7 @@ */ #define cdf_likely(_expr) __cdf_likely(_expr) -CDF_INLINE_FN int cdf_status_to_os_return(CDF_STATUS status) +CDF_INLINE_FN int cdf_status_to_os_return(QDF_STATUS status) { return __cdf_status_to_os_return(status); } diff --git a/core/cdf/src/cdf_lock.c b/core/cdf/src/cdf_lock.c index 94f7b6f19b..086360fd2b 100644 --- a/core/cdf/src/cdf_lock.c +++ b/core/cdf/src/cdf_lock.c @@ -82,29 +82,29 @@ enum { * a failure. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_init(cdf_mutex_t *lock) +QDF_STATUS cdf_mutex_init(cdf_mutex_t *lock) { /* check for invalid pointer */ if (lock == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* check for 'already initialized' lock */ if (LINUX_LOCK_COOKIE == lock->cookie) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: already initialized lock", __func__); - return CDF_STATUS_E_BUSY; + return QDF_STATUS_E_BUSY; } if (in_interrupt()) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* initialize new lock */ @@ -114,7 +114,7 @@ CDF_STATUS cdf_mutex_init(cdf_mutex_t *lock) lock->processID = 0; lock->refcount = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -127,10 +127,10 @@ CDF_STATUS cdf_mutex_init(cdf_mutex_t *lock) * lock in the locked state with the calling thread as its owner. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) +QDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) { int rc; /* check for invalid pointer */ @@ -138,14 +138,14 @@ CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* check if lock refers to an initialized object */ if (LINUX_LOCK_COOKIE != lock->cookie) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: uninitialized lock", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (in_interrupt()) { @@ -153,7 +153,7 @@ CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) "%s cannot be called from interrupt context!!!", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if ((lock->processID == current->pid) && (lock->state == LOCK_ACQUIRED)) { @@ -163,7 +163,7 @@ CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) "%s: %x %d %d", __func__, lock, current->pid, lock->refcount); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* acquire a Lock */ mutex_lock(&lock->m_lock); @@ -172,7 +172,7 @@ CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: unable to lock mutex (rc = %d)", __func__, rc); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #ifdef CDF_NESTED_LOCK_DEBUG CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, @@ -182,14 +182,14 @@ CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) lock->processID = current->pid; lock->refcount++; lock->state = LOCK_ACQUIRED; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else { /* lock is already destroyed */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Lock is already destroyed", __func__); mutex_unlock(&lock->m_lock); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } @@ -204,17 +204,17 @@ CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) * initialized, an error is returned. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) +QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) { /* check for invalid pointer */ if (lock == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* check if lock refers to an uninitialized object */ @@ -222,7 +222,7 @@ CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: uninitialized lock", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (in_interrupt()) { @@ -230,7 +230,7 @@ CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) "%s cannot be called from interrupt context!!!", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* CurrentThread = GetCurrentThreadId(); @@ -247,7 +247,7 @@ CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) __func__, lock->processID, current->pid); #endif CDF_ASSERT(0); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if ((lock->processID == current->pid) && (lock->state == LOCK_ACQUIRED)) { @@ -260,7 +260,7 @@ CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) lock->refcount); #endif if (lock->refcount) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; lock->processID = 0; lock->refcount = 0; @@ -272,7 +272,7 @@ CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) "%s: Freeing lock %x %d %d", lock, lock->processID, lock->refcount); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -291,36 +291,36 @@ CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) * been re-initialized. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock) +QDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock) { /* check for invalid pointer */ if (NULL == lock) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (LINUX_LOCK_COOKIE != lock->cookie) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: uninitialized lock", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (in_interrupt()) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* check if lock is released */ if (!mutex_trylock(&lock->m_lock)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: lock is not released", __func__); - return CDF_STATUS_E_BUSY; + return QDF_STATUS_E_BUSY; } lock->cookie = 0; lock->state = LOCK_DESTROYED; @@ -329,7 +329,7 @@ CDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock) mutex_unlock(&lock->m_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -340,10 +340,10 @@ CDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock) * CDF status success : if wake lock is acquired * CDF status failure : if wake lock was not acquired */ -CDF_STATUS cdf_spinlock_acquire(cdf_spinlock_t *pLock) +QDF_STATUS cdf_spinlock_acquire(cdf_spinlock_t *pLock) { spin_lock(&pLock->spinlock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -354,10 +354,10 @@ CDF_STATUS cdf_spinlock_acquire(cdf_spinlock_t *pLock) * CDF status success : if wake lock is acquired * CDF status failure : if wake lock was not acquired */ -CDF_STATUS cdf_spinlock_release(cdf_spinlock_t *pLock) +QDF_STATUS cdf_spinlock_release(cdf_spinlock_t *pLock) { spin_unlock(&pLock->spinlock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -390,14 +390,14 @@ static const char *cdf_wake_lock_name(cdf_wake_lock_t *pLock) * CDF status success : if wake lock is initialized * CDF status failure : if wake lock was not initialized */ -CDF_STATUS cdf_wake_lock_init(cdf_wake_lock_t *pLock, const char *name) +QDF_STATUS cdf_wake_lock_init(cdf_wake_lock_t *pLock, const char *name) { #if defined CONFIG_CNSS cnss_pm_wake_lock_init(pLock, name); #elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) wake_lock_init(pLock, WAKE_LOCK_SUSPEND, name); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -409,7 +409,7 @@ CDF_STATUS cdf_wake_lock_init(cdf_wake_lock_t *pLock, const char *name) * CDF status success : if wake lock is acquired * CDF status failure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason) +QDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason) { host_diag_log_wlock(reason, cdf_wake_lock_name(pLock), WIFI_POWER_EVENT_DEFAULT_WAKELOCK_TIMEOUT, @@ -419,7 +419,7 @@ CDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason) #elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) wake_lock(pLock); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -431,7 +431,7 @@ CDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason) * CDF status success : if wake lock is acquired * CDF status failure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, uint32_t msec, +QDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, uint32_t msec, uint32_t reason) { /* Wakelock for Rx is frequent. @@ -448,7 +448,7 @@ CDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, uint32_t msec, #elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) wake_lock_timeout(pLock, msecs_to_jiffies(msec)); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -460,7 +460,7 @@ CDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, uint32_t msec, * CDF status success : if wake lock is acquired * CDF status failure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason) +QDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason) { host_diag_log_wlock(reason, cdf_wake_lock_name(pLock), WIFI_POWER_EVENT_DEFAULT_WAKELOCK_TIMEOUT, @@ -470,7 +470,7 @@ CDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason) #elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) wake_unlock(pLock); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -481,14 +481,14 @@ CDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason) * CDF status success : if wake lock is acquired * CDF status failure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_destroy(cdf_wake_lock_t *pLock) +QDF_STATUS cdf_wake_lock_destroy(cdf_wake_lock_t *pLock) { #if defined CONFIG_CNSS cnss_pm_wake_lock_destroy(pLock); #elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) wake_lock_destroy(pLock); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -504,7 +504,7 @@ CDF_STATUS cdf_wake_lock_destroy(cdf_wake_lock_t *pLock) * return: success if the bus is up and a get has been issued * otherwise an error code. */ -CDF_STATUS cdf_runtime_pm_get(void) +QDF_STATUS cdf_runtime_pm_get(void) { void *ol_sc; int ret; @@ -515,15 +515,15 @@ CDF_STATUS cdf_runtime_pm_get(void) CDF_ASSERT(0); CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: HIF context is null!", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } ret = hif_pm_runtime_get(ol_sc); if (ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -534,9 +534,9 @@ CDF_STATUS cdf_runtime_pm_get(void) * * This api will return a failure if the hif module hasn't been initialized * - * return: CDF_STATUS_SUCCESS if the put is performed + * return: QDF_STATUS_SUCCESS if the put is performed */ -CDF_STATUS cdf_runtime_pm_put(void) +QDF_STATUS cdf_runtime_pm_put(void) { void *ol_sc; int ret; @@ -547,15 +547,15 @@ CDF_STATUS cdf_runtime_pm_put(void) CDF_ASSERT(0); CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: HIF context is null!", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } ret = hif_pm_runtime_put(ol_sc); if (ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -564,9 +564,9 @@ CDF_STATUS cdf_runtime_pm_put(void) * * The lock can only be acquired once per lock context and is tracked. * - * return: CDF_STATUS_SUCCESS or failure code. + * return: QDF_STATUS_SUCCESS or failure code. */ -CDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock) +QDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock) { void *ol_sc; int ret; @@ -577,15 +577,15 @@ CDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock) CDF_ASSERT(0); CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: HIF context is null!", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } ret = hif_pm_runtime_prevent_suspend(ol_sc, lock); if (ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -594,9 +594,9 @@ CDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock) * * The lock can only be acquired once per lock context and is tracked. * - * return: CDF_STATUS_SUCCESS or failure code. + * return: QDF_STATUS_SUCCESS or failure code. */ -CDF_STATUS cdf_runtime_pm_allow_suspend(cdf_runtime_lock_t lock) +QDF_STATUS cdf_runtime_pm_allow_suspend(cdf_runtime_lock_t lock) { void *ol_sc; int ret; @@ -607,15 +607,15 @@ CDF_STATUS cdf_runtime_pm_allow_suspend(cdf_runtime_lock_t lock) CDF_ASSERT(0); CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: HIF context is null!", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } ret = hif_pm_runtime_allow_suspend(ol_sc, lock); if (ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cdf/src/cdf_mc_timer.c b/core/cdf/src/cdf_mc_timer.c index 7911cef513..74997544a0 100644 --- a/core/cdf/src/cdf_mc_timer.c +++ b/core/cdf/src/cdf_mc_timer.c @@ -96,7 +96,7 @@ static void cdf_linux_timer_callback(unsigned long data) { cdf_mc_timer_t *timer = (cdf_mc_timer_t *) data; cds_msg_t msg; - CDF_STATUS vStatus; + QDF_STATUS vStatus; unsigned long flags; cdf_mc_timer_callback_t callback = NULL; @@ -122,15 +122,15 @@ static void cdf_linux_timer_callback(unsigned long data) * not been updated this is a rare race condition! */ timer->state = CDF_TIMER_STATE_STOPPED; - vStatus = CDF_STATUS_E_ALREADY; + vStatus = QDF_STATUS_E_ALREADY; break; case CDF_TIMER_STATE_STOPPED: - vStatus = CDF_STATUS_E_ALREADY; + vStatus = QDF_STATUS_E_ALREADY; break; case CDF_TIMER_STATE_UNUSED: - vStatus = CDF_STATUS_E_EXISTS; + vStatus = QDF_STATUS_E_EXISTS; break; case CDF_TIMER_STATE_RUNNING: @@ -146,18 +146,18 @@ static void cdf_linux_timer_callback(unsigned long data) userData = timer->userData; threadId = timer->platformInfo.threadID; type = timer->type; - vStatus = CDF_STATUS_SUCCESS; + vStatus = QDF_STATUS_SUCCESS; break; default: CDF_ASSERT(0); - vStatus = CDF_STATUS_E_FAULT; + vStatus = QDF_STATUS_E_FAULT; break; } spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - if (CDF_STATUS_SUCCESS != vStatus) { + if (QDF_STATUS_SUCCESS != vStatus) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "TIMER callback called in a wrong state=%d", timer->state); @@ -182,7 +182,7 @@ static void cdf_linux_timer_callback(unsigned long data) msg.bodyptr = userData; msg.bodyval = 0; - if (cds_mq_post_message(CDS_MQ_ID_SYS, &msg) == CDF_STATUS_SUCCESS) + if (cds_mq_post_message(CDS_MQ_ID_SYS, &msg) == QDF_STATUS_SUCCESS) return; CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, @@ -335,11 +335,11 @@ void cdf_mc_timer_exit(void) * within the tx thread flow. * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ #ifdef TIMER_MANAGER -CDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, +QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, cdf_mc_timer_callback_t callback, void *userData, char *fileName, @@ -352,7 +352,7 @@ CDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } timer->ptimerNode = cdf_mem_malloc(sizeof(cdf_mc_timer_node_t)); @@ -362,7 +362,7 @@ CDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, "%s: Not able to allocate memory for timeNode", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(timer->ptimerNode, sizeof(cdf_mc_timer_node_t), 0); @@ -377,7 +377,7 @@ CDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, cdf_spin_unlock_irqrestore(&cdf_timer_list_lock); if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: Unable to insert node into List cdf_status %d", + "%s: Unable to insert node into List qdf_status %d", __func__, qdf_status); } @@ -398,10 +398,10 @@ CDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, timer->platformInfo.threadID = 0; timer->state = CDF_TIMER_STATE_STOPPED; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #else -CDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, +QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, cdf_mc_timer_callback_t callback, void *userData) { @@ -410,7 +410,7 @@ CDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* set the various members of the timer structure @@ -430,7 +430,7 @@ CDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, timer->platformInfo.threadID = 0; timer->state = CDF_TIMER_STATE_STOPPED; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -452,11 +452,11 @@ CDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, * been re-initialized. * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ #ifdef TIMER_MANAGER -CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) +QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) { QDF_STATUS status = QDF_STATUS_SUCCESS; unsigned long flags; @@ -466,7 +466,7 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Null timer pointer being passed", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* Check if timer refers to an uninitialized object */ @@ -474,7 +474,7 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Cannot destroy uninitialized timer", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } cdf_spin_lock_irqsave(&cdf_timer_list_lock); @@ -550,12 +550,12 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) * been re-initialized. * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ -CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) +QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) { - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; unsigned long flags; /* check for invalid pointer */ @@ -563,7 +563,7 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Null timer pointer being passed", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* check if timer refers to an uninitialized object */ @@ -571,36 +571,36 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Cannot destroy uninitialized timer", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } spin_lock_irqsave(&timer->platformInfo.spinlock, flags); switch (timer->state) { case CDF_TIMER_STATE_STARTING: - vStatus = CDF_STATUS_E_BUSY; + vStatus = QDF_STATUS_E_BUSY; break; case CDF_TIMER_STATE_RUNNING: /* Stop the timer first */ del_timer(&(timer->platformInfo.Timer)); - vStatus = CDF_STATUS_SUCCESS; + vStatus = QDF_STATUS_SUCCESS; break; case CDF_TIMER_STATE_STOPPED: - vStatus = CDF_STATUS_SUCCESS; + vStatus = QDF_STATUS_SUCCESS; break; case CDF_TIMER_STATE_UNUSED: - vStatus = CDF_STATUS_E_ALREADY; + vStatus = QDF_STATUS_E_ALREADY; break; default: - vStatus = CDF_STATUS_E_FAULT; + vStatus = QDF_STATUS_E_FAULT; break; } - if (CDF_STATUS_SUCCESS == vStatus) { + if (QDF_STATUS_SUCCESS == vStatus) { timer->platformInfo.cookie = LINUX_INVALID_TIMER_COOKIE; timer->state = CDF_TIMER_STATE_UNUSED; spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); @@ -632,10 +632,10 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) * or has been cancelled. * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ -CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) +QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) { unsigned long flags; @@ -647,7 +647,7 @@ CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s Null timer pointer being passed", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* check if timer refers to an uninitialized object */ @@ -656,7 +656,7 @@ CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) "%s: Cannot start uninitialized timer", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* check if timer has expiration time less than 10 ms */ @@ -665,7 +665,7 @@ CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) "%s: Cannot start a timer with expiration less than 10 ms", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* make sure the remainer of the logic isn't interrupted */ @@ -677,7 +677,7 @@ CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Cannot start timer in state = %d ", __func__, timer->state); - return CDF_STATUS_E_ALREADY; + return QDF_STATUS_E_ALREADY; } /* start the timer */ @@ -701,7 +701,7 @@ CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -714,10 +714,10 @@ CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) * was created and can be started again via a call to cdf_mc_timer_start(). * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ -CDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) +QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) { unsigned long flags; @@ -729,7 +729,7 @@ CDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s Null timer pointer being passed", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* check if timer refers to an uninitialized object */ @@ -738,7 +738,7 @@ CDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) "%s: Cannot stop uninitialized timer", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* ensure the timer state is correct */ @@ -749,7 +749,7 @@ CDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Cannot stop timer in state = %d", __func__, timer->state); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } timer->state = CDF_TIMER_STATE_STOPPED; @@ -760,7 +760,7 @@ CDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) try_allowing_sleep(timer->type); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cdf/src/cdf_memory.c b/core/cdf/src/cdf_memory.c index 97a3e7039e..de708861a1 100644 --- a/core/cdf/src/cdf_memory.c +++ b/core/cdf/src/cdf_memory.c @@ -307,7 +307,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum) cdf_spin_unlock_irqrestore(&cdf_mem_list_lock); if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: Unable to insert node into List cdf_status %d", + "%s: Unable to insert node into List qdf_status %d", __func__, qdf_status); } diff --git a/core/cdf/src/cdf_nbuf.c b/core/cdf/src/cdf_nbuf.c index b663fa0323..80fe56dbed 100644 --- a/core/cdf/src/cdf_nbuf.c +++ b/core/cdf/src/cdf_nbuf.c @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include /* Packet Counter */ @@ -230,9 +230,9 @@ void __cdf_nbuf_free(struct sk_buff *skb) * @skb: Pointer to network buffer * @dir: Direction * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS +QDF_STATUS __cdf_nbuf_map(cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir) { #ifdef CDF_OS_DEBUG @@ -252,7 +252,7 @@ __cdf_nbuf_map(cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir) return __cdf_nbuf_map_single(osdev, skb, dir); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -284,9 +284,9 @@ __cdf_nbuf_unmap(cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir) * @skb: Pointer to network buffer * @dir: Direction * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS +QDF_STATUS __cdf_nbuf_map_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) { cdf_dma_addr_t paddr; @@ -294,15 +294,15 @@ __cdf_nbuf_map_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) /* tempory hack for simulation */ #ifdef A_SIMOS_DEVHOST NBUF_CB_PADDR(buf) = paddr = buf->data; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; #else /* assume that the OS only provides a single fragment */ NBUF_CB_PADDR(buf) = paddr = dma_map_single(osdev->dev, buf->data, skb_end_pointer(buf) - buf->data, dir); return dma_mapping_error(osdev->dev, paddr) - ? CDF_STATUS_E_FAILURE - : CDF_STATUS_SUCCESS; + ? QDF_STATUS_E_FAILURE + : QDF_STATUS_SUCCESS; #endif /* #ifdef A_SIMOS_DEVHOST */ } @@ -328,9 +328,9 @@ __cdf_nbuf_unmap_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) * @skb: Pointer to network buffer * @cksum: Pointer to checksum value * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS +QDF_STATUS __cdf_nbuf_set_rx_cksum(struct sk_buff *skb, cdf_nbuf_rx_cksum_t *cksum) { switch (cksum->l4_result) { @@ -347,9 +347,9 @@ __cdf_nbuf_set_rx_cksum(struct sk_buff *skb, cdf_nbuf_rx_cksum_t *cksum) default: pr_err("ADF_NET:Unknown checksum type\n"); cdf_assert(0); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cdf/src/cdf_trace.c b/core/cdf/src/cdf_trace.c index 5cef1f6ec9..1d1cba9eea 100644 --- a/core/cdf/src/cdf_trace.c +++ b/core/cdf/src/cdf_trace.c @@ -554,11 +554,11 @@ void cdf_trace(uint8_t module, uint8_t code, uint16_t session, uint32_t data) * * Return : nothing */ -CDF_STATUS cdf_trace_spin_lock_init(void) +QDF_STATUS cdf_trace_spin_lock_init(void) { spin_lock_init(<race_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cdf/src/i_cdf_atomic.h b/core/cdf/src/i_cdf_atomic.h index 9a0f89b095..e3c1a91f45 100644 --- a/core/cdf/src/i_cdf_atomic.h +++ b/core/cdf/src/i_cdf_atomic.h @@ -27,18 +27,17 @@ #ifndef I_CDF_ATOMIC_H #define I_CDF_ATOMIC_H -#include /* CDF_STATUS */ #include /* QDF_STATUS */ #include typedef atomic_t __cdf_atomic_t; -static inline CDF_STATUS __cdf_atomic_init(__cdf_atomic_t *v) +static inline QDF_STATUS __cdf_atomic_init(__cdf_atomic_t *v) { atomic_set(v, 0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static inline int32_t __cdf_atomic_read(__cdf_atomic_t *v) diff --git a/core/cdf/src/i_cdf_defer.h b/core/cdf/src/i_cdf_defer.h index 11bc076421..0e3f02fc0b 100644 --- a/core/cdf/src/i_cdf_defer.h +++ b/core/cdf/src/i_cdf_defer.h @@ -35,7 +35,6 @@ #include #endif #include -#include #include #include @@ -52,7 +51,7 @@ typedef struct { extern void __cdf_defer_func(struct work_struct *work); -static inline CDF_STATUS +static inline QDF_STATUS __cdf_init_work(__cdf_work_t *work, cdf_defer_fn_t func, void *arg) { /*Initilize func and argument in work struct */ @@ -63,38 +62,38 @@ __cdf_init_work(__cdf_work_t *work, cdf_defer_fn_t func, void *arg) #else INIT_WORK(&work->work, __cdf_defer_func); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS __cdf_schedule_work(__cdf_work_t *work) +static inline QDF_STATUS __cdf_schedule_work(__cdf_work_t *work) { schedule_work(&work->work); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS __cdf_init_bh(cdf_handle_t hdl, +static inline QDF_STATUS __cdf_init_bh(cdf_handle_t hdl, struct tasklet_struct *bh, cdf_defer_fn_t func, void *arg) { tasklet_init(bh, (__cdf_bh_fn_t) func, (unsigned long)arg); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS +static inline QDF_STATUS __cdf_sched_bh(cdf_handle_t hdl, struct tasklet_struct *bh) { tasklet_schedule(bh); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS +static inline QDF_STATUS __cdf_disable_bh(cdf_handle_t hdl, struct tasklet_struct *bh) { tasklet_kill(bh); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /*_I_CDF_DEFER_H*/ diff --git a/core/cdf/src/i_cdf_lock.h b/core/cdf/src/i_cdf_lock.h index 634728db05..438b50aa5f 100644 --- a/core/cdf/src/i_cdf_lock.h +++ b/core/cdf/src/i_cdf_lock.h @@ -101,12 +101,12 @@ typedef int cdf_wake_lock_t; * __cdf_semaphore_init() - initialize the semaphore * @m: Semaphore object * - * Return: CDF_STATUS_SUCCESS + * Return: QDF_STATUS_SUCCESS */ -static inline CDF_STATUS __cdf_semaphore_init(struct semaphore *m) +static inline QDF_STATUS __cdf_semaphore_init(struct semaphore *m) { sema_init(m, 1); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -138,14 +138,14 @@ __cdf_semaphore_release(cdf_device_t osdev, struct semaphore *m) * __cdf_spinlock_init() - initialize spin lock * @lock: Spin lock object * - * Return: CDF_STATUS_SUCCESS + * Return: QDF_STATUS_SUCCESS */ -static inline CDF_STATUS __cdf_spinlock_init(__cdf_spinlock_t *lock) +static inline QDF_STATUS __cdf_spinlock_init(__cdf_spinlock_t *lock) { spin_lock_init(&lock->spinlock); lock->flags = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #define __cdf_spinlock_destroy(lock) diff --git a/core/cdf/src/i_cdf_nbuf.h b/core/cdf/src/i_cdf_nbuf.h index ec61229440..fc45827af1 100644 --- a/core/cdf/src/i_cdf_nbuf.h +++ b/core/cdf/src/i_cdf_nbuf.h @@ -38,7 +38,7 @@ #include #include #include -#include +#include /* * Use socket buffer as the underlying implentation as skbuf . @@ -334,11 +334,11 @@ typedef void (*cdf_nbuf_trace_update_t)(char *); __cdf_nbuf_t __cdf_nbuf_alloc(__cdf_device_t osdev, size_t size, int reserve, int align, int prio); void __cdf_nbuf_free(struct sk_buff *skb); -CDF_STATUS __cdf_nbuf_map(__cdf_device_t osdev, +QDF_STATUS __cdf_nbuf_map(__cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir); void __cdf_nbuf_unmap(__cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir); -CDF_STATUS __cdf_nbuf_map_single(__cdf_device_t osdev, +QDF_STATUS __cdf_nbuf_map_single(__cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir); void __cdf_nbuf_unmap_single(__cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir); @@ -356,16 +356,16 @@ void __cdf_nbuf_trace_update(struct sk_buff *buf, char *event_string); * * Return: CDF status */ -static inline CDF_STATUS __cdf_os_to_status(signed int error) +static inline QDF_STATUS __cdf_os_to_status(signed int error) { switch (error) { case 0: - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case ENOMEM: case -ENOMEM: - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; default: - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } } @@ -397,13 +397,13 @@ static inline size_t __cdf_nbuf_len(struct sk_buff *skb) * Link tow nbufs the new buf is piggybacked into the older one. The older * (src) skb is released. * - * Return: CDF_STATUS (status of the call) if failed the src skb + * Return: QDF_STATUS (status of the call) if failed the src skb * is released */ -static inline CDF_STATUS +static inline QDF_STATUS __cdf_nbuf_cat(struct sk_buff *dst, struct sk_buff *src) { - CDF_STATUS error = 0; + QDF_STATUS error = 0; cdf_assert(dst && src); @@ -520,7 +520,7 @@ static inline void __cdf_nbuf_trim_tail(struct sk_buff *skb, size_t size) * prototypes. Implemented in cdf_nbuf.c */ cdf_nbuf_tx_cksum_t __cdf_nbuf_get_tx_cksum(struct sk_buff *skb); -CDF_STATUS __cdf_nbuf_set_rx_cksum(struct sk_buff *skb, +QDF_STATUS __cdf_nbuf_set_rx_cksum(struct sk_buff *skb, cdf_nbuf_rx_cksum_t *cksum); uint8_t __cdf_nbuf_get_tid(struct sk_buff *skb); void __cdf_nbuf_set_tid(struct sk_buff *skb, uint8_t tid); @@ -927,10 +927,10 @@ typedef struct __cdf_nbuf_qhead { * * Return: CDF status */ -static inline CDF_STATUS __cdf_nbuf_queue_init(__cdf_nbuf_queue_t *qhead) +static inline QDF_STATUS __cdf_nbuf_queue_init(__cdf_nbuf_queue_t *qhead) { memset(qhead, 0, sizeof(struct __cdf_nbuf_qhead)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cdf/src/i_cdf_softirq_timer.h b/core/cdf/src/i_cdf_softirq_timer.h index 31cbd68e59..14cc9fcd18 100644 --- a/core/cdf/src/i_cdf_softirq_timer.h +++ b/core/cdf/src/i_cdf_softirq_timer.h @@ -56,7 +56,7 @@ typedef void (*cdf_dummy_timer_func_t)(unsigned long arg); * * Return: none */ -static inline CDF_STATUS +static inline QDF_STATUS __cdf_softirq_timer_init(cdf_handle_t hdl, struct timer_list *timer, cdf_softirq_timer_func_t func, void *arg, @@ -69,7 +69,7 @@ __cdf_softirq_timer_init(cdf_handle_t hdl, timer->function = (cdf_dummy_timer_func_t) func; timer->data = (unsigned long)arg; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -79,13 +79,13 @@ __cdf_softirq_timer_init(cdf_handle_t hdl, * * Return: none */ -static inline CDF_STATUS +static inline QDF_STATUS __cdf_softirq_timer_start(struct timer_list *timer, uint32_t delay) { timer->expires = jiffies + msecs_to_jiffies(delay); add_timer(timer); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -95,12 +95,12 @@ __cdf_softirq_timer_start(struct timer_list *timer, uint32_t delay) * * Return: none */ -static inline CDF_STATUS +static inline QDF_STATUS __cdf_softirq_timer_mod(struct timer_list *timer, uint32_t delay) { mod_timer(timer, jiffies + msecs_to_jiffies(delay)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cdf/src/i_cdf_util.h b/core/cdf/src/i_cdf_util.h index 68977de5dc..bd34f4a512 100644 --- a/core/cdf/src/i_cdf_util.h +++ b/core/cdf/src/i_cdf_util.h @@ -36,7 +36,6 @@ #include #include -#include #include #include /* @@ -47,36 +46,36 @@ #define __cdf_likely(_expr) likely(_expr) /** - * cdf_status_to_os_return(): translates cdf_status types to linux return types + * cdf_status_to_os_return(): translates qdf_status types to linux return types * @status: status to translate * * Translates error types that linux may want to handle specially. * - * return: 0 or the linux error code that most closely matches the CDF_STATUS. + * return: 0 or the linux error code that most closely matches the QDF_STATUS. * defaults to -1 (EPERM) */ -static inline int __cdf_status_to_os_return(CDF_STATUS status) +static inline int __cdf_status_to_os_return(QDF_STATUS status) { switch (status) { - case CDF_STATUS_SUCCESS: + case QDF_STATUS_SUCCESS: return 0; - case CDF_STATUS_E_NULL_VALUE: - case CDF_STATUS_E_FAULT: + case QDF_STATUS_E_NULL_VALUE: + case QDF_STATUS_E_FAULT: return -EFAULT; - case CDF_STATUS_E_TIMEOUT: - case CDF_STATUS_E_BUSY: + case QDF_STATUS_E_TIMEOUT: + case QDF_STATUS_E_BUSY: return -EBUSY; - case CDF_STATUS_NOT_INITIALIZED: - case CDF_STATUS_E_AGAIN: + case QDF_STATUS_NOT_INITIALIZED: + case QDF_STATUS_E_AGAIN: return -EAGAIN; - case CDF_STATUS_E_NOSUPPORT: + case QDF_STATUS_E_NOSUPPORT: return -ENOSYS; - case CDF_STATUS_E_ALREADY: + case QDF_STATUS_E_ALREADY: return -EALREADY; - case CDF_STATUS_E_NOMEM: + case QDF_STATUS_E_NOMEM: return -ENOMEM; - case CDF_STATUS_E_FAILURE: - case CDF_STATUS_E_INVAL: + case QDF_STATUS_E_FAILURE: + case QDF_STATUS_E_INVAL: return -EINVAL; default: return -EPERM; diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index 07c3117acc..cf8ffb72f0 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -35,7 +35,6 @@ */ #include -#include #include #include #include @@ -186,17 +185,17 @@ static inline void cds_set_unload_in_progress(uint8_t value) v_CONTEXT_t cds_init(void); void cds_deinit(void); -CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context); +QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context); -CDF_STATUS cds_open(void); +QDF_STATUS cds_open(void); -CDF_STATUS cds_enable(v_CONTEXT_t cds_context); +QDF_STATUS cds_enable(v_CONTEXT_t cds_context); -CDF_STATUS cds_disable(v_CONTEXT_t cds_context); +QDF_STATUS cds_disable(v_CONTEXT_t cds_context); -CDF_STATUS cds_close(v_CONTEXT_t cds_context); +QDF_STATUS cds_close(v_CONTEXT_t cds_context); -CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context); +QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context); void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper); @@ -204,15 +203,15 @@ void *cds_get_context(CDF_MODULE_ID moduleId); v_CONTEXT_t cds_get_global_context(void); -CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, +QDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, void **ppModuleContext, uint32_t size); -CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, +QDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, void *pModuleContext); -CDF_STATUS cds_set_context(CDF_MODULE_ID moduleID, void *context); +QDF_STATUS cds_set_context(CDF_MODULE_ID moduleID, void *context); -CDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, +QDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, uint32_t *subType); void cds_flush_work(void *work); @@ -230,7 +229,7 @@ void cds_set_ring_log_level(uint32_t ring_id, uint32_t log_level); enum wifi_driver_log_level cds_get_ring_log_level(uint32_t ring_id); void cds_set_multicast_logging(uint8_t value); uint8_t cds_is_multicast_logging(void); -CDF_STATUS cds_set_log_completion(uint32_t is_fatal, +QDF_STATUS cds_set_log_completion(uint32_t is_fatal, uint32_t type, uint32_t sub_type); void cds_get_log_completion(uint32_t *is_fatal, @@ -239,7 +238,7 @@ void cds_get_log_completion(uint32_t *is_fatal, bool cds_is_log_report_in_progress(void); void cds_init_log_completion(void); void cds_deinit_log_completion(void); -CDF_STATUS cds_flush_logs(uint32_t is_fatal, +QDF_STATUS cds_flush_logs(uint32_t is_fatal, uint32_t indicator, uint32_t reason_code); void cds_logging_set_fw_flush_complete(void); diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index 7ac1a0736f..33ec1a8c78 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -477,7 +477,7 @@ int cds_cfg80211_get_concurrency_matrix(struct wiphy *wiphy, const void *data, int data_len); uint32_t cds_get_concurrency_mode(void); -CDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result, +QDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result, hdd_station_ctx_t *hdd_sta_ctx); void cds_handle_conc_rule1(hdd_adapter_t *adapter, tCsrRoamProfile *roam_profile); @@ -494,9 +494,9 @@ static inline bool cds_handle_conc_rule2(hdd_adapter_t *adapter, } #endif /* FEATURE_WLAN_CH_AVOID */ uint8_t cds_search_and_check_for_session_conc(uint8_t session_id, - tCsrRoamProfile * roam_profile); + tCsrRoamProfile *roam_profile); bool cds_check_for_session_conc(uint8_t session_id, uint8_t channel); -CDF_STATUS cds_handle_conc_multiport(uint8_t session_id, uint8_t channel); +QDF_STATUS cds_handle_conc_multiport(uint8_t session_id, uint8_t channel); #ifdef FEATURE_WLAN_FORCE_SAP_SCC void cds_force_sap_on_scc(eCsrRoamResult roam_result, @@ -525,7 +525,7 @@ uint8_t cds_is_mcc_in_24G(void); int32_t cds_set_mas(hdd_adapter_t *adapter, uint8_t mas_value); int cds_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapter, uint32_t set_value); -CDF_STATUS cds_change_mcc_go_beacon_interval(hdd_adapter_t *pHostapdAdapter); +QDF_STATUS cds_change_mcc_go_beacon_interval(hdd_adapter_t *pHostapdAdapter); int cds_go_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapter, uint32_t set_value); void cds_set_mcc_latency(hdd_adapter_t *adapter, int set_value); @@ -555,32 +555,32 @@ void cds_decr_active_session(enum tCDF_ADAPTER_MODE mode, uint8_t sessionId); void cds_decr_session_set_pcl(enum tCDF_ADAPTER_MODE mode, uint8_t session_id); -CDF_STATUS cds_init_policy_mgr(void); -CDF_STATUS cds_deinit_policy_mgr(void); -CDF_STATUS cds_get_pcl(enum cds_con_mode mode, +QDF_STATUS cds_init_policy_mgr(void); +QDF_STATUS cds_deinit_policy_mgr(void); +QDF_STATUS cds_get_pcl(enum cds_con_mode mode, uint8_t *pcl_Channels, uint32_t *len); bool cds_allow_concurrency(enum cds_con_mode mode, uint8_t channel, enum hw_mode_bandwidth bw); enum cds_conc_priority_mode cds_get_first_connection_pcl_table_index(void); enum cds_one_connection_mode cds_get_second_connection_pcl_table_index(void); enum cds_two_connection_mode cds_get_third_connection_pcl_table_index(void); -CDF_STATUS cds_incr_connection_count(uint32_t vdev_id); -CDF_STATUS cds_update_connection_info(uint32_t vdev_id); -CDF_STATUS cds_decr_connection_count(uint32_t vdev_id); -CDF_STATUS cds_current_connections_update(uint32_t session_id, +QDF_STATUS cds_incr_connection_count(uint32_t vdev_id); +QDF_STATUS cds_update_connection_info(uint32_t vdev_id); +QDF_STATUS cds_decr_connection_count(uint32_t vdev_id); +QDF_STATUS cds_current_connections_update(uint32_t session_id, uint8_t channel, enum cds_conn_update_reason); bool cds_is_ibss_conn_exist(uint8_t *ibss_channel); #ifdef MPC_UT_FRAMEWORK -CDF_STATUS cds_incr_connection_count_utfw( +QDF_STATUS cds_incr_connection_count_utfw( uint32_t vdev_id, uint32_t tx_streams, uint32_t rx_streams, uint32_t chain_mask, uint32_t type, uint32_t sub_type, uint32_t channelid, uint32_t mac_id); -CDF_STATUS cds_update_connection_info_utfw( +QDF_STATUS cds_update_connection_info_utfw( uint32_t vdev_id, uint32_t tx_streams, uint32_t rx_streams, uint32_t chain_mask, uint32_t type, uint32_t sub_type, uint32_t channelid, uint32_t mac_id); -CDF_STATUS cds_decr_connection_count_utfw( +QDF_STATUS cds_decr_connection_count_utfw( uint32_t del_all, uint32_t vdev_id); struct cds_conc_connection_info *cds_get_conn_info(uint32_t *len); enum cds_pcl_type get_pcl_from_first_conn_table(enum cds_con_mode type, @@ -592,24 +592,24 @@ enum cds_pcl_type get_pcl_from_third_conn_table( enum cds_two_connection_mode idx, enum cds_con_mode type, enum cds_conc_priority_mode sys_pref, uint8_t dbs_capable); #else -static inline CDF_STATUS cds_incr_connection_count_utfw(uint32_t vdev_id, +static inline QDF_STATUS cds_incr_connection_count_utfw(uint32_t vdev_id, uint32_t tx_streams, uint32_t rx_streams, uint32_t chain_mask, uint32_t type, uint32_t sub_type, uint32_t channelid, uint32_t mac_id) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS cds_update_connection_info_utfw(uint32_t vdev_id, +static inline QDF_STATUS cds_update_connection_info_utfw(uint32_t vdev_id, uint32_t tx_streams, uint32_t rx_streams, uint32_t chain_mask, uint32_t type, uint32_t sub_type, uint32_t channelid, uint32_t mac_id) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all, +static inline QDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all, uint32_t vdev_id) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static inline struct cds_conc_connection_info *cds_get_conn_info(uint32_t *len) { @@ -618,7 +618,7 @@ static inline struct cds_conc_connection_info *cds_get_conn_info(uint32_t *len) #endif enum cds_con_mode cds_convert_device_mode_to_hdd_type( device_mode_t device_mode); -CDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, +QDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, enum hw_mode_ss_config mac0_ss, enum hw_mode_bandwidth mac0_bw, enum hw_mode_ss_config mac1_ss, @@ -627,7 +627,7 @@ CDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, enum hw_mode_agile_dfs_capab dfs, enum cds_conn_update_reason reason); enum cds_conc_next_action cds_need_opportunistic_upgrade(void); -CDF_STATUS cds_next_actions(uint32_t session_id, +QDF_STATUS cds_next_actions(uint32_t session_id, enum cds_conc_next_action action, enum cds_conn_update_reason reason); void cds_set_dual_mac_scan_config(uint8_t dbs_val, @@ -640,7 +640,7 @@ void cds_soc_set_dual_mac_cfg_cb(enum set_hw_mode_status status, uint32_t fw_mode_config); bool cds_map_concurrency_mode(enum tCDF_ADAPTER_MODE *old_mode, enum cds_con_mode *new_mode); -CDF_STATUS cds_get_channel_from_scan_result(hdd_adapter_t *adapter, +QDF_STATUS cds_get_channel_from_scan_result(hdd_adapter_t *adapter, tCsrRoamProfile *roam_profile, uint8_t *channel); enum tCDF_GLOBAL_CON_MODE cds_get_conparam(void); @@ -650,8 +650,8 @@ void cds_clear_concurrent_session_count(void); bool cds_is_multiple_active_sta_sessions(void); bool cds_is_sta_active_connection_exists(void); bool cds_concurrent_beaconing_sessions_running(void); -CDF_STATUS cdf_wait_for_connection_update(void); -CDF_STATUS cdf_reset_connection_update(void); -CDF_STATUS cdf_set_connection_update(void); -CDF_STATUS cdf_init_connection_update(void); +QDF_STATUS cdf_wait_for_connection_update(void); +QDF_STATUS cdf_reset_connection_update(void); +QDF_STATUS cdf_set_connection_update(void); +QDF_STATUS cdf_init_connection_update(void); #endif /* __CDS_CONCURRENCY_H */ diff --git a/core/cds/inc/cds_crypto.h b/core/cds/inc/cds_crypto.h index 7da595d099..8848c56dd3 100644 --- a/core/cds/inc/cds_crypto.h +++ b/core/cds/inc/cds_crypto.h @@ -35,7 +35,6 @@ */ #include -#include #include #include #include diff --git a/core/cds/inc/cds_mq.h b/core/cds/inc/cds_mq.h index 74b396d94a..c8ab965bff 100644 --- a/core/cds/inc/cds_mq.h +++ b/core/cds/inc/cds_mq.h @@ -42,7 +42,6 @@ Include Files ------------------------------------------------------------------------*/ #include -#include #include /*-------------------------------------------------------------------------- @@ -129,21 +128,21 @@ typedef enum { message needs anything in this message, it needs to copy the contents before returning from the message queue handler. - \return CDF_STATUS_SUCCESS - the message has been successfully posted + \return QDF_STATUS_SUCCESS - the message has been successfully posted to the message queue. - CDF_STATUS_E_INVAL - The value specified by msgQueueId does not + QDF_STATUS_E_INVAL - The value specified by msgQueueId does not refer to a valid Message Queue Id. - CDF_STATUS_E_FAULT - message is an invalid pointer. + QDF_STATUS_E_FAULT - message is an invalid pointer. - CDF_STATUS_E_FAILURE - the message queue handler has reported + QDF_STATUS_E_FAILURE - the message queue handler has reported an unknown failure. \sa --------------------------------------------------------------------------*/ -CDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *message); +QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *message); /**--------------------------------------------------------------------------- @@ -152,15 +151,15 @@ CDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *message); \param pBuf is a buffer allocated by caller. The actual structure varies base on message type - \return CDF_STATUS_SUCCESS - the message has been successfully posted + \return QDF_STATUS_SUCCESS - the message has been successfully posted to the message queue. - CDF_STATUS_E_FAILURE - the message queue handler has reported + QDF_STATUS_E_FAILURE - the message queue handler has reported an unknown failure. \sa --------------------------------------------------------------------------*/ -CDF_STATUS cds_send_mb_message_to_mac(void *pBuf); +QDF_STATUS cds_send_mb_message_to_mac(void *pBuf); #endif /* if !defined __CDS_MQ_H */ diff --git a/core/cds/inc/cds_packet.h b/core/cds/inc/cds_packet.h index 14940f3a0d..87dce8ddd3 100644 --- a/core/cds/inc/cds_packet.h +++ b/core/cds/inc/cds_packet.h @@ -42,7 +42,6 @@ Include Files ------------------------------------------------------------------------*/ #include -#include #include /*-------------------------------------------------------------------------- @@ -119,13 +118,13 @@ static inline void cds_pkt_proto_trace_close(void) {} * cds_pkt_return_packet Free the cds Packet * @ cds Packet */ -CDF_STATUS cds_pkt_return_packet(cds_pkt_t *packet); +QDF_STATUS cds_pkt_return_packet(cds_pkt_t *packet); /** * cds_pkt_get_packet_length Returns the packet length * @ cds Packet */ -CDF_STATUS cds_pkt_get_packet_length(cds_pkt_t *pPacket, +QDF_STATUS cds_pkt_get_packet_length(cds_pkt_t *pPacket, uint16_t *pPacketSize); /* @@ -175,15 +174,15 @@ typedef enum { #define cds_packet_alloc(s, d, p) \ cds_packet_alloc_debug(s, d, p, __FILE__, __LINE__) -CDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, +QDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, uint8_t *file_name, uint32_t line_num); #else -CDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket); +QDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket); #endif void cds_packet_free(void *pPacket); -typedef CDF_STATUS (*cds_pkt_get_packet_callback)(cds_pkt_t *pPacket, +typedef QDF_STATUS (*cds_pkt_get_packet_callback)(cds_pkt_t *pPacket, void *userData); #endif /* !defined( __CDS_PKT_H ) */ diff --git a/core/cds/inc/cds_reg_service.h b/core/cds/inc/cds_reg_service.h index 5bc32ea79c..e9b9e93d72 100644 --- a/core/cds/inc/cds_reg_service.h +++ b/core/cds/inc/cds_reg_service.h @@ -36,7 +36,7 @@ ========================================================================*/ -#include "cdf_status.h" +#include "qdf_status.h" #define CDS_COUNTRY_CODE_LEN 2 #define CDS_MAC_ADDRESS_LEN 6 @@ -318,26 +318,26 @@ enum channel_width { extern struct regulatory_channel reg_channels[NUM_RF_CHANNELS]; extern const struct chan_map chan_mapping[NUM_RF_CHANNELS]; -CDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *pRegDomain, +QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *pRegDomain, const uint8_t *country_alpha2, enum country_src source); -CDF_STATUS cds_read_default_country(uint8_t *default_country); +QDF_STATUS cds_read_default_country(uint8_t *default_country); -CDF_STATUS cds_get_channel_list_with_power(struct channel_power +QDF_STATUS cds_get_channel_list_with_power(struct channel_power *base_channels, uint8_t *num_base_channels, struct channel_power *channel_40mhz, uint8_t *num_channels_40mhz); -CDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain); +QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain); enum channel_state cds_get_channel_state(uint32_t chan_num); -CDF_STATUS cds_regulatory_init(void); -CDF_STATUS cds_get_dfs_region(uint8_t *dfs_region); -CDF_STATUS cds_set_dfs_region(uint8_t dfs_region); +QDF_STATUS cds_regulatory_init(void); +QDF_STATUS cds_get_dfs_region(uint8_t *dfs_region); +QDF_STATUS cds_set_dfs_region(uint8_t dfs_region); bool cds_is_dsrc_channel(uint16_t); enum channel_state cds_get_bonded_channel_state(uint32_t chan_num, enum channel_width chan_width); diff --git a/core/cds/inc/cds_sched.h b/core/cds/inc/cds_sched.h index 8186e50e91..f08115adcc 100644 --- a/core/cds/inc/cds_sched.h +++ b/core/cds/inc/cds_sched.h @@ -374,24 +374,24 @@ void cds_free_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext); \param p_cds_sched_context - pointer to a previously allocated buffer big enough to hold a scheduler context. - \return CDF_STATUS_SUCCESS - Scheduler was successfully initialized and + \return QDF_STATUS_SUCCESS - Scheduler was successfully initialized and is ready to be used. - CDF_STATUS_E_RESOURCES - System resources (other than memory) + QDF_STATUS_E_RESOURCES - System resources (other than memory) are unavailable to initilize the scheduler - CDF_STATUS_E_NOMEM - insufficient memory exists to initialize + QDF_STATUS_E_NOMEM - insufficient memory exists to initialize the scheduler - CDF_STATUS_E_INVAL - Invalid parameter passed to the scheduler Open + QDF_STATUS_E_INVAL - Invalid parameter passed to the scheduler Open function - CDF_STATUS_E_FAILURE - Failure to initialize the scheduler/ + QDF_STATUS_E_FAILURE - Failure to initialize the scheduler/ \sa cds_sched_open() -------------------------------------------------------------------------*/ -CDF_STATUS cds_sched_open(void *p_cds_context, +QDF_STATUS cds_sched_open(void *p_cds_context, p_cds_sched_context pSchedCxt, uint32_t SchedCtxSize); /*--------------------------------------------------------------------------- @@ -409,27 +409,27 @@ CDF_STATUS cds_sched_open(void *p_cds_context, \param p_cds_context - pointer to the global CDF Context - \return CDF_STATUS_SUCCESS - Scheduler was successfully initialized and + \return QDF_STATUS_SUCCESS - Scheduler was successfully initialized and is ready to be used. - CDF_STATUS_E_INVAL - Invalid parameter passed to the scheduler Open + QDF_STATUS_E_INVAL - Invalid parameter passed to the scheduler Open function - CDF_STATUS_E_FAILURE - Failure to initialize the scheduler/ + QDF_STATUS_E_FAILURE - Failure to initialize the scheduler/ \sa cds_sched_close() ---------------------------------------------------------------------------*/ -CDF_STATUS cds_sched_close(void *p_cds_context); +QDF_STATUS cds_sched_close(void *p_cds_context); /* Helper routines provided to other CDS API's */ -CDF_STATUS cds_mq_init(p_cds_mq_type pMq); +QDF_STATUS cds_mq_init(p_cds_mq_type pMq); void cds_mq_deinit(p_cds_mq_type pMq); void cds_mq_put(p_cds_mq_type pMq, p_cds_msg_wrapper pMsgWrapper); p_cds_msg_wrapper cds_mq_get(p_cds_mq_type pMq); bool cds_is_mq_empty(p_cds_mq_type pMq); p_cds_sched_context get_cds_sched_ctxt(void); -CDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext); +QDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext); void cds_sched_deinit_mqs(p_cds_sched_context pSchedContext); void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext); diff --git a/core/cds/inc/cds_utils.h b/core/cds/inc/cds_utils.h index 3604b754c8..24d8b5af4e 100644 --- a/core/cds/inc/cds_utils.h +++ b/core/cds/inc/cds_utils.h @@ -42,7 +42,6 @@ Include Files ------------------------------------------------------------------------*/ #include -#include #include #include #include "ani_global.h" @@ -90,9 +89,9 @@ Function declarations and documenation ------------------------------------------------------------------------*/ -CDF_STATUS cds_crypto_init(uint32_t *phCryptProv); +QDF_STATUS cds_crypto_init(uint32_t *phCryptProv); -CDF_STATUS cds_crypto_deinit(uint32_t hCryptProv); +QDF_STATUS cds_crypto_deinit(uint32_t hCryptProv); /** * cds_rand_get_bytes @@ -105,9 +104,9 @@ CDF_STATUS cds_crypto_deinit(uint32_t hCryptProv); * @param numBytes the number of bytes that should be generated and * copied * - * @return CDF_STATUS_SUCCSS if the operation succeeds + * @return QDF_STATUS_SUCCSS if the operation succeeds */ -CDF_STATUS cds_rand_get_bytes(uint32_t handle, uint8_t *pbBuf, +QDF_STATUS cds_rand_get_bytes(uint32_t handle, uint8_t *pbBuf, uint32_t numBytes); /** @@ -129,10 +128,10 @@ CDF_STATUS cds_rand_get_bytes(uint32_t handle, uint8_t *pbBuf, * @param keyLen length of key * @param digest holds resultant SHA1 HMAC (20B) * - * @return CDF_STATUS_SUCCSS if the operation succeeds + * @return QDF_STATUS_SUCCSS if the operation succeeds * */ -CDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ uint8_t *text, /* pointer to data stream */ uint32_t textLen, /* length of data stream */ uint8_t *key, /* pointer to authentication key */ @@ -158,21 +157,21 @@ CDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ * @param keyLen length of key * @param digest holds resultant MD5 HMAC (16B) * - * @return CDF_STATUS_SUCCSS if the operation succeeds + * @return QDF_STATUS_SUCCSS if the operation succeeds * */ -CDF_STATUS cds_md5_hmac_str(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_md5_hmac_str(uint32_t cryptHandle, /* Handle */ uint8_t *text, /* pointer to data stream */ uint32_t textLen, /* length of data stream */ uint8_t *key, /* pointer to authentication key */ uint32_t keyLen, /* length of authentication key */ uint8_t digest[CDS_DIGEST_MD5_SIZE]); /* caller digest to be filled in */ -CDF_STATUS cds_encrypt_aes(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle, /* Handle */ uint8_t *pText, /* pointer to data stream */ uint8_t *Encrypted, uint8_t *pKey); /* pointer to authentication key */ -CDF_STATUS cds_decrypt_aes(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle, /* Handle */ uint8_t *pText, /* pointer to data stream */ uint8_t *pDecrypted, uint8_t *pKey); /* pointer to authentication key */ @@ -186,5 +185,5 @@ bool cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, uint8_t *frm, uint8_t *efrm, uint16_t frmLen); uint8_t cds_get_mmie_size(void); #endif /* WLAN_FEATURE_11W */ -CDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal pMac); +QDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal pMac); #endif /* #if !defined __CDS_UTILS_H */ diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 9d1165720d..7b49adf451 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -164,9 +164,9 @@ static void cds_set_nan_enable(tMacOpenParameters *param, * * Return: CDF status */ -CDF_STATUS cds_open(void) +QDF_STATUS cds_open(void) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int iter = 0; tSirRetStatus sirStatus = eSIR_SUCCESS; tMacOpenParameters mac_openParms; @@ -184,7 +184,7 @@ CDF_STATUS cds_open(void) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Trying to open CDS without a PreOpen", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Initialize the timer module */ @@ -198,7 +198,7 @@ CDF_STATUS cds_open(void) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Unable to init probeEvent", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (qdf_event_create(&(gp_cds_context->wmaCompleteEvent)) != QDF_STATUS_SUCCESS) { @@ -209,8 +209,8 @@ CDF_STATUS cds_open(void) } /* Initialize the free message queue */ - cdf_status = cds_mq_init(&gp_cds_context->freeVosMq); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_init(&gp_cds_context->freeVosMq); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to initialize CDS free message queue", @@ -228,10 +228,10 @@ CDF_STATUS cds_open(void) } /* Now Open the CDS Scheduler */ - cdf_status = cds_sched_open(gp_cds_context, &gp_cds_context->cdf_sched, + qdf_status = cds_sched_open(gp_cds_context, &gp_cds_context->cdf_sched, sizeof(cds_sched_context)); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open CDS Scheduler", __func__); @@ -259,10 +259,10 @@ CDF_STATUS cds_open(void) ol_ctx = cds_get_context(CDF_MODULE_ID_BMI); /* Initialize BMI and Download firmware */ - cdf_status = bmi_download_firmware(ol_ctx); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = bmi_download_firmware(ol_ctx); + if (qdf_status != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, - "BMI FIALED status:%d", cdf_status); + "BMI FIALED status:%d", qdf_status); goto err_bmi_close; } @@ -367,11 +367,11 @@ CDF_STATUS cds_open(void) mac_openParms.self_gen_frm_pwr = pHddCtx->config->self_gen_frm_pwr; mac_openParms.maxStation = pHddCtx->config->maxNumberOfPeers; - cdf_status = wma_open(gp_cds_context, + qdf_status = wma_open(gp_cds_context, hdd_update_tgt_cfg, hdd_dfs_indicate_radar, &mac_openParms); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open WMA module", __func__); @@ -417,8 +417,8 @@ CDF_STATUS cds_open(void) } /* Now proceed to open the SME */ - cdf_status = sme_open(gp_cds_context->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = sme_open(gp_cds_context->pMACContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open SME", __func__); @@ -441,7 +441,7 @@ CDF_STATUS cds_open(void) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS successfully Opened", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; err_sme_close: sme_close(gp_cds_context->pMACContext); @@ -475,7 +475,7 @@ err_wma_complete_event: err_probe_event: qdf_event_destroy(&gp_cds_context->ProbeEvent); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* cds_open() */ /** @@ -484,9 +484,9 @@ err_probe_event: * * Return: CDF status */ -CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) +QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; void *scn; @@ -496,40 +496,40 @@ CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Context mismatch", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (p_cds_context->pMACContext == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: MAC NULL context", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (p_cds_context->pWMAContext == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: WMA NULL context", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } scn = cds_get_context(CDF_MODULE_ID_HIF); if (!scn) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: scn is null!", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Reset wma wait event */ qdf_event_reset(&gp_cds_context->wmaCompleteEvent); /*call WMA pre start */ - cdf_status = wma_pre_start(gp_cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_pre_start(gp_cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, "Failed to WMA prestart"); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Need to update time out of complete */ @@ -551,24 +551,24 @@ CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) wlan_sys_probe(); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - cdf_status = htc_start(gp_cds_context->htc_ctx); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = htc_start(gp_cds_context->htc_ctx); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, "Failed to Start HTC"); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - cdf_status = wma_wait_for_ready_event(gp_cds_context->pWMAContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_wait_for_ready_event(gp_cds_context->pWMAContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "Failed to get ready event from target firmware"); htc_set_target_to_sleep(scn); htc_stop(gp_cds_context->htc_ctx); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (ol_txrx_pdev_attach(gp_cds_context->pdev_txrx_ctx)) { @@ -577,12 +577,12 @@ CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) htc_set_target_to_sleep(scn); htc_stop(gp_cds_context->htc_ctx); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } htc_set_target_to_sleep(scn); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -591,9 +591,9 @@ CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) * * Return: CDF status */ -CDF_STATUS cds_enable(v_CONTEXT_t cds_context) +QDF_STATUS cds_enable(v_CONTEXT_t cds_context) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tSirRetStatus sirStatus = eSIR_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; @@ -606,7 +606,7 @@ CDF_STATUS cds_enable(v_CONTEXT_t cds_context) if (gp_cds_context != p_cds_context) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: mismatch in context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if ((p_cds_context->pWMAContext == NULL) || @@ -618,15 +618,15 @@ CDF_STATUS cds_enable(v_CONTEXT_t cds_context) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: MAC NULL context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Start the wma */ - cdf_status = wma_start(p_cds_context); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_start(p_cds_context); + if (qdf_status != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to start wma", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, "%s: wma correctly started", __func__); @@ -649,9 +649,9 @@ CDF_STATUS cds_enable(v_CONTEXT_t cds_context) "%s: MAC correctly started", __func__); /* START SME */ - cdf_status = sme_start(p_cds_context->pMACContext); + qdf_status = sme_start(p_cds_context->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to start SME", __func__); goto err_mac_stop; @@ -672,7 +672,7 @@ CDF_STATUS cds_enable(v_CONTEXT_t cds_context) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, "%s: CDS Start is successful!!", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; err_sme_stop: sme_stop(p_cds_context->pMACContext, HAL_STOP_TYPE_SYS_RESET); @@ -682,11 +682,11 @@ err_mac_stop: err_wma_stop: qdf_event_reset(&(gp_cds_context->wmaCompleteEvent)); - cdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to stop wma", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); wma_setneedshutdown(cds_context); } else { qdf_status = @@ -709,7 +709,7 @@ err_wma_stop: } } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* cds_enable() */ /** @@ -718,9 +718,9 @@ err_wma_stop: * * Return: CDF status */ -CDF_STATUS cds_disable(v_CONTEXT_t cds_context) +QDF_STATUS cds_disable(v_CONTEXT_t cds_context) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; /* wma_stop is called before the SYS so that the processing of target * pending responses will not be handled during uninitialization of @@ -728,12 +728,12 @@ CDF_STATUS cds_disable(v_CONTEXT_t cds_context) */ qdf_event_reset(&(gp_cds_context->wmaCompleteEvent)); - cdf_status = wma_stop(cds_context, HAL_STOP_TYPE_RF_KILL); + qdf_status = wma_stop(cds_context, HAL_STOP_TYPE_RF_KILL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to stop wma", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); wma_setneedshutdown(cds_context); } @@ -741,14 +741,14 @@ CDF_STATUS cds_disable(v_CONTEXT_t cds_context) hif_reset_soc(((cds_context_type *) cds_context)->pHIFContext); /* SYS STOP will stop SME and MAC */ - cdf_status = sys_stop(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = sys_stop(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to stop SYS", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -757,13 +757,13 @@ CDF_STATUS cds_disable(v_CONTEXT_t cds_context) * * Return: CDF status */ -CDF_STATUS cds_close(v_CONTEXT_t cds_context) +QDF_STATUS cds_close(v_CONTEXT_t cds_context) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; QDF_STATUS qdf_status; - cdf_status = wma_wmi_work_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_wmi_work_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_work", __func__); CDF_ASSERT(0); @@ -779,18 +779,18 @@ CDF_STATUS cds_close(v_CONTEXT_t cds_context) cds_free_context(cds_context, CDF_MODULE_ID_TXRX, gp_cds_context->pdev_txrx_ctx); - cdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close SME", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } - cdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close MAC", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } ((p_cds_contextType) cds_context)->pMACContext = NULL; @@ -799,19 +799,19 @@ CDF_STATUS cds_close(v_CONTEXT_t cds_context) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to shutdown wma", __func__); } else { - cdf_status = wma_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } } - cdf_status = wma_wmi_service_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_wmi_service_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_service", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } cds_mq_deinit(&((p_cds_contextType) cds_context)->freeVosMq); @@ -834,7 +834,7 @@ CDF_STATUS cds_close(v_CONTEXT_t cds_context) gp_cds_context->pHDDContext = NULL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1033,7 +1033,7 @@ void cds_clear_driver_state(enum cds_driver_state state) * @moduleId: module ID who's context area is being allocated. * @ppModuleContext: pointer to location where the pointer to the * allocated context is returned. Note this output pointer - * is valid only if the API returns CDF_STATUS_SUCCESS + * is valid only if the API returns QDF_STATUS_SUCCESS * @param size: size of the context area to be allocated. * * This API allows any user to allocate a user context area within the @@ -1041,7 +1041,7 @@ void cds_clear_driver_state(enum cds_driver_state state) * * Return: CDF status */ -CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, +QDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, void **ppModuleContext, uint32_t size) { void **pGpModContext = NULL; @@ -1049,14 +1049,14 @@ CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, if (p_cds_context == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is null", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if ((gp_cds_context != p_cds_context) || (ppModuleContext == NULL)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: context mismatch or null param passed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } switch (moduleID) { @@ -1090,7 +1090,7 @@ CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, "does not have its context allocated by CDS", __func__, moduleID); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } } @@ -1101,7 +1101,7 @@ CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i context has already been allocated", __func__, moduleID); - return CDF_STATUS_E_EXISTS; + return QDF_STATUS_E_EXISTS; } /* Dynamically allocate the context for module */ @@ -1113,7 +1113,7 @@ CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, "%s: Failed to " "allocate Context for module ID %i", __func__, moduleID); CDF_ASSERT(0); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } if (moduleID == CDF_MODULE_ID_TLSHIM) @@ -1121,7 +1121,7 @@ CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, *pGpModContext = *ppModuleContext; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* cds_alloc_context() */ /** @@ -1131,16 +1131,16 @@ CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, * * API to set a MODULE Context in gloabl CDS Context * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_set_context(CDF_MODULE_ID module_id, void *context) +QDF_STATUS cds_set_context(CDF_MODULE_ID module_id, void *context) { p_cds_contextType p_cds_context = cds_get_global_context(); if (!p_cds_context) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "cds context is Invald"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } switch (module_id) { @@ -1152,10 +1152,10 @@ CDF_STATUS cds_set_context(CDF_MODULE_ID module_id, void *context) "%s: Module ID %i does not have its context " "allocated by CDS", __func__, module_id); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1170,7 +1170,7 @@ CDF_STATUS cds_set_context(CDF_MODULE_ID module_id, void *context) * * Return: CDF status */ -CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, +QDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, void *pModuleContext) { void **pGpModContext = NULL; @@ -1179,7 +1179,7 @@ CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, (pModuleContext == NULL)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Null params or context mismatch", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } switch (moduleID) { @@ -1219,7 +1219,7 @@ CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, "does not have its context allocated by CDS", __func__, moduleID); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } } @@ -1229,13 +1229,13 @@ CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, "%s: Module ID %i " "context has not been allocated or freed already", __func__, moduleID); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (*pGpModContext != pModuleContext) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: pGpModContext != pModuleContext", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pModuleContext != NULL) @@ -1243,7 +1243,7 @@ CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, *pGpModContext = NULL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* cds_free_context() */ /** @@ -1258,7 +1258,7 @@ CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, * * Return: CDF status */ -CDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) +QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) { p_cds_mq_type pTargetMq = NULL; p_cds_msg_wrapper pMsgWrapper = NULL; @@ -1269,7 +1269,7 @@ CDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) "%s: Null params or global cds context is null", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } switch (msgQueueId) { @@ -1306,14 +1306,14 @@ CDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) ("%s: Trying to queue msg into unknown MC Msg queue ID %d"), __func__, msgQueueId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_ASSERT(NULL != pTargetMq); if (pTargetMq == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: pTargetMq == NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Try and get a free Msg wrapper */ @@ -1329,7 +1329,7 @@ CDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) if (CDS_WRAPPER_MAX_FAIL_COUNT == debug_count) CDF_BUG(0); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } atomic_set(&cds_wrapper_empty_count, 0); @@ -1343,7 +1343,7 @@ CDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) set_bit(MC_POST_EVENT_MASK, &gp_cds_context->cdf_sched.mcEventFlag); wake_up_interruptible(&gp_cds_context->cdf_sched.mcWaitQueue); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* cds_mq_post_message() */ /** @@ -1430,9 +1430,9 @@ void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper) * * Return: CDF status */ -CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) +QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; QDF_STATUS qdf_status; tpAniSirGlobal pmac = (((p_cds_contextType)cds_context)->pMACContext); @@ -1440,11 +1440,11 @@ CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) cds_free_context(cds_context, CDF_MODULE_ID_TXRX, gp_cds_context->pdev_txrx_ctx); - cdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close SME", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } /* * CAC timer will be initiated and started only when SAP starts on @@ -1458,27 +1458,27 @@ CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) cdf_mc_timer_destroy(&pmac->sap.SapDfsInfo.sap_dfs_cac_timer); } - cdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close MAC", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } ((p_cds_contextType) cds_context)->pMACContext = NULL; if (false == wma_needshutdown(cds_context)) { - cdf_status = wma_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma!", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } } - cdf_status = wma_wmi_work_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_wmi_work_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_work!", __func__); CDF_ASSERT(0); @@ -1490,11 +1490,11 @@ CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) gp_cds_context->htc_ctx = NULL; } - cdf_status = wma_wmi_service_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_wmi_service_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_service!", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } cds_mq_deinit(&((p_cds_contextType) cds_context)->freeVosMq); @@ -1513,7 +1513,7 @@ CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1524,10 +1524,10 @@ CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) * * Return: WMI vdev type */ -CDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, +QDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, uint32_t *sub_type) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; *type = 0; *sub_type = 0; @@ -1556,7 +1556,7 @@ CDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, default: CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "Invalid device mode %d", mode); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; break; } return status; @@ -1891,7 +1891,7 @@ void cds_deinit_log_completion(void) * * Return: 0 if setting of params is successful */ -CDF_STATUS cds_set_log_completion(uint32_t is_fatal, +QDF_STATUS cds_set_log_completion(uint32_t is_fatal, uint32_t indicator, uint32_t reason_code) { @@ -1901,7 +1901,7 @@ CDF_STATUS cds_set_log_completion(uint32_t is_fatal, if (!p_cds_context) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_spinlock_acquire(&p_cds_context->bug_report_lock); @@ -1910,7 +1910,7 @@ CDF_STATUS cds_set_log_completion(uint32_t is_fatal, p_cds_context->log_complete.reason_code = reason_code; p_cds_context->log_complete.is_report_in_progress = true; cdf_spinlock_release(&p_cds_context->bug_report_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1976,12 +1976,12 @@ bool cds_is_log_report_in_progress(void) * * Return: 0 on success */ -CDF_STATUS cds_flush_logs(uint32_t is_fatal, +QDF_STATUS cds_flush_logs(uint32_t is_fatal, uint32_t indicator, uint32_t reason_code) { uint32_t ret; - CDF_STATUS status; + QDF_STATUS status; p_cds_contextType p_cds_context; @@ -1989,21 +1989,21 @@ CDF_STATUS cds_flush_logs(uint32_t is_fatal, if (!p_cds_context) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (cds_is_log_report_in_progress() == true) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Bug report already in progress - dropping! type:%d, indicator=%d reason_code=%d", __func__, is_fatal, indicator, reason_code); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = cds_set_log_completion(is_fatal, indicator, reason_code); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to set log trigger params", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, @@ -2015,10 +2015,10 @@ CDF_STATUS cds_flush_logs(uint32_t is_fatal, CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to send flush FW log", __func__); cds_init_log_completion(); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index a7b62e7e90..3fb0a10f77 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -2273,7 +2273,7 @@ void cds_set_dual_mac_scan_config(uint8_t dbs_val, uint8_t single_mac_scan_with_dbs_val) { struct sir_dual_mac_config cfg; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); @@ -2294,7 +2294,7 @@ void cds_set_dual_mac_scan_config(uint8_t dbs_val, dbs_val, dbs_plus_agile_scan_val, single_mac_scan_with_dbs_val); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("wma_get_updated_scan_config failed %d", status); return; } @@ -2302,7 +2302,7 @@ void cds_set_dual_mac_scan_config(uint8_t dbs_val, status = wma_get_updated_fw_mode_config(&cfg.fw_mode_config, wma_get_dbs_config(), wma_get_agile_dfs_config()); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("wma_get_updated_fw_mode_config failed %d", status); return; } @@ -2313,7 +2313,7 @@ void cds_set_dual_mac_scan_config(uint8_t dbs_val, cfg.scan_config, cfg.fw_mode_config); status = sme_soc_set_dual_mac_config(hdd_ctx->hHal, cfg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("sme_soc_set_dual_mac_config failed %d", status); return; } @@ -2332,7 +2332,7 @@ void cds_set_dual_mac_scan_config(uint8_t dbs_val, void cds_set_dual_mac_fw_mode_config(uint8_t dbs, uint8_t dfs) { struct sir_dual_mac_config cfg; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); @@ -2351,14 +2351,14 @@ void cds_set_dual_mac_fw_mode_config(uint8_t dbs, uint8_t dfs) wma_get_dbs_scan_config(), wma_get_dbs_plus_agile_scan_config(), wma_get_single_mac_scan_with_dfs_config()); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("wma_get_updated_scan_config failed %d", status); return; } status = wma_get_updated_fw_mode_config(&cfg.fw_mode_config, dbs, dfs); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("wma_get_updated_fw_mode_config failed %d", status); return; } @@ -2369,7 +2369,7 @@ void cds_set_dual_mac_fw_mode_config(uint8_t dbs, uint8_t dfs) cfg.scan_config, cfg.fw_mode_config); status = sme_soc_set_dual_mac_config(hdd_ctx->hHal, cfg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("sme_soc_set_dual_mac_config failed %d", status); return; } @@ -2393,7 +2393,7 @@ static void cds_soc_set_hw_mode_cb(uint32_t status, uint32_t num_vdev_mac_entries, struct sir_vdev_mac_map *vdev_mac_map) { - CDF_STATUS ret; + QDF_STATUS ret; struct sir_hw_mode_params hw_mode; uint32_t i; @@ -2415,7 +2415,7 @@ static void cds_soc_set_hw_mode_cb(uint32_t status, vdev_mac_map[i].mac_id); ret = wma_get_hw_mode_from_idx(cfgd_hw_mode_index, &hw_mode); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { cds_err("Get HW mode failed: %d", ret); return; } @@ -2433,7 +2433,7 @@ static void cds_soc_set_hw_mode_cb(uint32_t status, hw_mode); ret = cdf_set_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(ret)) + if (!QDF_IS_STATUS_SUCCESS(ret)) cds_err("ERROR: set connection_update_done event failed"); return; @@ -2456,7 +2456,7 @@ static void cds_hw_mode_transition_cb(uint32_t old_hw_mode_index, uint32_t num_vdev_mac_entries, struct sir_vdev_mac_map *vdev_mac_map) { - CDF_STATUS status; + QDF_STATUS status; struct sir_hw_mode_params hw_mode; uint32_t i; @@ -2474,7 +2474,7 @@ static void cds_hw_mode_transition_cb(uint32_t old_hw_mode_index, vdev_mac_map[i].mac_id); status = wma_get_hw_mode_from_idx(new_hw_mode_index, &hw_mode); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("Get HW mode failed: %d", status); return; } @@ -2523,7 +2523,7 @@ static void cds_hw_mode_transition_cb(uint32_t old_hw_mode_index, * * Return: Success if the message made it down to the next layer */ -CDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, +QDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, enum hw_mode_ss_config mac0_ss, enum hw_mode_bandwidth mac0_bw, enum hw_mode_ss_config mac1_ss, @@ -2534,20 +2534,20 @@ CDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, { int8_t hw_mode_index; struct sir_hw_mode msg; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("Invalid HDD context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } hw_mode_index = wma_get_hw_mode_idx_from_dbs_hw_list(mac0_ss, mac0_bw, mac1_ss, mac1_bw, dbs, dfs); if (hw_mode_index < 0) { cds_err("Invalid HW mode index obtained"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } msg.hw_mode_index = hw_mode_index; @@ -2559,12 +2559,12 @@ CDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, msg.hw_mode_index); status = sme_soc_set_hw_mode(hdd_ctx->hHal, msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("Failed to set hw mode to SME"); return status; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2580,7 +2580,7 @@ bool cds_is_connection_in_progress(void) hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; hdd_station_ctx_t *hdd_sta_ctx = NULL; hdd_adapter_t *adapter = NULL; - CDF_STATUS status = 0; + QDF_STATUS status = 0; uint8_t sta_id = 0; uint8_t *sta_mac = NULL; hdd_context_t *hdd_ctx; @@ -2596,7 +2596,7 @@ bool cds_is_connection_in_progress(void) return true; } status = hdd_get_front_adapter(hdd_ctx, &adapter_node); - while (NULL != adapter_node && CDF_STATUS_SUCCESS == status) { + while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) { adapter = adapter_node->pAdapter; if (!adapter) goto end; @@ -3084,7 +3084,7 @@ static void cds_dump_legacy_concurrency( void cds_dump_concurrency_info(void) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; hdd_station_ctx_t *pHddStaCtx; hdd_ap_ctx_t *hdd_ap_ctx; @@ -3112,7 +3112,7 @@ void cds_dump_concurrency_info(void) } status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; switch (adapter->device_mode) { case WLAN_HDD_INFRA_STATION: @@ -3146,8 +3146,8 @@ void cds_dump_concurrency_info(void) hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter); hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter); if (hostapd_state->bssState == BSS_START - && hostapd_state->cdf_status == - CDF_STATUS_SUCCESS) { + && hostapd_state->qdf_status == + QDF_STATUS_SUCCESS) { p2pChannel = hdd_ap_ctx->operatingChannel; cdf_copy_macaddr(&p2pBssid, &adapter->macAddressCurrent); @@ -3161,8 +3161,8 @@ void cds_dump_concurrency_info(void) hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter); hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter); if (hostapd_state->bssState == BSS_START - && hostapd_state->cdf_status == - CDF_STATUS_SUCCESS) { + && hostapd_state->qdf_status == + QDF_STATUS_SUCCESS) { apChannel = hdd_ap_ctx->operatingChannel; cdf_copy_macaddr(&apBssid, &adapter->macAddressCurrent); @@ -3451,7 +3451,7 @@ void cds_clear_concurrency_mode(enum tCDF_ADAPTER_MODE mode) */ static void cds_soc_set_pcl(enum tCDF_ADAPTER_MODE mode) { - CDF_STATUS status; + QDF_STATUS status; enum cds_con_mode con_mode; struct sir_pcl_list pcl; hdd_context_t *hdd_ctx; @@ -3488,13 +3488,13 @@ static void cds_soc_set_pcl(enum tCDF_ADAPTER_MODE mode) status = cds_get_pcl(con_mode, pcl.pcl_list, &pcl.pcl_len); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("Unable to set PCL to FW, Get PCL failed"); return; } status = sme_soc_set_pcl(hdd_ctx->hHal, pcl); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) cds_err("Send soc set PCL to SME failed"); else cds_info("Set PCL to FW for mode:%d", mode); @@ -3685,7 +3685,7 @@ static void cds_set_pcl_for_existing_combo(enum cds_con_mode mode) void cds_decr_session_set_pcl(enum tCDF_ADAPTER_MODE mode, uint8_t session_id) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_context_t *hdd_ctx; cds_context_type *cds_ctx; @@ -3722,11 +3722,11 @@ void cds_decr_session_set_pcl(enum tCDF_ADAPTER_MODE mode, if (cds_need_opportunistic_upgrade()) { /* let's start the timer */ cdf_mc_timer_stop(&hdd_ctx->dbs_opportunistic_timer); - cdf_status = cdf_mc_timer_start( + qdf_status = cdf_mc_timer_start( &hdd_ctx->dbs_opportunistic_timer, DBS_OPPORTUNISTIC_TIME * 1000); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) cds_err("Failed to start dbs opportunistic timer"); } cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); @@ -3831,21 +3831,21 @@ void cds_dbs_opportunistic_timer_handler(void *data) * * Return: Success if the policy manager is deinitialized completely */ -CDF_STATUS cds_deinit_policy_mgr(void) +QDF_STATUS cds_deinit_policy_mgr(void) { cds_context_type *cds_ctx; cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - if (!CDF_IS_STATUS_SUCCESS(cdf_mutex_destroy( + if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_destroy( &cds_ctx->cdf_conc_list_lock))) { cds_err("Failed to destroy cdf_conc_list_lock"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3856,22 +3856,22 @@ CDF_STATUS cds_deinit_policy_mgr(void) * * Return: Success if the policy manager is initialized completely */ -CDF_STATUS cds_init_policy_mgr(void) +QDF_STATUS cds_init_policy_mgr(void) { - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx; cds_context_type *cds_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cds_debug("Initializing the policy manager"); @@ -3879,11 +3879,11 @@ CDF_STATUS cds_init_policy_mgr(void) /* init conc_connection_list */ cdf_mem_zero(conc_connection_list, sizeof(conc_connection_list)); - if (!CDF_IS_STATUS_SUCCESS(cdf_mutex_init( + if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init( &cds_ctx->cdf_conc_list_lock))) { cds_err("Failed to init cdf_conc_list_lock"); /* Lets us not proceed further */ - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_register_hw_mode_trans_cb(hdd_ctx->hHal, @@ -3892,18 +3892,18 @@ CDF_STATUS cds_init_policy_mgr(void) CDF_TIMER_TYPE_SW, cds_dbs_opportunistic_timer_handler, (void *)hdd_ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("Failed to init DBS opportunistic timer"); return status; } status = cdf_init_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("connection_update_done_evt init failed"); return status; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4010,11 +4010,11 @@ enum cds_con_mode cds_get_mode(uint8_t type, uint8_t subtype) * This function adds the new connection to the current * connections list * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_incr_connection_count(uint32_t vdev_id) +QDF_STATUS cds_incr_connection_count(uint32_t vdev_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t conn_index; struct wma_txrx_node *wma_conn_table_entry; hdd_context_t *hdd_ctx; @@ -4065,7 +4065,7 @@ CDF_STATUS cds_incr_connection_count(uint32_t vdev_id) wma_conn_table_entry->chain_mask, wma_conn_table_entry->mac_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4077,11 +4077,11 @@ CDF_STATUS cds_incr_connection_count(uint32_t vdev_id) * This function adds the new connection to the current * connections list * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_update_connection_info(uint32_t vdev_id) +QDF_STATUS cds_update_connection_info(uint32_t vdev_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t conn_index = 0; bool found = false; struct wma_txrx_node *wma_conn_table_entry; @@ -4130,7 +4130,7 @@ CDF_STATUS cds_update_connection_info(uint32_t vdev_id) wma_conn_table_entry->rx_streams, wma_conn_table_entry->nss, vdev_id, true); cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4142,11 +4142,11 @@ CDF_STATUS cds_update_connection_info(uint32_t vdev_id) * This function removes the old connection from the current * connections list * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_decr_connection_count(uint32_t vdev_id) +QDF_STATUS cds_decr_connection_count(uint32_t vdev_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t conn_index = 0, next_conn_index = 0; bool found = false; @@ -4191,7 +4191,7 @@ CDF_STATUS cds_decr_connection_count(uint32_t vdev_id) /* clean up the entry */ cdf_mem_zero(&conc_connection_list[next_conn_index - 1], sizeof(*conc_connection_list)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4206,18 +4206,18 @@ CDF_STATUS cds_decr_connection_count(uint32_t vdev_id) * This function provides the channel(s) on which current * connection(s) is/are * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_get_connection_channels(uint8_t *channels, +QDF_STATUS cds_get_connection_channels(uint8_t *channels, uint32_t *len, uint8_t order) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t conn_index = 0, num_channels = 0; if ((NULL == channels) || (NULL == len)) { /* err msg*/ cds_err("channels or len is NULL"); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } @@ -4267,7 +4267,7 @@ CDF_STATUS cds_get_connection_channels(uint8_t *channels, *len = num_channels; } else { cds_err("unknown order %d", order); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; } @@ -4351,10 +4351,10 @@ void cds_update_with_safe_channel_list(uint8_t *pcl_channels, uint32_t *len) * * Return: Channel List */ -CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, +QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, uint8_t *pcl_channels, uint32_t *len) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t num_channels = WNI_CFG_VALID_CHANNEL_LIST_LEN; uint32_t chan_index = 0, chan_index_24 = 0, chan_index_5 = 0; uint8_t channel_list[MAX_NUM_CHAN] = {0}; @@ -4383,12 +4383,12 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, if (CDS_NONE == pcl) { /* msg */ cds_err("pcl is 0"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* get the channel list for current domain */ status = sme_get_cfg_valid_channels(hdd_ctx->hHal, channel_list, &num_channels); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { /* err msg*/ cds_err("No valid channel"); return status; @@ -4417,13 +4417,13 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(pcl_channels, channel_list_24, chan_index_24); *len = chan_index_24; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_5G: cdf_mem_copy(pcl_channels, channel_list_5, chan_index_5); *len = chan_index_5; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_CH: case CDS_MCC_CH: @@ -4431,7 +4431,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, channel_list, &num_channels, 0); cdf_mem_copy(pcl_channels, channel_list, num_channels); *len = num_channels; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_CH_24G: case CDS_MCC_CH_24G: @@ -4442,7 +4442,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[num_channels], channel_list_24, chan_index_24); *len += chan_index_24; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_CH_5G: case CDS_MCC_CH_5G: @@ -4454,7 +4454,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[num_channels], channel_list_5, chan_index_5); *len += chan_index_5; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_24G_SCC_CH: case CDS_24G_MCC_CH: @@ -4466,7 +4466,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[chan_index_24], channel_list, num_channels); *len += num_channels; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_5G_SCC_CH: case CDS_5G_MCC_CH: @@ -4478,7 +4478,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[chan_index_5], channel_list, num_channels); *len += num_channels; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_ON_24_SCC_ON_5: cds_get_connection_channels( @@ -4486,14 +4486,14 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(pcl_channels, channel_list, num_channels); *len = num_channels; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_ON_5_SCC_ON_24: cds_get_connection_channels( channel_list, &num_channels, 2); cdf_mem_copy(pcl_channels, channel_list, num_channels); *len = num_channels; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_ON_24_SCC_ON_5_24G: cds_get_connection_channels( @@ -4503,7 +4503,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[num_channels], channel_list_24, chan_index_24); *len += chan_index_24; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_ON_24_SCC_ON_5_5G: cds_get_connection_channels( @@ -4513,7 +4513,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[num_channels], channel_list_5, chan_index_5); *len += chan_index_5; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_ON_5_SCC_ON_24_24G: cds_get_connection_channels( @@ -4523,7 +4523,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[num_channels], channel_list_24, chan_index_24); *len += chan_index_24; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_ON_5_SCC_ON_24_5G: cds_get_connection_channels( @@ -4533,7 +4533,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[num_channels], channel_list_5, chan_index_5); *len += chan_index_5; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; default: /* err msg */ @@ -4598,12 +4598,12 @@ bool cds_map_concurrency_mode(enum tCDF_ADAPTER_MODE *old_mode, * connection decision making entities will using this function * to query the PCL info * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_get_pcl(enum cds_con_mode mode, +QDF_STATUS cds_get_pcl(enum cds_con_mode mode, uint8_t *pcl_channels, uint32_t *len) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t num_connections = 0; enum cds_conc_priority_mode first_index = 0; enum cds_one_connection_mode second_index = 0; @@ -4694,7 +4694,7 @@ CDF_STATUS cds_get_pcl(enum cds_con_mode mode, * help from sme_get_cfg_valid_channels */ status = cds_get_channel_list(pcl, pcl_channels, len); - if (status == CDF_STATUS_SUCCESS) { + if (status == QDF_STATUS_SUCCESS) { uint32_t i; cds_debug("pcl len:%d", *len); for (i = 0; i < *len; i++) @@ -5536,9 +5536,9 @@ enum cds_two_connection_mode cds_get_third_connection_pcl_table_index(void) * needed on current connections once channel has been decided * for the new connection. Notifies UMAC & FW as well * - * Return: CDF_STATUS enum + * Return: QDF_STATUS enum */ -CDF_STATUS cds_current_connections_update(uint32_t session_id, +QDF_STATUS cds_current_connections_update(uint32_t session_id, uint8_t channel, enum cds_conn_update_reason reason) { @@ -5549,7 +5549,7 @@ CDF_STATUS cds_current_connections_update(uint32_t session_id, enum cds_band band; cds_context_type *cds_ctx; hdd_context_t *hdd_ctx; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); if (!cds_ctx) { @@ -5560,12 +5560,12 @@ CDF_STATUS cds_current_connections_update(uint32_t session_id, hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("Invalid HDD context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wma_is_hw_dbs_capable() == false) { cds_err("driver isn't dbs capable, no further action needed"); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } if (CDS_IS_CHANNEL_24GHZ(channel)) band = CDS_BAND_24; @@ -5622,7 +5622,7 @@ CDF_STATUS cds_current_connections_update(uint32_t session_id, status = cds_next_actions(session_id, next_action, reason); else - status = CDF_STATUS_E_NOSUPPORT; + status = QDF_STATUS_E_NOSUPPORT; cds_debug("index2=%d index3=%d next_action=%d, band=%d status=%d reason=%d session_id=%d", second_index, third_index, next_action, band, status, @@ -5707,7 +5707,7 @@ void cds_nss_update_cb(void *context, uint8_t tx_status, uint8_t vdev_id, uint32_t conn_index = 0; bool wait = true; - if (CDF_STATUS_E_FAILURE == tx_status) { + if (QDF_STATUS_E_FAILURE == tx_status) { cds_err("nss update failed for vdev %d", vdev_id); return; } @@ -5765,13 +5765,13 @@ void cds_nss_update_cb(void *context, uint8_t tx_status, uint8_t vdev_id, * needed on current connections once channel has been decided * for the new connection. Notifies UMAC & FW as well * - * Return: CDF_STATUS enum + * Return: QDF_STATUS enum */ -CDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, +QDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, enum cds_conn_update_reason reason, uint32_t session_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t index = 0, count = 0; uint32_t list[MAX_NUMBER_OF_CONC_CONNECTIONS]; uint32_t conn_index = 0; @@ -5785,7 +5785,7 @@ CDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, if (wma_is_hw_dbs_capable() == false) { cds_err("driver isn't dbs capable, no further action needed"); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } /* cds_complete_action() is called by cds_next_actions(). @@ -5810,7 +5810,7 @@ CDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, [list[index]].vdev_id, new_nss, cds_nss_update_cb, next_action, hdd_ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("sme_nss_update_request() failed for vdev %d", conc_connection_list[list[index]].vdev_id); } @@ -5828,14 +5828,14 @@ CDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, [list[index]].vdev_id, new_nss, cds_nss_update_cb, next_action, hdd_ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("sme_nss_update_request() failed for vdev %d", conc_connection_list[list[index]].vdev_id); } } index++; } - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) status = cds_next_actions(session_id, next_action, reason); @@ -5854,23 +5854,23 @@ CDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, * needed on current connections once channel has been decided * for the new connection. Notifies UMAC & FW as well * - * Return: CDF_STATUS enum + * Return: QDF_STATUS enum */ -CDF_STATUS cds_next_actions(uint32_t session_id, +QDF_STATUS cds_next_actions(uint32_t session_id, enum cds_conc_next_action action, enum cds_conn_update_reason reason) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; struct sir_hw_mode_params hw_mode; if (wma_is_hw_dbs_capable() == false) { cds_err("driver isn't dbs capable, no further action needed"); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } /* check for the current HW index to see if really need any action */ status = wma_get_current_hw_mode(&hw_mode); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("wma_get_current_hw_mode failed"); return status; } @@ -5885,7 +5885,7 @@ CDF_STATUS cds_next_actions(uint32_t session_id, && !hw_mode.dbs_cap)) { cds_err("driver is already in %s mode, no further action needed", (hw_mode.dbs_cap) ? "dbs" : "non dbs"); - return CDF_STATUS_E_ALREADY; + return QDF_STATUS_E_ALREADY; } switch (action) { @@ -5928,7 +5928,7 @@ CDF_STATUS cds_next_actions(uint32_t session_id, default: /* err msg */ cds_err("unexpected action value %d", action); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } @@ -6104,9 +6104,9 @@ static void cds_sap_restart_handle(struct work_struct *work) * * This routine will restart the SAP if restart is pending * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result, +QDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result, hdd_station_ctx_t *hdd_sta_ctx) { hdd_adapter_t *sap_adapter = NULL; @@ -6117,28 +6117,28 @@ CDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result, hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!(hdd_ctx->config->conc_custom_rule1 && (true == cds_is_sap_restart_required()))) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; sap_adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_SOFTAP); if (sap_adapter == NULL) { cds_err("sap_adapter is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (test_bit(SOFTAP_BSS_STARTED, &sap_adapter->event_flags)) { cds_err("SAP is already in started state"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(sap_adapter); if (hdd_ap_ctx == NULL) { cds_err("HDD sap context is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if ((eCSR_ROAM_RESULT_ASSOCIATED == roam_result) && hdd_sta_ctx->conn_info.operationChannel < @@ -6175,7 +6175,7 @@ CDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result, cds_sap_restart_handle); #endif schedule_work(&hdd_ctx->sap_start_work); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6196,7 +6196,7 @@ static bool cds_sta_sap_concur_handle(hdd_adapter_t *sta_adapter, hdd_adapter_t *ap_adapter; bool are_cc_channels_same = false; tScanResultHandle scan_cache = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); @@ -6212,14 +6212,14 @@ static bool cds_sta_sap_concur_handle(hdd_adapter_t *sta_adapter, wlan_hdd_check_custom_con_channel_rules(sta_adapter, ap_adapter, roam_profile, &scan_cache, &are_cc_channels_same); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { cds_err("wlan_hdd_check_custom_con_channel_rules failed!"); /* Not returning */ } status = sme_scan_result_purge( WLAN_HDD_GET_HAL_CTX(sta_adapter), scan_cache); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { cds_err("sme_scan_result_purge failed!"); /* Not returning */ } @@ -6266,7 +6266,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter, tScanResultHandle scan_cache = NULL; uint32_t p2pgo_channel_num, freq; tHddAvoidFreqList hdd_avoid_freq_list; - CDF_STATUS status; + QDF_STATUS status; bool ret; hdd_context_t *hdd_ctx; @@ -6282,7 +6282,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter, wlan_hdd_check_custom_con_channel_rules(sta_adapter, p2pgo_adapter, roam_profile, &scan_cache, &are_cc_channels_same); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { cds_err("wlan_hdd_check_custom_con_channel_rules failed"); /* Not returning */ } @@ -6352,7 +6352,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter, status = sme_scan_result_purge( WLAN_HDD_GET_HAL_CTX(sta_adapter), scan_cache); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { cds_err("sme_scan_result_purge failed"); /* Not returning */ } @@ -6452,12 +6452,12 @@ bool cds_handle_conc_rule2(hdd_adapter_t *adapter, * This routine gets channel which most likely a candidate to which STA * will make connection. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_get_channel_from_scan_result(hdd_adapter_t *adapter, +QDF_STATUS cds_get_channel_from_scan_result(hdd_adapter_t *adapter, tCsrRoamProfile *roam_profile, uint8_t *channel) { - CDF_STATUS status; + QDF_STATUS status; tScanResultHandle scan_cache = NULL; status = sme_get_ap_channel_from_scan_cache( @@ -6482,7 +6482,7 @@ uint8_t cds_search_and_check_for_session_conc(uint8_t session_id, tCsrRoamProfile *roam_profile) { uint8_t channel = 0; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx; hdd_adapter_t *adapter; bool ret; @@ -6501,7 +6501,7 @@ uint8_t cds_search_and_check_for_session_conc(uint8_t session_id, status = cds_get_channel_from_scan_result(adapter, roam_profile, &channel); - if ((CDF_STATUS_SUCCESS != status) || (channel == 0)) { + if ((QDF_STATUS_SUCCESS != status) || (channel == 0)) { cds_err("%s error %d %d", __func__, status, channel); return 0; @@ -6573,25 +6573,25 @@ bool cds_check_for_session_conc(uint8_t session_id, uint8_t channel) * This routine will handle STA side concurrency when policy manager * is enabled. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_handle_conc_multiport(uint8_t session_id, uint8_t channel) +QDF_STATUS cds_handle_conc_multiport(uint8_t session_id, uint8_t channel) { - CDF_STATUS status; + QDF_STATUS status; if (!cds_check_for_session_conc(session_id, channel)) { cds_err("Conc not allowed for the session %d", session_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = cdf_reset_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) cds_err("clearing event failed"); status = cds_current_connections_update(session_id, channel, CDS_UPDATE_REASON_NORMAL_STA); - if (CDF_STATUS_E_FAILURE == status) { + if (QDF_STATUS_E_FAILURE == status) { cds_err("connections update failed"); return status; } @@ -6773,7 +6773,7 @@ void cds_check_concurrent_intf_and_restart_sap(hdd_station_ctx_t *hdd_sta_ctx, */ uint8_t cds_is_mcc_in_24G(void) { - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *hdd_adapter = NULL; hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; uint8_t ret = 0; @@ -6793,7 +6793,7 @@ uint8_t cds_is_mcc_in_24G(void) status = hdd_get_front_adapter(hdd_ctx, &adapter_node); /* loop through all adapters and check MCC for STA,P2P,SAP adapters */ - while (NULL != adapter_node && CDF_STATUS_SUCCESS == status) { + while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) { hdd_adapter = adapter_node->pAdapter; if (!((hdd_adapter->device_mode >= WLAN_HDD_INFRA_STATION) @@ -6826,8 +6826,8 @@ uint8_t cds_is_mcc_in_24G(void) WLAN_HDD_GET_HOSTAP_STATE_PTR( hdd_adapter); if (hostapd_state->bssState == BSS_START && - hostapd_state->cdf_status == - CDF_STATUS_SUCCESS) + hostapd_state->qdf_status == + QDF_STATUS_SUCCESS) channel = ap_ctx->operatingChannel; } @@ -6866,7 +6866,7 @@ uint8_t cds_is_mcc_in_24G(void) int32_t cds_set_mas(hdd_adapter_t *adapter, uint8_t mas_value) { hdd_context_t *hdd_ctx = NULL; - CDF_STATUS ret_status; + QDF_STATUS ret_status; hdd_ctx = WLAN_HDD_GET_CTX(adapter); if (!hdd_ctx) @@ -6881,7 +6881,7 @@ int32_t cds_set_mas(hdd_adapter_t *adapter, uint8_t mas_value) cds_err("Could not pass on WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED to CCM"); } ret_status = sme_set_mas(false); - if (CDF_STATUS_SUCCESS != ret_status) { + if (QDF_STATUS_SUCCESS != ret_status) { cds_err("Failed to disable MAS"); return -EBUSY; } @@ -6916,7 +6916,7 @@ int32_t cds_set_mas(hdd_adapter_t *adapter, uint8_t mas_value) /* Enable MAS */ ret_status = sme_set_mas(true); - if (CDF_STATUS_SUCCESS != ret_status) { + if (QDF_STATUS_SUCCESS != ret_status) { cds_err("Unable to enable MAS"); return -EBUSY; } @@ -7051,9 +7051,9 @@ int32_t cds_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapater, * * Return: Success or Failure depending on the overall function behavior */ -CDF_STATUS cds_change_mcc_go_beacon_interval(hdd_adapter_t *pHostapdAdapter) +QDF_STATUS cds_change_mcc_go_beacon_interval(hdd_adapter_t *pHostapdAdapter) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal; cds_info("UPDATE Beacon Params"); @@ -7062,18 +7062,18 @@ CDF_STATUS cds_change_mcc_go_beacon_interval(hdd_adapter_t *pHostapdAdapter) hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter); if (NULL == hHal) { cds_err("Hal ctx is null"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_change_mcc_beacon_interval(hHal, pHostapdAdapter-> sessionId); - if (cdf_ret_status == CDF_STATUS_E_FAILURE) { + if (cdf_ret_status == QDF_STATUS_E_FAILURE) { cds_err("Failed to update Beacon Params"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7261,7 +7261,7 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter) { hdd_ap_ctx_t *hdd_ap_ctx; hdd_hostapd_state_t *hostapd_state; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; QDF_STATUS qdf_status; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter); #ifdef CFG80211_DEL_STA_V2 @@ -7290,7 +7290,7 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter) hdd_cleanup_actionframe(hdd_ctx, ap_adapter); hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter); qdf_event_reset(&hostapd_state->cdf_stop_bss_event); - if (CDF_STATUS_SUCCESS == wlansap_stop_bss(sap_ctx)) { + if (QDF_STATUS_SUCCESS == wlansap_stop_bss(sap_ctx)) { qdf_status = qdf_wait_single_event(&hostapd_state-> cdf_stop_bss_event, @@ -7315,7 +7315,7 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter) if (wlansap_start_bss(sap_ctx, hdd_hostapd_sap_event_cb, sap_config, - ap_adapter->dev) != CDF_STATUS_SUCCESS) { + ap_adapter->dev) != QDF_STATUS_SUCCESS) { cds_err("SAP Start Bss fail"); goto end; } @@ -7389,12 +7389,12 @@ void cds_check_and_restart_sap_with_non_dfs_acs(void) } #endif #ifdef MPC_UT_FRAMEWORK -CDF_STATUS cds_update_connection_info_utfw( +QDF_STATUS cds_update_connection_info_utfw( uint32_t vdev_id, uint32_t tx_streams, uint32_t rx_streams, uint32_t chain_mask, uint32_t type, uint32_t sub_type, uint32_t channelid, uint32_t mac_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t conn_index = 0, found = 0; cds_context_type *cds_ctx; @@ -7428,15 +7428,15 @@ CDF_STATUS cds_update_connection_info_utfw( rx_streams, 0, vdev_id, true); cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS cds_incr_connection_count_utfw( +QDF_STATUS cds_incr_connection_count_utfw( uint32_t vdev_id, uint32_t tx_streams, uint32_t rx_streams, uint32_t chain_mask, uint32_t type, uint32_t sub_type, uint32_t channelid, uint32_t mac_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t conn_index = 0; hdd_context_t *hdd_ctx; cds_context_type *cds_ctx; @@ -7470,26 +7470,26 @@ CDF_STATUS cds_incr_connection_count_utfw( rx_streams, 0, vdev_id, true); cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all, +QDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all, uint32_t vdev_id) { - CDF_STATUS status; + QDF_STATUS status; cds_context_type *cds_ctx; cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (del_all) { status = cds_init_policy_mgr(); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("Policy manager initialization failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); @@ -7497,7 +7497,7 @@ CDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all, cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } struct cds_conc_connection_info *cds_get_conn_info(uint32_t *len) @@ -7740,9 +7740,9 @@ bool cds_is_sta_active_connection_exists(void) * Waits for CONNECTION_UPDATE_TIMEOUT duration until the set hw mode * response sets the event connection_update_done_evt * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cdf_wait_for_connection_update(void) +QDF_STATUS cdf_wait_for_connection_update(void) { QDF_STATUS status; p_cds_contextType cds_context; @@ -7750,7 +7750,7 @@ CDF_STATUS cdf_wait_for_connection_update(void) cds_context = cds_get_global_context(); if (!cds_context) { cds_err("Invalid CDS context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = qdf_wait_single_event( @@ -7759,10 +7759,10 @@ CDF_STATUS cdf_wait_for_connection_update(void) if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("wait for event failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7770,9 +7770,9 @@ CDF_STATUS cdf_wait_for_connection_update(void) * * Resets the concurrent connection update event * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cdf_reset_connection_update(void) +QDF_STATUS cdf_reset_connection_update(void) { QDF_STATUS status; p_cds_contextType cds_context; @@ -7780,17 +7780,17 @@ CDF_STATUS cdf_reset_connection_update(void) cds_context = cds_get_global_context(); if (!cds_context) { cds_err("Invalid CDS context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = qdf_event_reset(&cds_context->connection_update_done_evt); if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("clear event failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7798,9 +7798,9 @@ CDF_STATUS cdf_reset_connection_update(void) * * Sets the concurrent connection update event * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cdf_set_connection_update(void) +QDF_STATUS cdf_set_connection_update(void) { QDF_STATUS status; p_cds_contextType cds_context; @@ -7826,9 +7826,9 @@ CDF_STATUS cdf_set_connection_update(void) * * Initializes the concurrent connection update event * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cdf_init_connection_update(void) +QDF_STATUS cdf_init_connection_update(void) { QDF_STATUS qdf_status; p_cds_contextType cds_context; @@ -7836,15 +7836,15 @@ CDF_STATUS cdf_init_connection_update(void) cds_context = cds_get_global_context(); if (!cds_context) { cds_err("Invalid CDS context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } qdf_status = qdf_event_create(&cds_context->connection_update_done_evt); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { cds_err("init event failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } diff --git a/core/cds/src/cds_mq.c b/core/cds/src/cds_mq.c index 6354e04dc9..70ba1629eb 100644 --- a/core/cds/src/cds_mq.c +++ b/core/cds/src/cds_mq.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -55,13 +55,13 @@ tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, void *pMb); * * Return: cdf status */ -inline CDF_STATUS cds_mq_init(p_cds_mq_type pMq) +inline QDF_STATUS cds_mq_init(p_cds_mq_type pMq) { if (pMq == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Now initialize the lock */ @@ -70,7 +70,7 @@ inline CDF_STATUS cds_mq_init(p_cds_mq_type pMq) /* Now initialize the List data structure */ INIT_LIST_HEAD(&pMq->mqList); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* cds_mq_init() */ /** @@ -170,7 +170,7 @@ inline bool cds_is_mq_empty(p_cds_mq_type pMq) if (pMq == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } spin_lock_irqsave(&pMq->mqLock, flags); @@ -186,9 +186,9 @@ inline bool cds_is_mq_empty(p_cds_mq_type pMq) * * Return: cdf status */ -CDF_STATUS cds_send_mb_message_to_mac(void *pBuf) +QDF_STATUS cds_send_mb_message_to_mac(void *pBuf) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; tSirRetStatus sirStatus; v_CONTEXT_t cds_context; void *hHal; @@ -205,7 +205,7 @@ CDF_STATUS cds_send_mb_message_to_mac(void *pBuf) } else { sirStatus = u_mac_post_ctrl_msg(hHal, pBuf); if (eSIR_SUCCESS == sirStatus) - cdf_ret_status = CDF_STATUS_SUCCESS; + cdf_ret_status = QDF_STATUS_SUCCESS; } } diff --git a/core/cds/src/cds_packet.c b/core/cds/src/cds_packet.c index 3f0ce95ae6..4b527948b7 100644 --- a/core/cds/src/cds_packet.c +++ b/core/cds/src/cds_packet.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -76,11 +76,11 @@ cdf_spinlock_t trace_buffer_lock; * cds_pkt_return_packet Free the cds Packet * @ cds Packet */ -CDF_STATUS cds_pkt_return_packet(cds_pkt_t *packet) +QDF_STATUS cds_pkt_return_packet(cds_pkt_t *packet) { /* Validate the input parameter pointer */ if (unlikely(packet == NULL)) { - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Free up the Adf nbuf */ @@ -91,7 +91,7 @@ CDF_STATUS cds_pkt_return_packet(cds_pkt_t *packet) /* Free up the Rx packet */ cdf_mem_free(packet); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /**-------------------------------------------------------------------------- @@ -103,13 +103,13 @@ CDF_STATUS cds_pkt_return_packet(cds_pkt_t *packet) \param pPacket - the cds Packet to get the packet length from. \param pPacketSize - location to return the total size of the data contained - in the cds Packet. + in the cds Packet. \return \sa ---------------------------------------------------------------------------*/ -CDF_STATUS +QDF_STATUS cds_pkt_get_packet_length(cds_pkt_t *pPacket, uint16_t *pPacketSize) { /* Validate the parameter pointers */ @@ -117,11 +117,11 @@ cds_pkt_get_packet_length(cds_pkt_t *pPacket, uint16_t *pPacketSize) (pPacket->pkt_buf == NULL)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "VPKT [%d]: NULL pointer", __LINE__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* return the requested information */ *pPacketSize = cdf_nbuf_len(pPacket->pkt_buf); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*--------------------------------------------------------------------------- @@ -289,10 +289,10 @@ void cds_pkt_proto_trace_close(void) * @brief cds_packet_alloc_debug() - Allocate a network buffer for TX ---------------------------------------------------------------------------*/ -CDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, +QDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, uint8_t *file_name, uint32_t line_num) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; cdf_nbuf_t nbuf; nbuf = @@ -305,7 +305,7 @@ CDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, cdf_nbuf_set_protocol(nbuf, ETH_P_CONTROL); *ppPacket = nbuf; *data = cdf_nbuf_data(nbuf); - cdf_ret_status = CDF_STATUS_SUCCESS; + cdf_ret_status = QDF_STATUS_SUCCESS; } return cdf_ret_status; @@ -315,9 +315,9 @@ CDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, * @brief cds_packet_alloc() - Allocate a network buffer for TX ---------------------------------------------------------------------------*/ -CDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket) +QDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; cdf_nbuf_t nbuf; nbuf = cdf_nbuf_alloc(NULL, roundup(size + TX_PKT_MIN_HEADROOM, 4), @@ -328,7 +328,7 @@ CDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket) cdf_nbuf_set_protocol(nbuf, ETH_P_CONTROL); *ppPacket = nbuf; *data = cdf_nbuf_data(nbuf); - cdf_ret_status = CDF_STATUS_SUCCESS; + cdf_ret_status = QDF_STATUS_SUCCESS; } return cdf_ret_status; diff --git a/core/cds/src/cds_reg_service.c b/core/cds/src/cds_reg_service.c index b4aa41aa7b..3bd1b4b368 100644 --- a/core/cds/src/cds_reg_service.c +++ b/core/cds/src/cds_reg_service.c @@ -333,7 +333,7 @@ static int cds_regulatory_wiphy_init(hdd_context_t *hdd_ctx, * cds_update_regulatory_info() - update regulatory info * @hdd_ctx: hdd context * - * Return: CDF_STATUS + * Return: QDF_STATUS */ static void cds_update_regulatory_info(hdd_context_t *hdd_ctx) { @@ -357,16 +357,16 @@ static void cds_update_regulatory_info(hdd_context_t *hdd_ctx) * @channels_40mhz: 40 MHz channels * @num_40mhz_channels: number of 40 Mhz channels * - * Return: CDF_STATUS_SUCCESS + * Return: QDF_STATUS_SUCCESS */ -CDF_STATUS cds_get_channel_list_with_power(struct channel_power +QDF_STATUS cds_get_channel_list_with_power(struct channel_power *base_channels, uint8_t *num_base_channels, struct channel_power *channels_40mhz, uint8_t *num_40mhz_channels) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; int i, count; if (base_channels && num_base_channels) { @@ -420,9 +420,9 @@ CDF_STATUS cds_get_channel_list_with_power(struct channel_power * cds_read_default_country() - set the default country * @default_country: default country * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_read_default_country(uint8_t *default_country) +QDF_STATUS cds_read_default_country(uint8_t *default_country) { hdd_context_t *hdd_ctx; @@ -430,7 +430,7 @@ CDF_STATUS cds_read_default_country(uint8_t *default_country) if (!hdd_ctx) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "invalid hdd_ctx pointer"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } memcpy(default_country, @@ -442,7 +442,7 @@ CDF_STATUS cds_read_default_country(uint8_t *default_country) default_country[0], default_country[1]); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -580,9 +580,7 @@ static int cds_bw20_ch_index_to_bw40_ch_index(int k) m = k - RF_CHAN_36 + RF_CHAN_BOND_38; if (m > RF_CHAN_BOND_62) m = RF_CHAN_BOND_62; - } - else if (k >= RF_CHAN_100 && k <= RF_CHAN_144) - { + } else if (k >= RF_CHAN_100 && k <= RF_CHAN_144) { m = k - RF_CHAN_100 + RF_CHAN_BOND_102; if (m > RF_CHAN_BOND_142) m = RF_CHAN_BOND_142; @@ -598,17 +596,17 @@ static int cds_bw20_ch_index_to_bw40_ch_index(int k) * cds_set_dfs_region() - set the dfs_region * @dfs_region: the dfs_region to set * - * Return: CDF_STATUS_SUCCESS if dfs_region set correctly - * CDF_STATUS_E_EXISTS if hdd context not found + * Return: QDF_STATUS_SUCCESS if dfs_region set correctly + * QDF_STATUS_E_EXISTS if hdd context not found */ -CDF_STATUS cds_set_dfs_region(uint8_t dfs_region) +QDF_STATUS cds_set_dfs_region(uint8_t dfs_region) { hdd_context_t *hdd_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (NULL == hdd_ctx) - return CDF_STATUS_E_EXISTS; + return QDF_STATUS_E_EXISTS; #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) hdd_ctx->reg.dfs_region = dfs_region; @@ -631,39 +629,39 @@ CDF_STATUS cds_set_dfs_region(uint8_t dfs_region) break; } #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** * cds_get_dfs_region() - get the dfs_region * @dfs_region: the dfs_region to return * - * Return: CDF_STATUS_SUCCESS if dfs_region set correctly - * CDF_STATUS_E_EXISTS if hdd context not found + * Return: QDF_STATUS_SUCCESS if dfs_region set correctly + * QDF_STATUS_E_EXISTS if hdd context not found */ -CDF_STATUS cds_get_dfs_region(uint8_t *dfs_region) +QDF_STATUS cds_get_dfs_region(uint8_t *dfs_region) { hdd_context_t *hdd_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (NULL == hdd_ctx) - return CDF_STATUS_E_EXISTS; + return QDF_STATUS_E_EXISTS; *dfs_region = hdd_ctx->reg.dfs_region; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** * cds_get_reg_domain_from_country_code() - get the regulatory domain * @reg_domain_ptr: ptr to store regulatory domain * - * Return: CDF_STATUS_SUCCESS on success - * CDF_STATUS_E_FAULT on error - * CDF_STATUS_E_EMPTY country table empty + * Return: QDF_STATUS_SUCCESS on success + * QDF_STATUS_E_FAULT on error + * QDF_STATUS_E_EMPTY country table empty */ -CDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, +QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, const uint8_t *country_alpha2, enum country_src source) { @@ -673,24 +671,24 @@ CDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, if (NULL == reg_domain_ptr) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ("Invalid reg domain pointer")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } *reg_domain_ptr = 0; if (SOURCE_QUERY == source) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; if (NULL == country_alpha2) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ("Country code array is NULL")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (cds_is_driver_recovering()) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "SSR in progress, return"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); @@ -698,7 +696,7 @@ CDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, if (NULL == hdd_ctx) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ("Invalid pHddCtx pointer")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } wiphy = hdd_ctx->wiphy; @@ -716,7 +714,7 @@ CDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, NL80211_USER_REG_HINT_USER); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* @@ -757,7 +755,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy, if (NULL == hdd_ctx) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "invalid hdd_ctx pointer"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hdd_ctx->isVHT80Allowed = 0; @@ -928,7 +926,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy, if (k == 0) return -1; - return 0; + return QDF_STATUS_SUCCESS; } #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)) && !defined(WITH_BACKPORTS) @@ -1098,9 +1096,9 @@ void hdd_reg_notifier(struct wiphy *wiphy, /** * cds_regulatory_init() - regulatory_init - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_regulatory_init(void) +QDF_STATUS cds_regulatory_init(void) { hdd_context_t *hdd_ctx = NULL; struct wiphy *wiphy = NULL; @@ -1111,7 +1109,7 @@ CDF_STATUS cds_regulatory_init(void) if (!hdd_ctx) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "invalid hdd_ctx pointer"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } wiphy = hdd_ctx->wiphy; @@ -1125,7 +1123,7 @@ CDF_STATUS cds_regulatory_init(void) nBandCapability, true) != 0) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ("Error while creating regulatory entry")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } reg_info->cc_src = SOURCE_DRIVER; @@ -1143,7 +1141,7 @@ CDF_STATUS cds_regulatory_init(void) cds_fill_and_send_ctl_to_fw(reg_info); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1151,18 +1149,18 @@ CDF_STATUS cds_regulatory_init(void) * @client_ctxt: client context * @reg_domain: regulatory domain * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain) +QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain) { if (reg_domain >= REGDOMAIN_COUNT) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "CDS set reg domain, invalid REG domain ID %d", reg_domain); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cds/src/cds_sched.c b/core/cds/src/cds_sched.c index a30b031b12..ff22f1a8a8 100644 --- a/core/cds/src/cds_sched.c +++ b/core/cds/src/cds_sched.c @@ -82,7 +82,7 @@ static int cds_mc_thread(void *Arg); #ifdef QCA_CONFIG_SMP static int cds_ol_rx_thread(void *arg); static unsigned long affine_cpu; -static CDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext); +static QDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext); #endif #ifdef QCA_CONFIG_SMP @@ -186,29 +186,29 @@ static struct notifier_block cds_cpu_hotplug_notifier = { * * Return: CDF status */ -CDF_STATUS cds_sched_open(void *p_cds_context, +QDF_STATUS cds_sched_open(void *p_cds_context, p_cds_sched_context pSchedContext, uint32_t SchedCtxSize) { - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Opening the CDS Scheduler", __func__); /* Sanity checks */ if ((p_cds_context == NULL) || (pSchedContext == NULL)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (sizeof(cds_sched_context) != SchedCtxSize) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Incorrect CDS Sched Context size passed", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } cdf_mem_zero(pSchedContext, sizeof(cds_sched_context)); pSchedContext->pVContext = p_cds_context; vStatus = cds_sched_init_mqs(pSchedContext); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to initialize CDS Scheduler MQs", __func__); @@ -240,8 +240,8 @@ CDF_STATUS cds_sched_open(void *p_cds_context, spin_lock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); INIT_LIST_HEAD(&pSchedContext->cds_ol_rx_pkt_freeq); spin_unlock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); - if (cds_alloc_ol_rx_pkt_freeq(pSchedContext) != CDF_STATUS_SUCCESS) { - return CDF_STATUS_E_FAILURE; + if (cds_alloc_ol_rx_pkt_freeq(pSchedContext) != QDF_STATUS_SUCCESS) { + return QDF_STATUS_E_FAILURE; } register_hotcpu_notifier(&cds_cpu_hotplug_notifier); pSchedContext->cpu_hot_plug_notifier = &cds_cpu_hotplug_notifier; @@ -292,7 +292,7 @@ CDF_STATUS cds_sched_open(void *p_cds_context, /* We're good now: Let's get the ball rolling!!! */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS Scheduler successfully Opened", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; #ifdef QCA_CONFIG_SMP OL_RX_THREAD_START_FAILURE: @@ -313,7 +313,7 @@ MC_THREAD_START_FAILURE: cds_free_ol_rx_pkt_freeq(gp_cds_sched_context); #endif - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } /* cds_sched_open() */ @@ -329,7 +329,7 @@ static int cds_mc_thread(void *Arg) p_cds_msg_wrapper pMsgWrapper = NULL; tpAniSirGlobal pMacContext = NULL; tSirRetStatus macStatus = eSIR_SUCCESS; - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; int retWaitStatus = 0; bool shutdown = false; hdd_context_t *pHddCtx = NULL; @@ -424,7 +424,7 @@ static int cds_mc_thread(void *Arg) vStatus = sys_mc_process_msg(pSchedContext->pVContext, pMsgWrapper->pVosMsg); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Issue Processing SYS message", @@ -455,7 +455,7 @@ static int cds_mc_thread(void *Arg) vStatus = wma_mc_process_msg(pSchedContext->pVContext, pMsgWrapper->pVosMsg); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Issue Processing WMA message", @@ -546,7 +546,7 @@ static int cds_mc_thread(void *Arg) vStatus = sme_process_msg((tHalHandle) pMacContext, pMsgWrapper->pVosMsg); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Issue Processing SME message", @@ -619,7 +619,7 @@ void cds_free_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext) * * Return: status of memory allocation */ -static CDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext) +static QDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext) { struct cds_ol_rx_pkt *pkt, *tmp; int i; @@ -638,7 +638,7 @@ static CDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext) spin_unlock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; free: spin_lock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); @@ -650,7 +650,7 @@ free: spin_lock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); } spin_unlock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /** @@ -895,14 +895,14 @@ static int cds_ol_rx_thread(void *arg) * * Return: cdf status */ -CDF_STATUS cds_sched_close(void *p_cds_context) +QDF_STATUS cds_sched_close(void *p_cds_context) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: invoked", __func__); if (gp_cds_sched_context == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: gp_cds_sched_context == NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* shut down MC Thread */ set_bit(MC_SHUTDOWN_EVENT_MASK, &gp_cds_sched_context->mcEventFlag); @@ -929,7 +929,7 @@ CDF_STATUS cds_sched_close(void *p_cds_context) cds_free_ol_rx_pkt_freeq(gp_cds_sched_context); unregister_hotcpu_notifier(&cds_cpu_hotplug_notifier); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* cds_sched_close() */ /** @@ -940,14 +940,14 @@ CDF_STATUS cds_sched_close(void *p_cds_context) * * Return: CDF status */ -CDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext) +QDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext) { - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; /* Now intialize all the message queues */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the WMA MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->wmaMcMq); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to init WMA MC Message queue", __func__); CDF_ASSERT(0); @@ -956,7 +956,7 @@ CDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the PE MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->peMcMq); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to init PE MC Message queue", __func__); CDF_ASSERT(0); @@ -965,7 +965,7 @@ CDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the SME MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->smeMcMq); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to init SME MC Message queue", __func__); CDF_ASSERT(0); @@ -974,14 +974,14 @@ CDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the SYS MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->sysMcMq); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to init SYS MC Message queue", __func__); CDF_ASSERT(0); return vStatus; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* cds_sched_init_mqs() */ /** diff --git a/core/cds/src/cds_utils.c b/core/cds/src/cds_utils.c index cec62590eb..048061fe13 100644 --- a/core/cds/src/cds_utils.c +++ b/core/cds/src/cds_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -29,18 +29,18 @@ FILE: cds_utils.c OVERVIEW: This source file contains definitions for CDS crypto APIs - The four APIs mentioned in this file are used for - initializing, and de-initializing a crypto context, and - obtaining truly random data (for keys), as well as - SHA1 HMAC, and AES encrypt and decrypt routines. + The four APIs mentioned in this file are used for + initializing, and de-initializing a crypto context, and + obtaining truly random data (for keys), as well as + SHA1 HMAC, and AES encrypt and decrypt routines. - The routines include: - cds_crypto_init() - Initializes Crypto module - cds_crypto_deinit() - De-initializes Crypto module - cds_rand_get_bytes() - Generates random byte - cds_sha1_hmac_str() - Generate the HMAC-SHA1 of a string given a key - cds_encrypt_aes() - Generate AES Encrypted byte stream - cds_decrypt_aes() - Decrypts an AES Encrypted byte stream + The routines include: + cds_crypto_init() - Initializes Crypto module + cds_crypto_deinit() - De-initializes Crypto module + cds_rand_get_bytes() - Generates random byte + cds_sha1_hmac_str() - Generate the HMAC-SHA1 of a string given a key + cds_encrypt_aes() - Generate AES Encrypted byte stream + cds_decrypt_aes() - Decrypts an AES Encrypted byte stream DEPENDENCIES: ============================================================================*/ @@ -201,37 +201,37 @@ static void cds_cmac_calc_mic(struct crypto_cipher *tfm, \param phCryptProv - pointer to the Crypt handle - \return CDF_STATUS_SUCCESS - Successfully generated random memory. + \return QDF_STATUS_SUCCESS - Successfully generated random memory. - CDF_STATUS_E_FAULT - pbBuf is an invalid pointer. + QDF_STATUS_E_FAULT - pbBuf is an invalid pointer. - CDF_STATUS_E_FAILURE - default return value if it fails due to - unknown reasons + QDF_STATUS_E_FAILURE - default return value if it fails due to + unknown reasons - ***CDF_STATUS_E_RESOURCES - System resources (other than memory) - are unavailable + ***QDF_STATUS_E_RESOURCES - System resources (other than memory) + are unavailable \sa ( *** return value not considered yet ) --------------------------------------------------------------------------*/ -CDF_STATUS cds_crypto_init(uint32_t *phCryptProv) +QDF_STATUS cds_crypto_init(uint32_t *phCryptProv) { - CDF_STATUS uResult = CDF_STATUS_E_FAILURE; + QDF_STATUS uResult = QDF_STATUS_E_FAILURE; /* This implementation doesn't require a crypto context */ *phCryptProv = 0; - uResult = CDF_STATUS_SUCCESS; - return (uResult); + uResult = QDF_STATUS_SUCCESS; + return uResult; } -CDF_STATUS cds_crypto_deinit(uint32_t hCryptProv) +QDF_STATUS cds_crypto_deinit(uint32_t hCryptProv) { - CDF_STATUS uResult = CDF_STATUS_E_FAILURE; + QDF_STATUS uResult = QDF_STATUS_E_FAILURE; /* CryptReleaseContext succeeded */ - uResult = CDF_STATUS_SUCCESS; + uResult = QDF_STATUS_SUCCESS; - return (uResult); + return uResult; } /*-------------------------------------------------------------------------- @@ -247,38 +247,38 @@ CDF_STATUS cds_crypto_deinit(uint32_t hCryptProv) \param lock - pointer to the opaque lock object to initialize - \return CDF_STATUS_SUCCESS - Successfully generated random memory. + \return QDF_STATUS_SUCCESS - Successfully generated random memory. - CDF_STATUS_E_FAULT - pbBuf is an invalid pointer. + QDF_STATUS_E_FAULT - pbBuf is an invalid pointer. - CDF_STATUS_E_FAILURE - default return value if it fails due to - unknown reasons + QDF_STATUS_E_FAILURE - default return value if it fails due to + unknown reasons - ***CDF_STATUS_E_RESOURCES - System resources (other than memory) - are unavailable + ***QDF_STATUS_E_RESOURCES - System resources (other than memory) + are unavailable \sa ( *** return value not considered yet ) --------------------------------------------------------------------------*/ -CDF_STATUS +QDF_STATUS cds_rand_get_bytes(uint32_t cryptHandle, uint8_t *pbBuf, uint32_t numBytes) { - CDF_STATUS uResult = CDF_STATUS_E_FAILURE; + QDF_STATUS uResult = QDF_STATUS_E_FAILURE; /* check for invalid pointer */ if (NULL == pbBuf) { - uResult = CDF_STATUS_E_FAULT; - return (uResult); + uResult = QDF_STATUS_E_FAULT; + return uResult; } get_random_bytes(pbBuf, numBytes); /* "Random sequence generated." */ - uResult = CDF_STATUS_SUCCESS; - return (uResult); + uResult = QDF_STATUS_SUCCESS; + return uResult; } #ifdef WLAN_FEATURE_11W -uint8_t cds_get_mmie_size() +uint8_t cds_get_mmie_size(void) { return sizeof(struct ieee80211_mmie); } @@ -310,7 +310,7 @@ static void cds_increase_seq(uint8_t *ipn) of Broadcast/Multicast robust management frames. \param igtk - pointer group key which will be used to calculate - the 8 byte MIC. + the 8 byte MIC. \param ipn - pointer ipn, it is also known as sequence number \param key_id - key identication number \param frm - pointer to the start of the frame. @@ -318,7 +318,7 @@ static void cds_increase_seq(uint8_t *ipn) \param frmLen - size of the entire frame. \return - this function will return true on success and false on - failure. + failure. --------------------------------------------------------------------------*/ @@ -420,7 +420,7 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, if (NULL == input) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Memory allocation failed", __func__); - ret = CDF_STATUS_E_NOMEM; + ret = QDF_STATUS_E_NOMEM; goto err_tfm; } @@ -530,7 +530,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) if (NULL == input) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "Memory allocation failed"); - ret = CDF_STATUS_E_NOMEM; + ret = QDF_STATUS_E_NOMEM; goto err_tfm; } @@ -708,7 +708,7 @@ err_tfm: return ret; } -CDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ uint8_t *pText, /* pointer to data stream */ uint32_t textLen, /* length of data stream */ uint8_t *pKey, /* pointer to authentication key */ @@ -728,10 +728,10 @@ CDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ if (ret != 0) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "hmac_sha1() call failed"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -868,7 +868,7 @@ err_tfm: return ret; } -CDF_STATUS cds_md5_hmac_str(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_md5_hmac_str(uint32_t cryptHandle, /* Handle */ uint8_t *pText, /* pointer to data stream */ uint32_t textLen, /* length of data stream */ uint8_t *pKey, /* pointer to authentication key */ @@ -888,10 +888,10 @@ CDF_STATUS cds_md5_hmac_str(uint32_t cryptHandle, /* Handle */ if (ret != 0) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "hmac_md5() call failed"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } struct ecb_aes_result { @@ -921,21 +921,21 @@ static void ecb_aes_complete(struct crypto_async_request *req, int err) \param lock - pointer to the opaque lock object to initialize - \return CDF_STATUS_SUCCESS - Successfully generated random memory. + \return QDF_STATUS_SUCCESS - Successfully generated random memory. - CDF_STATUS_E_FAULT - pbBuf is an invalid pointer. + QDF_STATUS_E_FAULT - pbBuf is an invalid pointer. - CDF_STATUS_E_FAILURE - default return value if it fails due to - unknown reasons + QDF_STATUS_E_FAILURE - default return value if it fails due to + unknown reasons - ***CDF_STATUS_E_RESOURCES - System resources (other than memory) - are unavailable + ***QDF_STATUS_E_RESOURCES - System resources (other than memory) + are unavailable \sa ( *** return value not considered yet ) --------------------------------------------------------------------------*/ -CDF_STATUS cds_encrypt_aes(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle, /* Handle */ uint8_t *pPlainText, /* pointer to data stream */ uint8_t *pCiphertext, uint8_t *pKey) { /* pointer to authentication key */ @@ -997,10 +997,10 @@ err_tfm: if (ret != 0) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s() call failed", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -1016,25 +1016,25 @@ err_tfm: \param lock - pointer to the opaque lock object to initialize - \return CDF_STATUS_SUCCESS - Successfully generated random memory. + \return QDF_STATUS_SUCCESS - Successfully generated random memory. - CDF_STATUS_E_FAULT - pbBuf is an invalid pointer. + QDF_STATUS_E_FAULT - pbBuf is an invalid pointer. - CDF_STATUS_E_FAILURE - default return value if it fails due to - unknown reasons + QDF_STATUS_E_FAILURE - default return value if it fails due to + unknown reasons - ***CDF_STATUS_E_RESOURCES - System resources (other than memory) - are unavailable + ***QDF_STATUS_E_RESOURCES - System resources (other than memory) + are unavailable \sa ( *** return value not considered yet ) --------------------------------------------------------------------------*/ -CDF_STATUS cds_decrypt_aes(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle, /* Handle */ uint8_t *pText, /* pointer to data stream */ uint8_t *pDecrypted, uint8_t *pKey) { /* pointer to authentication key */ -/* CDF_STATUS uResult = CDF_STATUS_E_FAILURE; */ +/* QDF_STATUS uResult = QDF_STATUS_E_FAILURE; */ struct ecb_aes_result result; struct ablkcipher_request *req; struct crypto_ablkcipher *tfm; @@ -1093,10 +1093,10 @@ err_tfm: if (ret != 0) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s() call failed", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } uint32_t cds_chan_to_freq(uint8_t chan) diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index a2b6fb11bc..6e6a9142d6 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -224,7 +224,7 @@ static void htt_rx_ring_refill_retry(void *arg) void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) { int idx; - CDF_STATUS status; + QDF_STATUS status; struct htt_host_rx_desc_base *rx_desc; idx = *(pdev->rx_ring.alloc_idx.vaddr); @@ -284,7 +284,7 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) cdf_nbuf_map(pdev->osdev, rx_netbuf, CDF_DMA_FROM_DEVICE); #endif - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cdf_nbuf_free(rx_netbuf); goto fail; } diff --git a/core/dp/ol/inc/ol_txrx_ctrl_api.h b/core/dp/ol/inc/ol_txrx_ctrl_api.h index 700dcf4a06..88333fa6b0 100644 --- a/core/dp/ol/inc/ol_txrx_ctrl_api.h +++ b/core/dp/ol/inc/ol_txrx_ctrl_api.h @@ -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. * @@ -674,9 +674,9 @@ ol_txrx_set_monitor_mode_vap(ol_txrx_pdev_handle pdev, */ void ol_txrx_set_curchan(ol_txrx_pdev_handle pdev, uint32_t chan_mhz); -CDF_STATUS ol_txrx_bus_suspend(void); -CDF_STATUS ol_txrx_bus_resume(void); -CDF_STATUS ol_txrx_wait_for_pending_tx(int timeout); +QDF_STATUS ol_txrx_bus_suspend(void); +QDF_STATUS ol_txrx_bus_resume(void); +QDF_STATUS ol_txrx_wait_for_pending_tx(int timeout); /** * @brief Get the number of pending transmit frames that are awaiting completion. @@ -764,7 +764,7 @@ enum ol_txrx_peer_state { * * Return: CDF Status */ -CDF_STATUS +QDF_STATUS ol_txrx_peer_state_update(ol_txrx_pdev_handle pdev, uint8_t *peer_addr, enum ol_txrx_peer_state state); @@ -900,7 +900,7 @@ struct txrx_pdev_cfg_param_t { ol_pdev_handle ol_pdev_cfg_attach(cdf_device_t osdev, struct txrx_pdev_cfg_param_t cfg_param); -CDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id); +QDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id); void *ol_txrx_get_vdev_by_sta_id(uint8_t sta_id); @@ -1252,7 +1252,7 @@ void ol_txrx_display_stats(uint16_t bitmap); void ol_txrx_clear_stats(uint16_t bitmap); int ol_txrx_stats(uint8_t vdev_id, char *buffer, unsigned buf_len); -CDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr, +QDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr, uint8_t *peer_id); void ol_txrx_set_ocb_peer(struct ol_txrx_pdev_t *pdev, diff --git a/core/dp/ol/inc/ol_txrx_osif_api.h b/core/dp/ol/inc/ol_txrx_osif_api.h index 1bc73d28a5..81fddfee1f 100644 --- a/core/dp/ol/inc/ol_txrx_osif_api.h +++ b/core/dp/ol/inc/ol_txrx_osif_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014-2015 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. * @@ -110,7 +110,7 @@ struct ol_txrx_desc_type { }; -typedef CDF_STATUS (*ol_rx_callback_fp)(void *p_cds_gctx, +typedef QDF_STATUS (*ol_rx_callback_fp)(void *p_cds_gctx, cdf_nbuf_t pDataBuff, uint8_t ucSTAId); @@ -119,12 +119,12 @@ typedef void (*ol_tx_pause_callback_fp)(uint8_t vdev_id, enum netif_reason_type reason); #ifdef QCA_LL_TX_FLOW_CONTROL_V2 -CDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb); +QDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb); #else static inline -CDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb) +QDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -262,12 +262,12 @@ cdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev, cdf_nbuf_t skb); #endif -CDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, +QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, struct ol_txrx_desc_type *sta_desc); -CDF_STATUS ol_txrx_clear_peer(uint8_t sta_id); +QDF_STATUS ol_txrx_clear_peer(uint8_t sta_id); -CDF_STATUS ol_txrx_change_peer_state(uint8_t sta_id, +QDF_STATUS ol_txrx_change_peer_state(uint8_t sta_id, enum ol_txrx_peer_state sta_state, bool roam_synch_in_progress); diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index a33771745a..e0ff7563c5 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -149,7 +149,7 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); struct ol_txrx_peer_t *peer; cdf_nbuf_t ret; - CDF_STATUS status; + QDF_STATUS status; if (cdf_unlikely(!pdev)) { CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, @@ -182,7 +182,7 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, } status = cdf_nbuf_map_single(cdf_ctx, skb, CDF_DMA_TO_DEVICE); - if (cdf_unlikely(status != CDF_STATUS_SUCCESS)) { + if (cdf_unlikely(status != QDF_STATUS_SUCCESS)) { CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, "%s: nbuf map failed", __func__); return skb; diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 6fd096a8b5..9e49c6dcf8 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -130,16 +130,16 @@ ol_txrx_find_peer_by_addr_and_vdev(ol_txrx_pdev_handle pdev, return peer; } -CDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id) +QDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id) { if (!peer) { CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "peer argument is null!!"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } *vdev_id = peer->vdev->vdev_id; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void *ol_txrx_get_vdev_by_sta_id(uint8_t sta_id) @@ -1263,7 +1263,7 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, bool drop) { struct ol_rx_cached_buf *cache_buf; - CDF_STATUS ret; + QDF_STATUS ret; ol_rx_callback_fp data_rx = NULL; void *cds_ctx = cds_get_global_context(); @@ -1291,7 +1291,7 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, } else { /* Flush the cached frames to HDD */ ret = data_rx(cds_ctx, cache_buf->buf, peer->local_id); - if (ret != CDF_STATUS_SUCCESS) + if (ret != QDF_STATUS_SUCCESS) cdf_nbuf_free(cache_buf->buf); } cdf_mem_free(cache_buf); @@ -1466,7 +1466,7 @@ static A_STATUS ol_tx_filter_pass_thru(struct ol_txrx_msdu_info_t *tx_msdu_info) return A_OK; } -CDF_STATUS +QDF_STATUS ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, enum ol_txrx_peer_state state) { @@ -1475,7 +1475,7 @@ ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, if (cdf_unlikely(!pdev)) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Pdev is NULL"); cdf_assert(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } peer = ol_txrx_peer_find_hash_find(pdev, peer_mac, 0, 1); @@ -1484,7 +1484,7 @@ ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, " 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", __FUNCTION__, peer_mac[0], peer_mac[1], peer_mac[2], peer_mac[3], peer_mac[4], peer_mac[5]); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* TODO: Should we send WMI command of the connection state? */ @@ -1496,7 +1496,7 @@ ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, __func__); #endif cdf_atomic_dec(&peer->ref_cnt); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2, "%s: change from %d to %d\n", @@ -1530,7 +1530,7 @@ ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, /* Set the state after the Pause to avoid the race condiction with ADDBA check in tx path */ peer->state = state; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void @@ -1886,18 +1886,18 @@ static void ol_txrx_dump_tx_desc(ol_txrx_pdev_handle pdev_handle) * queue doesn't empty before timeout occurs. * * Return: - * CDF_STATUS_SUCCESS if the queue empties, - * CDF_STATUS_E_TIMEOUT in case of timeout, - * CDF_STATUS_E_FAULT in case of missing handle + * QDF_STATUS_SUCCESS if the queue empties, + * QDF_STATUS_E_TIMEOUT in case of timeout, + * QDF_STATUS_E_FAULT in case of missing handle */ -CDF_STATUS ol_txrx_wait_for_pending_tx(int timeout) +QDF_STATUS ol_txrx_wait_for_pending_tx(int timeout) { ol_txrx_pdev_handle txrx_pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (txrx_pdev == NULL) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: txrx context is null", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } while (ol_txrx_get_tx_pending(txrx_pdev)) { @@ -1906,11 +1906,11 @@ CDF_STATUS ol_txrx_wait_for_pending_tx(int timeout) TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: tx frames are pending", __func__); ol_txrx_dump_tx_desc(txrx_pdev); - return CDF_STATUS_E_TIMEOUT; + return QDF_STATUS_E_TIMEOUT; } timeout = timeout - OL_ATH_TX_DRAIN_WAIT_DELAY; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifndef QCA_WIFI_3_0_EMU @@ -1924,9 +1924,9 @@ CDF_STATUS ol_txrx_wait_for_pending_tx(int timeout) * * Ensure that ol_txrx is ready for bus suspend * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS ol_txrx_bus_suspend(void) +QDF_STATUS ol_txrx_bus_suspend(void) { return ol_txrx_wait_for_pending_tx(SUSPEND_DRAIN_WAIT); } @@ -1936,11 +1936,11 @@ CDF_STATUS ol_txrx_bus_suspend(void) * * Dummy function for symetry * - * Return: CDF_STATUS_SUCCESS + * Return: QDF_STATUS_SUCCESS */ -CDF_STATUS ol_txrx_bus_resume(void) +QDF_STATUS ol_txrx_bus_resume(void) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } int ol_txrx_get_tx_pending(ol_txrx_pdev_handle pdev_handle) @@ -2990,7 +2990,7 @@ static void ol_rx_data_cb(struct ol_txrx_peer_t *peer, { void *cds_ctx = cds_get_global_context(); cdf_nbuf_t buf, next_buf; - CDF_STATUS ret; + QDF_STATUS ret; ol_rx_callback_fp data_rx = NULL; if (cdf_unlikely(!cds_ctx)) @@ -3017,7 +3017,7 @@ static void ol_rx_data_cb(struct ol_txrx_peer_t *peer, next_buf = cdf_nbuf_queue_next(buf); cdf_nbuf_set_next(buf, NULL); /* Add NULL terminator */ ret = data_rx(cds_ctx, buf, peer->local_id); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Frame Rx to HDD failed"); cdf_nbuf_free(buf); } @@ -3141,7 +3141,7 @@ drop_rx_buf: * * Return: CDF Status */ -CDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, +QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, struct ol_txrx_desc_type *sta_desc) { struct ol_txrx_peer_t *peer; @@ -3151,18 +3151,18 @@ CDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, if (!pdev) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Pdev is NULL"); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (sta_desc->sta_id >= WLAN_MAX_STA_COUNT) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Invalid sta id :%d", sta_desc->sta_id); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } peer = ol_txrx_peer_find_by_local_id(pdev, sta_desc->sta_id); if (!peer) - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; cdf_spin_lock_bh(&peer->peer_info_lock); peer->osif_rx = rxcb; @@ -3182,7 +3182,7 @@ CDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, } ol_txrx_flush_rx_frames(peer, 0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3191,7 +3191,7 @@ CDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, * * Return: CDF Status */ -CDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) +QDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) { struct ol_txrx_peer_t *peer; struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); @@ -3199,12 +3199,12 @@ CDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) if (!pdev) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Unable to find pdev!", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (sta_id >= WLAN_MAX_STA_COUNT) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Invalid sta id %d", sta_id); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } #ifdef QCA_CONFIG_SMP @@ -3218,7 +3218,7 @@ CDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) peer = ol_txrx_peer_find_by_local_id(pdev, sta_id); if (!peer) - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; /* Purge the cached rx frame queue */ ol_txrx_flush_rx_frames(peer, 1); @@ -3228,7 +3228,7 @@ CDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) peer->state = ol_txrx_peer_state_disc; cdf_spin_unlock_bh(&peer->peer_info_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3237,9 +3237,9 @@ CDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) * @mac_addr: MAC address of the self peer * @peer_id: Pointer to the peer ID * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr, +QDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr, uint8_t *peer_id) { ol_txrx_pdev_handle pdev; @@ -3248,21 +3248,21 @@ CDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr, if (!cds_ctx) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Invalid context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (!pdev) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Unable to find pdev!", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } peer = ol_txrx_find_peer_by_addr(pdev, mac_addr, peer_id); if (!peer) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Unable to find OCB peer!", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ol_txrx_set_ocb_peer(pdev, peer); @@ -3271,7 +3271,7 @@ CDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr, ol_txrx_peer_state_update(pdev, peer->mac_addr.raw, ol_txrx_peer_state_auth); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3324,15 +3324,15 @@ exit: * * Return: CDF status */ -CDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb) +QDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb) { struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (!pdev || !pause_cb) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "pdev or pause_cb is NULL"); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } pdev->pause_cb = pause_cb; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif diff --git a/core/dp/txrx/txrx.h b/core/dp/txrx/txrx.h index a9808f19be..7d2c03cc0e 100644 --- a/core/dp/txrx/txrx.h +++ b/core/dp/txrx/txrx.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -107,8 +107,8 @@ struct wlan_txrx_stats { struct ol_txrx_vdev_t; -CDF_STATUS wlan_register_mgmt_client(void *pdev_txrx, - CDF_STATUS (*rx_mgmt)(void *g_cdsctx, +QDF_STATUS wlan_register_mgmt_client(void *pdev_txrx, + QDF_STATUS (*rx_mgmt)(void *g_cdsctx, void *buf)); typedef void (*ol_txrx_vdev_delete_cb)(void *context); @@ -124,7 +124,7 @@ typedef void (*ol_txrx_mgmt_tx_cb)(void *ctxt, cdf_nbuf_t tx_mgmt_frm, int had_error); /* If RSSI realm is changed, send notification to Clients, SME, HDD */ -typedef CDF_STATUS (*wlan_txrx_rssi_cross_thresh)(void *adapter, u8 rssi, +typedef QDF_STATUS (*wlan_txrx_rssi_cross_thresh)(void *adapter, u8 rssi, void *usr_ctx, int8_t avg_rssi); diff --git a/core/hdd/inc/wlan_hdd_assoc.h b/core/hdd/inc/wlan_hdd_assoc.h index 3549c7b2d5..45f1a08e06 100644 --- a/core/hdd/inc/wlan_hdd_assoc.h +++ b/core/hdd/inc/wlan_hdd_assoc.h @@ -168,9 +168,9 @@ eCsrBand hdd_conn_get_connected_band(hdd_station_ctx_t *pHddStaCtx); * @roamStatus: roam status * @roamResult: roam result * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, +QDF_STATUS hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus roamStatus, eCsrRoamResult roamResult); @@ -214,9 +214,9 @@ int hdd_set_csr_auth_type(hdd_adapter_t *pAdapter, eCsrAuthType RSNAuthType); * Construct the staDesc and register with TL the new STA. * This is called as part of ADD_STA in the TDLS setup. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, const uint8_t *peerMac, uint16_t staId, uint8_t ucastSig); @@ -248,7 +248,7 @@ hdd_indicate_ese_bcn_report_no_results(const hdd_adapter_t *pAdapter, const uint8_t numBss); #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ -CDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, uint8_t sta_id, enum ol_txrx_peer_state sta_state, bool roam_synch_in_progress); diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index d02124b3fb..31929225b2 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -3569,32 +3569,32 @@ static __inline unsigned long util_min(unsigned long a, unsigned long b) } /* Function declarations and documenation */ -CDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx); -CDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx); -CDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx); -CDF_STATUS hdd_set_sme_chan_list(hdd_context_t *hdd_ctx); +QDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx); +QDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx); +QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx); +QDF_STATUS hdd_set_sme_chan_list(hdd_context_t *hdd_ctx); bool hdd_update_config_dat(hdd_context_t *pHddCtx); -CDF_STATUS hdd_cfg_get_global_config(hdd_context_t *pHddCtx, char *pBuf, +QDF_STATUS hdd_cfg_get_global_config(hdd_context_t *pHddCtx, char *pBuf, int buflen); eCsrPhyMode hdd_cfg_xlate_to_csr_phy_mode(eHddDot11Mode dot11Mode); -CDF_STATUS hdd_execute_global_config_command(hdd_context_t *pHddCtx, +QDF_STATUS hdd_execute_global_config_command(hdd_context_t *pHddCtx, char *command); bool hdd_is_okc_mode_enabled(hdd_context_t *pHddCtx); -CDF_STATUS hdd_set_idle_ps_config(hdd_context_t *pHddCtx, uint32_t val); +QDF_STATUS hdd_set_idle_ps_config(hdd_context_t *pHddCtx, uint32_t val); void hdd_update_tgt_cfg(void *context, void *param); bool hdd_dfs_indicate_radar(void *context, void *param); -CDF_STATUS hdd_string_to_u8_array(char *str, uint8_t *intArray, uint8_t *len, +QDF_STATUS hdd_string_to_u8_array(char *str, uint8_t *intArray, uint8_t *len, uint8_t intArrayMaxLen); -CDF_STATUS hdd_hex_string_to_u16_array(char *str, uint16_t *int_array, +QDF_STATUS hdd_hex_string_to_u16_array(char *str, uint16_t *int_array, uint8_t *len, uint8_t int_array_max_len); void hdd_cfg_print(hdd_context_t *pHddCtx); -CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss); +QDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss); #ifdef FEATURE_WLAN_SCAN_PNO void hdd_set_pno_channel_prediction_config( tpSmeConfigParams sme_config, hdd_context_t *hdd_ctx); diff --git a/core/hdd/inc/wlan_hdd_debugfs.h b/core/hdd/inc/wlan_hdd_debugfs.h index be513177f8..59f2f36238 100644 --- a/core/hdd/inc/wlan_hdd_debugfs.h +++ b/core/hdd/inc/wlan_hdd_debugfs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -29,12 +29,12 @@ #define _WLAN_HDD_DEBUGFS_H #ifdef WLAN_OPEN_SOURCE -CDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter); void hdd_debugfs_exit(hdd_context_t *pHddCtx); #else -inline CDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter) +inline QDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } inline void hdd_debugfs_exit(hdd_context_t *pHddCtx) diff --git a/core/hdd/inc/wlan_hdd_ftm.h b/core/hdd/inc/wlan_hdd_ftm.h index 0571dc5b95..90280d3775 100644 --- a/core/hdd/inc/wlan_hdd_ftm.h +++ b/core/hdd/inc/wlan_hdd_ftm.h @@ -34,7 +34,6 @@ * WLAN Host Device Driver Factory Test Mode header file */ -#include "cdf_status.h" #include "qdf_status.h" #include "cds_mq.h" #include "cds_api.h" @@ -60,7 +59,7 @@ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx); int wlan_hdd_ftm_close(hdd_context_t *hdd_ctx); #if defined(QCA_WIFI_FTM) -CDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len); +QDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len); int wlan_hdd_qcmbr_unified_ioctl(hdd_adapter_t *adapter, struct ifreq *ifr); int hdd_ftm_start(hdd_context_t *hdd_ctx); int hdd_ftm_stop(hdd_context_t *hdd_ctx); diff --git a/core/hdd/inc/wlan_hdd_ipa.h b/core/hdd/inc/wlan_hdd_ipa.h index d3c412548a..a7cabccedf 100644 --- a/core/hdd/inc/wlan_hdd_ipa.h +++ b/core/hdd/inc/wlan_hdd_ipa.h @@ -52,9 +52,9 @@ static inline hdd_ipa_nbuf_cb_fn wlan_hdd_stub_ipa_fn(void) return hdd_ipa_nbuf_cb; }; -CDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx); -CDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx); -CDF_STATUS hdd_ipa_process_rxt(void *cds_context, cdf_nbuf_t rxBuf, +QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx); +QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx); +QDF_STATUS hdd_ipa_process_rxt(void *cds_context, cdf_nbuf_t rxBuf, uint8_t sta_id); int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, enum ipa_wlan_event type, uint8_t *mac_addr); @@ -75,20 +75,20 @@ void hdd_ipa_uc_force_pipe_shutdown(hdd_context_t *hdd_ctx); struct sk_buff *hdd_ipa_tx_packet_ipa(hdd_context_t *hdd_ctx, struct sk_buff *skb, uint8_t session_id); #else -static inline CDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) +static inline QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) +static inline QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS hdd_ipa_process_rxt(void *cds_context, +static inline QDF_STATUS hdd_ipa_process_rxt(void *cds_context, cdf_nbuf_t rxBuf, uint8_t sta_id) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static inline int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 94145bba00..fb6a0eb517 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -674,7 +674,7 @@ typedef struct hdd_hostapd_state_s { int bssState; qdf_event_t cdf_event; qdf_event_t cdf_stop_bss_event; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; bool bCommit; } hdd_hostapd_state_t; @@ -899,7 +899,7 @@ struct hdd_adapter_s { struct completion tdls_del_station_comp; struct completion tdls_mgmt_comp; struct completion tdls_link_establish_req_comp; - CDF_STATUS tdlsAddStaStatus; + QDF_STATUS tdlsAddStaStatus; #endif /* Track whether the linkup handling is needed */ @@ -1343,43 +1343,43 @@ void wlan_hdd_check_sta_ap_concurrent_ch_intf(void *sta_pAdapter); const char *hdd_device_mode_to_string(uint8_t device_mode); -CDF_STATUS hdd_get_front_adapter(hdd_context_t *pHddCtx, +QDF_STATUS hdd_get_front_adapter(hdd_context_t *pHddCtx, hdd_adapter_list_node_t **ppAdapterNode); -CDF_STATUS hdd_get_next_adapter(hdd_context_t *pHddCtx, +QDF_STATUS hdd_get_next_adapter(hdd_context_t *pHddCtx, hdd_adapter_list_node_t *pAdapterNode, hdd_adapter_list_node_t **pNextAdapterNode); -CDF_STATUS hdd_remove_adapter(hdd_context_t *pHddCtx, +QDF_STATUS hdd_remove_adapter(hdd_context_t *pHddCtx, hdd_adapter_list_node_t *pAdapterNode); -CDF_STATUS hdd_remove_front_adapter(hdd_context_t *pHddCtx, +QDF_STATUS hdd_remove_front_adapter(hdd_context_t *pHddCtx, hdd_adapter_list_node_t **ppAdapterNode); -CDF_STATUS hdd_add_adapter_back(hdd_context_t *pHddCtx, +QDF_STATUS hdd_add_adapter_back(hdd_context_t *pHddCtx, hdd_adapter_list_node_t *pAdapterNode); -CDF_STATUS hdd_add_adapter_front(hdd_context_t *pHddCtx, +QDF_STATUS hdd_add_adapter_front(hdd_context_t *pHddCtx, hdd_adapter_list_node_t *pAdapterNode); hdd_adapter_t *hdd_open_adapter(hdd_context_t *pHddCtx, uint8_t session_type, const char *name, tSirMacAddr macAddr, bool rtnl_held); -CDF_STATUS hdd_close_adapter(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, +QDF_STATUS hdd_close_adapter(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, bool rtnl_held); -CDF_STATUS hdd_close_all_adapters(hdd_context_t *pHddCtx, bool rtnl_held); -CDF_STATUS hdd_stop_all_adapters(hdd_context_t *pHddCtx); -CDF_STATUS hdd_reset_all_adapters(hdd_context_t *pHddCtx); -CDF_STATUS hdd_start_all_adapters(hdd_context_t *pHddCtx); +QDF_STATUS hdd_close_all_adapters(hdd_context_t *pHddCtx, bool rtnl_held); +QDF_STATUS hdd_stop_all_adapters(hdd_context_t *pHddCtx); +QDF_STATUS hdd_reset_all_adapters(hdd_context_t *pHddCtx); +QDF_STATUS hdd_start_all_adapters(hdd_context_t *pHddCtx); hdd_adapter_t *hdd_get_adapter_by_vdev(hdd_context_t *pHddCtx, uint32_t vdev_id); hdd_adapter_t *hdd_get_adapter_by_macaddr(hdd_context_t *pHddCtx, tSirMacAddr macAddr); -CDF_STATUS hdd_init_station_mode(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_init_station_mode(hdd_adapter_t *pAdapter); hdd_adapter_t *hdd_get_adapter(hdd_context_t *pHddCtx, device_mode_t mode); void hdd_deinit_adapter(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, bool rtnl_held); -CDF_STATUS hdd_stop_adapter(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, +QDF_STATUS hdd_stop_adapter(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, const bool bCloseSession); void hdd_set_station_ops(struct net_device *pWlanDev); uint8_t *wlan_hdd_get_intf_addr(hdd_context_t *pHddCtx); @@ -1400,12 +1400,12 @@ void hdd_allow_suspend(uint32_t reason); void hdd_prevent_suspend_timeout(uint32_t timeout, uint32_t reason); void wlan_hdd_cfg80211_update_wiphy_caps(struct wiphy *wiphy); -CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *pAdapter); -CDF_STATUS wlan_hdd_restart_driver(hdd_context_t *pHddCtx); +QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *pAdapter); +QDF_STATUS wlan_hdd_restart_driver(hdd_context_t *pHddCtx); void hdd_exchange_version_and_caps(hdd_context_t *pHddCtx); int wlan_hdd_validate_context(hdd_context_t *pHddCtx); bool hdd_is_valid_mac_address(const uint8_t *pMacAddr); -CDF_STATUS hdd_issta_p2p_clientconnected(hdd_context_t *pHddCtx); +QDF_STATUS hdd_issta_p2p_clientconnected(hdd_context_t *pHddCtx); void hdd_checkandupdate_phymode(hdd_context_t *pHddCtx); @@ -1484,11 +1484,11 @@ void hdd_update_macaddr(struct hdd_config *config, void wlan_hdd_disable_roaming(hdd_adapter_t *pAdapter); void wlan_hdd_enable_roaming(hdd_adapter_t *pAdapter); -CDF_STATUS hdd_post_cds_enable_config(hdd_context_t *pHddCtx); +QDF_STATUS hdd_post_cds_enable_config(hdd_context_t *pHddCtx); -CDF_STATUS hdd_abort_mac_scan_all_adapters(hdd_context_t *hdd_ctx); +QDF_STATUS hdd_abort_mac_scan_all_adapters(hdd_context_t *hdd_ctx); -CDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, +QDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, hdd_adapter_t *ap_adapter, tCsrRoamProfile *roam_profile, tScanResultHandle *scan_cache, diff --git a/core/hdd/inc/wlan_hdd_power.h b/core/hdd/inc/wlan_hdd_power.h index df3a0d0ba3..2ce7f2dd29 100644 --- a/core/hdd/inc/wlan_hdd_power.h +++ b/core/hdd/inc/wlan_hdd_power.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014-2015 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. * @@ -128,11 +128,11 @@ struct pkt_filter_cfg { /* SSR shutdown & re-init functions */ -CDF_STATUS hdd_wlan_shutdown(void); -CDF_STATUS hdd_wlan_re_init(void *hif_sc); +QDF_STATUS hdd_wlan_shutdown(void); +QDF_STATUS hdd_wlan_re_init(void *hif_sc); void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter); -CDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable); +QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable); void hdd_conf_hostoffload(hdd_adapter_t *pAdapter, bool fenable); #ifdef WLAN_FEATURE_PACKET_FILTERING diff --git a/core/hdd/inc/wlan_hdd_softap_tx_rx.h b/core/hdd/inc/wlan_hdd_softap_tx_rx.h index 2061ec72c6..8d122c71a0 100644 --- a/core/hdd/inc/wlan_hdd_softap_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_softap_tx_rx.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -39,24 +39,24 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev); void hdd_softap_tx_timeout(struct net_device *dev); -CDF_STATUS hdd_softap_init_tx_rx(hdd_adapter_t *pAdapter); -CDF_STATUS hdd_softap_deinit_tx_rx(hdd_adapter_t *pAdapter); -CDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_init_tx_rx(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_softap_deinit_tx_rx(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, struct cdf_mac_addr *pmacAddrSTA); -CDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId); -CDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, +QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBufChain, uint8_t staId); #ifdef IPA_OFFLOAD -CDF_STATUS hdd_softap_rx_mul_packet_cbk(void *cds_context, +QDF_STATUS hdd_softap_rx_mul_packet_cbk(void *cds_context, cdf_nbuf_t rx_buf_list, uint8_t staId); #endif /* IPA_OFFLOAD */ -CDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId); -CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, bool fAuthRequired, bool fPrivacyBit, uint8_t staId, @@ -64,14 +64,14 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, uint8_t bcastSig, struct cdf_mac_addr *pPeerMacAddress, bool fWmmEnabled); -CDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter, bool fPrivacyBit); -CDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter); -CDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pHostapdAdapter); -CDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pHostapdAdapter); +QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, struct cdf_mac_addr *pDestMacAddress, enum ol_txrx_peer_state state); -CDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, struct cdf_mac_addr *pMacAddress, uint8_t *staId); diff --git a/core/hdd/inc/wlan_hdd_tx_rx.h b/core/hdd/inc/wlan_hdd_tx_rx.h index fc80851a14..7044844012 100644 --- a/core/hdd/inc/wlan_hdd_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_tx_rx.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -55,17 +55,17 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev); void hdd_tx_timeout(struct net_device *dev); -CDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter); -CDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter); -CDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBufChain, +QDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBufChain, uint8_t staId); #ifdef IPA_OFFLOAD -CDF_STATUS hdd_rx_mul_packet_cbk(void *cds_context, +QDF_STATUS hdd_rx_mul_packet_cbk(void *cds_context, cdf_nbuf_t rx_buf_list, uint8_t staId); #endif /* IPA_OFFLOAD */ -CDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, +QDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, struct cdf_mac_addr *pMacAddress, uint8_t *staId); diff --git a/core/hdd/inc/wlan_hdd_wext.h b/core/hdd/inc/wlan_hdd_wext.h index ca84c66672..809d4b4dd9 100644 --- a/core/hdd/inc/wlan_hdd_wext.h +++ b/core/hdd/inc/wlan_hdd_wext.h @@ -338,23 +338,23 @@ extern int hdd_priv_get_data(struct iw_point *p_priv_data, extern void *mem_alloc_copy_from_user_helper(const void *wrqu_data, size_t len); -extern CDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, +extern QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, struct cdf_mac_addr mac_address); void hdd_clear_roam_profile_ie(hdd_adapter_t *pAdapter); uint8_t *wlan_hdd_get_vendor_oui_ie_ptr(uint8_t *oui, uint8_t oui_size, uint8_t *ie, int ie_len); -CDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter); +QDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter); -CDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter); +QDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter); -CDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value); +QDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value); -CDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr); +QDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr); #ifdef FEATURE_WLAN_TDLS -CDF_STATUS iw_set_tdls_params(struct net_device *dev, +QDF_STATUS iw_set_tdls_params(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra, int nOffset); #endif diff --git a/core/hdd/inc/wlan_hdd_wmm.h b/core/hdd/inc/wlan_hdd_wmm.h index 864a1e73fc..b217165321 100644 --- a/core/hdd/inc/wlan_hdd_wmm.h +++ b/core/hdd/inc/wlan_hdd_wmm.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012,2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -223,9 +223,9 @@ int hdd_wmmps_helper(hdd_adapter_t *pAdapter, uint8_t *ptr); * adapter to an initial state. The configuration can later be * overwritten via application APIs or via QoS Map sent OTA. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter); /** * hdd_wmm_adapter_init() - initialize the WMM configuration of an adapter @@ -235,9 +235,9 @@ CDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter); * adapter to an initial state. The configuration can later be * overwritten via application APIs * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter); /** * hdd_wmm_close() - WMM close function @@ -246,9 +246,9 @@ CDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter); * Function which will perform any necessary work to to clean up the * WMM functionality prior to the kernel module unload. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter); /** * hdd_wmm_select_queue() - Function which will classify the packet @@ -301,9 +301,9 @@ void hdd_wmm_acquire_access_required(hdd_adapter_t *pAdapter, * @pGranted: [out] pointer to bool flag when indicates if access * has been granted or not * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, sme_ac_enum_type acType, bool *pGranted); /** @@ -314,9 +314,9 @@ CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, * @pRoamInfo: [in] pointer to roam information * @eBssType: [in] type of BSS * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, eCsrRoamBssType eBssType); /** @@ -327,9 +327,9 @@ CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, * @pRoamInfo: [in] pointer to roam information * @eBssType : [in] type of BSS * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, eCsrRoamBssType eBssType); /** @@ -339,9 +339,9 @@ CDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, * @pAdapter : [in] pointer to adapter context * @pUapsdMask: [out] pointer to where the UAPSD Mask is to be stored * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_get_uapsd_mask(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_get_uapsd_mask(hdd_adapter_t *pAdapter, uint8_t *pUapsdMask); /** @@ -396,9 +396,9 @@ hdd_wlan_wmm_status_e hdd_wmm_checkts(hdd_adapter_t *pAdapter, * * @pAdapter: [in] pointer to Adapter context * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter); void wlan_hdd_process_peer_unauthorised_pause(hdd_adapter_t *adapter); #endif /* #ifndef _WLAN_HDD_WMM_H */ diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index e8f6a317a2..211d092d10 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -917,12 +917,12 @@ static void hdd_conn_remove_connect_info(hdd_station_ctx_t *pHddStaCtx) * @pAdapter: pointer to adapter * @staId: station identifier * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS +static QDF_STATUS hdd_roam_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); if (eConnectionState_IbssDisconnected == @@ -933,13 +933,13 @@ hdd_roam_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) */ } - cdf_status = ol_txrx_clear_peer(staId); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = ol_txrx_clear_peer(staId); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("ol_txrx_clear_peer() failed for staID %d. Status(%d) [0x%08X]"), - staId, cdf_status, cdf_status); + staId, qdf_status, qdf_status); } - return cdf_status; + return qdf_status; } /** @@ -955,16 +955,16 @@ hdd_roam_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) * 2. Clean up internal connection states and data structures; * 3. Send disconnect indication to supplicant. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, +static QDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus roamStatus, eCsrRoamResult roamResult) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS vstatus; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS vstatus; struct net_device *dev = pAdapter->dev; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); @@ -973,7 +973,7 @@ static CDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, if (dev == NULL) { hddLog(LOGE, FL("net_dev is released return")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* notify apps that we can't pass traffic anymore */ hddLog(LOG1, FL("Disabling queues")); @@ -1083,10 +1083,10 @@ static CDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, uint8_t i; sta_id = pHddStaCtx->broadcast_ibss_staid; vstatus = hdd_roam_deregister_sta(pAdapter, sta_id); - if (!CDF_IS_STATUS_SUCCESS(vstatus)) { + if (!QDF_IS_STATUS_SUCCESS(vstatus)) { hdd_err("hdd_roam_deregister_sta() failed for staID %d Status=%d [0x%x]", sta_id, status, status); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } pHddCtx->sta_to_adapter[sta_id] = NULL; /* Clear all the peer sta register with TL. */ @@ -1096,11 +1096,11 @@ static CDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, sta_id = pHddStaCtx->conn_info.staId[i]; hddLog(LOG1, FL("Deregister StaID %d"), sta_id); vstatus = hdd_roam_deregister_sta(pAdapter, sta_id); - if (!CDF_IS_STATUS_SUCCESS(vstatus)) { + if (!QDF_IS_STATUS_SUCCESS(vstatus)) { hddLog(LOGE, FL("hdd_roamDeregisterSTA() failed to for staID %d. Status= %d [0x%x]"), sta_id, status, status); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } /* set the staid and peer mac as 0, all other * reset are done in hdd_connRemoveConnectInfo. @@ -1117,11 +1117,11 @@ static CDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, * for now, only one. */ vstatus = hdd_roam_deregister_sta(pAdapter, sta_id); - if (!CDF_IS_STATUS_SUCCESS(vstatus)) { + if (!QDF_IS_STATUS_SUCCESS(vstatus)) { hddLog(LOGE, FL("hdd_roam_deregister_sta() failed to for staID %d. Status= %d [0x%x]"), sta_id, status, status); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } pHddCtx->sta_to_adapter[sta_id] = NULL; } @@ -1181,38 +1181,38 @@ void hdd_set_peer_authorized_event(uint32_t vdev_id) * * Return: CDF status */ -CDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, uint8_t sta_id, enum ol_txrx_peer_state sta_state, bool roam_synch_in_progress) { struct ol_txrx_peer_t *peer; - CDF_STATUS err; + QDF_STATUS err; struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (!pdev) { hdd_err("Failed to get txrx context"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (sta_id >= WLAN_MAX_STA_COUNT) { hddLog(LOGE, "Invalid sta id :%d", sta_id); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } peer = ol_txrx_peer_find_by_local_id(pdev, sta_id); if (!peer) - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; err = ol_txrx_peer_state_update(pdev, (u_int8_t *) peer->mac_addr.raw, sta_state); - if (err != CDF_STATUS_SUCCESS) { + if (err != QDF_STATUS_SUCCESS) { hddLog(LOGE, "peer state update failed"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (roam_synch_in_progress) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; #endif if (sta_state == ol_txrx_peer_state_auth) { @@ -1224,9 +1224,9 @@ CDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, err = sme_set_peer_authorized(peer->mac_addr.raw, hdd_set_peer_authorized_event, pAdapter->sessionId); - if (err != CDF_STATUS_SUCCESS) { + if (err != QDF_STATUS_SUCCESS) { hddLog(LOGE, "Failed to set the peer state to authorized"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (pAdapter->device_mode == WLAN_HDD_INFRA_STATION || @@ -1247,7 +1247,7 @@ CDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, #endif } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1258,20 +1258,20 @@ CDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, * @pPeerMacAddress: peer MAC address * @pBssDesc: pointer to BSS description * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, +static QDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, uint8_t staId, struct cdf_mac_addr *pPeerMacAddress, tSirBssDescription *pBssDesc) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; struct ol_txrx_desc_type staDesc = { 0 }; hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); if (NULL == pBssDesc) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* Get the Station ID from the one saved during the association */ staDesc.sta_id = staId; @@ -1291,13 +1291,13 @@ static CDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, staDesc.is_wapi_supported = 0; #endif /* FEATURE_WLAN_WAPI */ - cdf_status = ol_txrx_register_peer(hdd_rx_packet_cbk, + qdf_status = ol_txrx_register_peer(hdd_rx_packet_cbk, &staDesc); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGW, "ol_txrx_register_peer() failed to register. Status=%d [0x%08X]", - cdf_status, cdf_status); - return cdf_status; + qdf_status, qdf_status); + return qdf_status; } if (!pRoamInfo->fAuthRequired) { @@ -1305,7 +1305,7 @@ static CDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, * Connections that do not need Upper layer auth, transition * TLSHIM directly to 'Authenticated' state */ - cdf_status = + qdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, ol_txrx_peer_state_auth, #ifdef WLAN_FEATURE_ROAM_OFFLOAD @@ -1320,7 +1320,7 @@ static CDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, hddLog(LOG3, "ULA auth StaId= %d. Changing TL state to CONNECTED at Join time", pHddStaCtx->conn_info.staId[0]); - cdf_status = + qdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, ol_txrx_peer_state_conn, #ifdef WLAN_FEATURE_ROAM_OFFLOAD @@ -1331,7 +1331,7 @@ static CDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, ); hdd_conn_set_authenticated(pAdapter, false); } - return cdf_status; + return qdf_status; } /** @@ -1541,9 +1541,9 @@ static int hdd_change_sta_state_authenticated(hdd_adapter_t *adapter, * @roamStatus: roam status * @roamResult: roam result * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, +static QDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus roamStatus, @@ -1551,13 +1551,13 @@ static CDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, { eCsrEncryptionType connectedCipherAlgo; bool fConnected = false; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); ENTER(); if (NULL == pRoamInfo) { hddLog(LOG2, FL("pRoamInfo is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* * if (WPA), tell TL to go to 'authenticated' after the keys are set. @@ -1579,11 +1579,11 @@ static CDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, pHddStaCtx->roam_info.roamingState = HDD_ROAM_STATE_NONE; } else { - cdf_status = hdd_ibss_get_sta_id( + qdf_status = hdd_ibss_get_sta_id( pHddStaCtx, &pRoamInfo->peerMac, &staId); - if (CDF_STATUS_SUCCESS == cdf_status) { + if (QDF_STATUS_SUCCESS == qdf_status) { hddLog(LOG2, "WLAN TL STA Ptk Installed for STAID=%d", staId); @@ -1623,11 +1623,11 @@ static CDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, eCSR_ENCRYPT_TYPE_WEP104_STATICKEY)) { if (pHddStaCtx->conn_info.gtk_installed && pHddStaCtx->conn_info.ptk_installed) - cdf_status = + qdf_status = hdd_change_sta_state_authenticated(pAdapter, pRoamInfo); } else if (pHddStaCtx->conn_info.ptk_installed) { - cdf_status = + qdf_status = hdd_change_sta_state_authenticated(pAdapter, pRoamInfo); } @@ -1650,7 +1650,7 @@ static CDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, } EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1661,7 +1661,7 @@ static CDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, */ void hdd_perform_roam_set_key_complete(hdd_adapter_t *pAdapter) { - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); tCsrRoamInfo roamInfo; roamInfo.fAuthRequired = false; @@ -1676,7 +1676,7 @@ void hdd_perform_roam_set_key_complete(hdd_adapter_t *pAdapter) pHddStaCtx->roam_info.roamId, pHddStaCtx->roam_info.roamStatus, eCSR_ROAM_RESULT_AUTHENTICATED); - if (cdf_ret_status != CDF_STATUS_SUCCESS) + if (cdf_ret_status != QDF_STATUS_SUCCESS) hddLog(LOGE, FL("Set Key complete failure")); pHddStaCtx->roam_info.deferKeyComplete = false; @@ -1690,9 +1690,9 @@ void hdd_perform_roam_set_key_complete(hdd_adapter_t *pAdapter) * @roamStatus: roam status * @roamResult: roam result * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, +static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus roamStatus, @@ -1701,7 +1701,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, struct net_device *dev = pAdapter->dev; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; uint8_t reqRsnIe[DOT11F_IE_RSN_MAX_LEN]; uint32_t reqRsnLength = DOT11F_IE_RSN_MAX_LEN; int ft_carrier_on = false; @@ -1710,7 +1710,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, if (!pHddCtx) { hdd_err("HDD context is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* HDD has initiated disconnect, do not send connect result indication @@ -1726,7 +1726,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, if (eCSR_ROAM_RESULT_ASSOCIATED == roamResult) { if (NULL == pRoamInfo) { hddLog(LOGE, FL("pRoamInfo is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!hddDisconInProgress) { hddLog(LOG1, FL("Set HDD connState to eConnectionState_Associated")); @@ -1853,7 +1853,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, wlan_hdd_netif_queue_control(pAdapter, WLAN_NETIF_CARRIER_OFF, WLAN_CONTROL_PATH); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pRoamInfo->u.pConnectedProfile->AuthType == eCSR_AUTH_TYPE_FT_RSN @@ -2083,7 +2083,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, /* * Register the Station with TL after associated */ - cdf_status = hdd_roam_register_sta(pAdapter, + qdf_status = hdd_roam_register_sta(pAdapter, pRoamInfo, pHddStaCtx-> conn_info. @@ -2107,7 +2107,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, reqRsnIe, reqRsnLength); /* Reassoc successfully */ if (pRoamInfo->fAuthRequired) { - cdf_status = + qdf_status = hdd_change_peer_state(pAdapter, pHddStaCtx->conn_info.staId[0], ol_txrx_peer_state_conn, @@ -2122,7 +2122,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, hddLog(LOG2, FL("staId: %d Changing TL state to AUTHENTICATED"), pHddStaCtx->conn_info.staId[0]); - cdf_status = + qdf_status = hdd_change_peer_state(pAdapter, pHddStaCtx->conn_info.staId[0], ol_txrx_peer_state_auth, @@ -2135,7 +2135,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, hdd_conn_set_authenticated(pAdapter, true); } - if (CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (QDF_IS_STATUS_SUCCESS(qdf_status)) { /* * Perform any WMM-related association * processing @@ -2155,10 +2155,10 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, WLAN_CONTROL_PATH); } - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, "STA register with TL failed. status(=%d) [%08X]", - cdf_status, cdf_status); + qdf_status, qdf_status); } #ifdef WLAN_FEATURE_11W cdf_mem_zero(&pAdapter->hdd_stats.hddPmfStats, @@ -2293,19 +2293,19 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, WLAN_CONTROL_PATH); } - if (CDF_STATUS_SUCCESS != cds_check_and_restart_sap( + if (QDF_STATUS_SUCCESS != cds_check_and_restart_sap( roamResult, pHddStaCtx)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (NULL != pRoamInfo && NULL != pRoamInfo->pBssDesc) { cds_force_sap_on_scc(roamResult, pRoamInfo->pBssDesc->channelId); } else { hdd_err("pRoamInfo profile is not set properly"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2561,9 +2561,9 @@ static bool roam_remove_ibss_station(hdd_adapter_t *pAdapter, uint8_t staId) * * We update the status of the IBSS to connected in this function. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS roam_ibss_connect_handler(hdd_adapter_t *pAdapter, +static QDF_STATUS roam_ibss_connect_handler(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo) { struct cfg80211_bss *bss; @@ -2585,13 +2585,13 @@ static CDF_STATUS roam_ibss_connect_handler(hdd_adapter_t *pAdapter, hddLog(LOGE, FL("%s: unable to create IBSS entry"), pAdapter->dev->name); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cfg80211_put_bss( WLAN_HDD_GET_CTX(pAdapter)->wiphy, bss); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2604,9 +2604,9 @@ static CDF_STATUS roam_ibss_connect_handler(hdd_adapter_t *pAdapter, * * This function indicates the Mic failure to the supplicant * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS +static QDF_STATUS hdd_roam_mic_error_indication_handler(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, uint32_t roamId, @@ -2652,7 +2652,7 @@ hdd_roam_mic_error_indication_handler(hdd_adapter_t *pAdapter, } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2665,16 +2665,16 @@ hdd_roam_mic_error_indication_handler(hdd_adapter_t *pAdapter, * * The Ibss connection status is updated regularly here in this function. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS +static QDF_STATUS roam_roam_connect_status_update_handler(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus roamStatus, eCsrRoamResult roamResult) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); switch (roamResult) { @@ -2702,15 +2702,15 @@ roam_roam_connect_status_update_handler(hdd_adapter_t *pAdapter, pHddCtx->sta_to_adapter[pRoamInfo->staId] = pAdapter; /* Register the Station with TL for the new peer. */ - cdf_status = hdd_roam_register_sta(pAdapter, + qdf_status = hdd_roam_register_sta(pAdapter, pRoamInfo, pRoamInfo->staId, &pRoamInfo->peerMac, pRoamInfo->pBssDesc); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, - "Cannot register STA with TL for IBSS. Failed with cdf_status = %d [%08X]", - cdf_status, cdf_status); + "Cannot register STA with TL for IBSS. Failed with qdf_status = %d [%08X]", + qdf_status, qdf_status); } pHddStaCtx->ibss_sta_generation++; memset(&staInfo, 0, sizeof(staInfo)); @@ -2737,18 +2737,18 @@ roam_roam_connect_status_update_handler(hdd_adapter_t *pAdapter, hddLog(LOG2, "New peer joined set PTK encType=%d", pHddStaCtx->ibss_enc_key.encType); - cdf_status = + qdf_status = sme_roam_set_key(WLAN_HDD_GET_HAL_CTX (pAdapter), pAdapter->sessionId, &pHddStaCtx->ibss_enc_key, &roamId); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { hddLog(LOGE, FL("sme_roam_set_key failed, status=%d"), - cdf_status); - return CDF_STATUS_E_FAILURE; + qdf_status); + return QDF_STATUS_E_FAILURE; } } hddLog(LOG1, FL("Enabling queues")); @@ -2814,7 +2814,7 @@ roam_roam_connect_status_update_handler(hdd_adapter_t *pAdapter, } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_WLAN_TDLS @@ -2828,13 +2828,13 @@ roam_roam_connect_status_update_handler(hdd_adapter_t *pAdapter, * Construct the staDesc and register with TL the new STA. * This is called as part of ADD_STA in the TDLS setup. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, const uint8_t *peerMac, uint16_t staId, uint8_t ucastSig) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; struct ol_txrx_desc_type staDesc = { 0 }; /* @@ -2849,15 +2849,15 @@ CDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, /* Register the Station with TL... */ - cdf_status = ol_txrx_register_peer(hdd_rx_packet_cbk, + qdf_status = ol_txrx_register_peer(hdd_rx_packet_cbk, &staDesc); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("ol_txrx_register_peer() failed to register. Status=%d [0x%08X]"), - cdf_status, cdf_status); - return cdf_status; + qdf_status, qdf_status); + return qdf_status; } - return cdf_status; + return qdf_status; } /** @@ -2865,18 +2865,18 @@ CDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, * @pAdapter: pointer to adapter * @staId: station identifier * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS hdd_roam_deregister_tdlssta(hdd_adapter_t *pAdapter, +static QDF_STATUS hdd_roam_deregister_tdlssta(hdd_adapter_t *pAdapter, uint8_t staId) { - CDF_STATUS cdf_status; - cdf_status = ol_txrx_clear_peer(staId); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + QDF_STATUS qdf_status; + qdf_status = ol_txrx_clear_peer(staId); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGW, FL("ol_txrx_clear_peer() failed for staID %d. Status=%d [0x%08X]"), - staId, cdf_status, cdf_status); + staId, qdf_status, qdf_status); } - return cdf_status; + return qdf_status; } /** @@ -2891,9 +2891,9 @@ static CDF_STATUS hdd_roam_deregister_tdlssta(hdd_adapter_t *pAdapter, * TL in case of new TDLS client is added and deregistration at the time * TDLS client is deleted. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS +static QDF_STATUS hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, uint32_t roamId, @@ -2903,7 +2903,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); tdlsCtx_t *pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter); tSmeTdlsPeerStateParams smeTdlsPeerStateParams; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint8_t staIdx; hddTdlsPeer_t *curr_peer; uint32_t reason; @@ -2978,7 +2978,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, peerMac, &pRoamInfo-> peerMac); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } } @@ -2991,7 +2991,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, staId)) { hddLog(LOGE, "wlan_hdd_tdls_set_sta_id() failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } (WLAN_HDD_GET_CTX(pAdapter))-> @@ -3008,7 +3008,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, pRoamInfo-> ucastSig); } else { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; hddLog(LOGE, FL("no available slot in conn_info. staId %d cannot be stored"), pRoamInfo->staId); @@ -3078,7 +3078,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, tdlsConnInfo[staIdx]. peerMac, CDF_MAC_ADDR_SIZE); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } } @@ -3096,7 +3096,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, pRoamInfo->peerMac.bytes, true); wlan_hdd_tdls_indicate_teardown(pAdapter, curr_peer, pRoamInfo->reasonCode); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } case eCSR_ROAM_RESULT_DELETE_ALL_TDLS_PEER_IND: @@ -3156,7 +3156,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, sme_update_tdls_peer_state( pHddCtx->hHal, &smeTdlsPeerStateParams); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("sme_update_tdls_peer_state failed for " MAC_ADDRESS_STR), @@ -3176,7 +3176,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, pHddCtx->tdlsConnInfo[staIdx]. sessionId = 255; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } break; @@ -3190,7 +3190,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, FL("concurrency detected. ignore SHOULD_DISCOVER concurrency_mode: 0x%x, active_sessions: %d"), pHddCtx->concurrency_mode, pHddCtx->no_of_active_sessions[CDF_STA_MODE]); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } @@ -3199,7 +3199,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, pRoamInfo->peerMac.bytes); if (!curr_peer) { hddLog(LOGE, FL("curr_peer is null")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { if (eTDLS_LINK_CONNECTED == curr_peer->link_status) { @@ -3218,7 +3218,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, hddLog(LOG2, FL ("TDLS ExternalControl enabled but curr_peer is not forced, ignore SHOULD_DISCOVER")); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } else { hddLog(LOG2, @@ -3232,7 +3232,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, wlan_hdd_tdls_pre_setup_init_work (pHddTdlsCtx, curr_peer); } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } break; } @@ -3244,7 +3244,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, pRoamInfo->peerMac.bytes, true); if (!curr_peer) { hddLog(LOGE, FL("curr_peer is null")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { if (eTDLS_LINK_CONNECTED == curr_peer->link_status) { @@ -3281,7 +3281,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, ("TDLS link is not connected, ignore SHOULD_TEARDOWN, reason: %d"), pRoamInfo->reasonCode); } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } break; } @@ -3293,7 +3293,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, pRoamInfo->peerMac.bytes, true); if (!curr_peer) { hddLog(LOGE, FL("curr_peer is null")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { if (eTDLS_LINK_CONNECTED == curr_peer->link_status) { @@ -3329,7 +3329,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, ("TDLS link is not connected, ignore SHOULD_PEER_DISCONNECTED, reason: %d"), pRoamInfo->reasonCode); } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } break; } @@ -3835,17 +3835,17 @@ static inline bool hdd_is_8021x_sha256_auth_type(hdd_station_ctx_t *pHddStaCtx) * @roamStatus: roam status * @roamResult: roam result * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS +QDF_STATUS hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus roamStatus, eCsrRoamResult roamResult) { - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; hdd_adapter_t *pAdapter = (hdd_adapter_t *) pContext; hdd_wext_state_t *pWextState = NULL; hdd_station_ctx_t *pHddStaCtx = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_context_t *pHddCtx = NULL; hddLog(LOG2, @@ -3855,7 +3855,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, /* Sanity check */ if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { hddLog(LOGP, "invalid adapter or adapter has invalid magic"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); @@ -3916,8 +3916,8 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, WLAN_CONTROL_PATH); status = hdd_roam_deregister_sta(pAdapter, pHddStaCtx->conn_info.staId[0]); - if (!CDF_IS_STATUS_SUCCESS(status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; pHddStaCtx->ft_carrier_on = true; pHddStaCtx->hdd_ReassocScenario = true; hddLog(LOG1, @@ -4075,39 +4075,39 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, #ifdef FEATURE_WLAN_LFR_METRICS case eCSR_ROAM_PREAUTH_INIT_NOTIFY: /* This event is to notify pre-auth initiation */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_cfg80211_roam_metrics_preauth(pAdapter, pRoamInfo)) { - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case eCSR_ROAM_PREAUTH_STATUS_SUCCESS: /* * This event will notify pre-auth completion in case of success */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_cfg80211_roam_metrics_preauth_status(pAdapter, pRoamInfo, 1)) { - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case eCSR_ROAM_PREAUTH_STATUS_FAILURE: /* * This event will notify pre-auth completion incase of failure. */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_cfg80211_roam_metrics_preauth_status(pAdapter, pRoamInfo, 0)) { - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case eCSR_ROAM_HANDOVER_SUCCESS: /* This event is to notify handover success. It will be only invoked on success */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_cfg80211_roam_metrics_handover(pAdapter, pRoamInfo)) { - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; #endif @@ -4321,7 +4321,7 @@ static int32_t hdd_process_genie(hdd_adapter_t *pAdapter, uint16_t gen_ie_len, uint8_t *gen_ie) { tHalHandle halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter); - CDF_STATUS result; + QDF_STATUS result; tDot11fIERSN dot11RSNIE; tDot11fIEWPA dot11WPAIE; uint32_t i; @@ -4723,14 +4723,14 @@ static int __iw_set_essid(struct net_device *dev, if (hdd_conn_get_connected_bss_type(pHddStaCtx, &connectedBssType) || (eMib_dot11DesiredBssType_independent == pHddStaCtx->conn_info.connDot11DesiredBssType)) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; /* Need to issue a disconnect to CSR. */ INIT_COMPLETION(pAdapter->disconnect_comp_var); - cdf_status = sme_roam_disconnect(hHal, pAdapter->sessionId, + qdf_status = sme_roam_disconnect(hHal, pAdapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); - if (CDF_STATUS_SUCCESS == cdf_status) { + if (QDF_STATUS_SUCCESS == qdf_status) { rc = wait_for_completion_timeout(&pAdapter-> disconnect_comp_var, msecs_to_jiffies @@ -4751,7 +4751,7 @@ static int __iw_set_essid(struct net_device *dev, status = hdd_wmm_get_uapsd_mask(pAdapter, &pWextState->roamProfile.uapsd_mask); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) pWextState->roamProfile.uapsd_mask = 0; pWextState->roamProfile.SSIDs.numOfSSIDs = 1; diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index dc76115a48..194af13edd 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -3766,10 +3766,10 @@ static char *i_trim(char *str) * @pBuf: buffer to store the configuration * @buflen: size of the buffer * - * Return: CDF_STATUS_SUCCESS if the configuration and buffer size can carry - * the content, otherwise CDF_STATUS_E_RESOURCES + * Return: QDF_STATUS_SUCCESS if the configuration and buffer size can carry + * the content, otherwise QDF_STATUS_E_RESOURCES */ -static CDF_STATUS hdd_cfg_get_config(REG_TABLE_ENTRY *reg_table, +static QDF_STATUS hdd_cfg_get_config(REG_TABLE_ENTRY *reg_table, unsigned long cRegTableEntries, uint8_t *ini_struct, hdd_context_t *pHddCtx, char *pBuf, @@ -3842,7 +3842,7 @@ static CDF_STATUS hdd_cfg_get_config(REG_TABLE_ENTRY *reg_table, buflen -= curlen; } else { /* buffer space exhausted, return what we have */ - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } #else printk(KERN_INFO "%s", configStr); @@ -3855,7 +3855,7 @@ static CDF_STATUS hdd_cfg_get_config(REG_TABLE_ENTRY *reg_table, snprintf(pCur, buflen, "WLAN configuration written to system log"); #endif /* RETURN_IN_BUFFER */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** struct tCfgIniEntry - ini configuration entry @@ -3875,13 +3875,13 @@ typedef struct { * @name: the interested configuration to find * @value: the value to read back * - * Return: CDF_STATUS_SUCCESS if the interested configuration is found, - * otherwise CDF_STATUS_E_FAILURE + * Return: QDF_STATUS_SUCCESS if the interested configuration is found, + * otherwise QDF_STATUS_E_FAILURE */ -static CDF_STATUS find_cfg_item(tCfgIniEntry *iniTable, unsigned long entries, +static QDF_STATUS find_cfg_item(tCfgIniEntry *iniTable, unsigned long entries, char *name, char **value) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; unsigned long i; for (i = 0; i < entries; i++) { @@ -3890,7 +3890,7 @@ static CDF_STATUS find_cfg_item(tCfgIniEntry *iniTable, unsigned long entries, CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Found %s entry for Name=[%s] Value=[%s] ", WLAN_INI_FILE, name, *value); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } @@ -3959,15 +3959,15 @@ static void update_mac_from_string(hdd_context_t *pHddCtx, * @entries: number fo the configuration entries * It overwrites the MAC address if config file exist. * - * Return: CDF_STATUS_SUCCESS if the ini configuration file is correctly parsed, - * otherwise CDF_STATUS_E_INVAL + * Return: QDF_STATUS_SUCCESS if the ini configuration file is correctly parsed, + * otherwise QDF_STATUS_E_INVAL */ -static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, +static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, tCfgIniEntry *iniTable, unsigned long entries) { - CDF_STATUS match_status = CDF_STATUS_E_FAILURE; - CDF_STATUS ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS match_status = QDF_STATUS_E_FAILURE; + QDF_STATUS ret_status = QDF_STATUS_SUCCESS; unsigned int idx; void *pField; char *value_str = NULL; @@ -3996,13 +3996,13 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, find_cfg_item(iniTable, entries, pRegEntry->RegName, &value_str); - if ((match_status != CDF_STATUS_SUCCESS) + if ((match_status != QDF_STATUS_SUCCESS) && (pRegEntry->Flags & VAR_FLAGS_REQUIRED)) { /* If we could not read the cfg item and it is required, this is an error. */ hddLog(LOGE, "%s: Failed to read required config parameter %s", __func__, pRegEntry->RegName); - ret_status = CDF_STATUS_E_FAILURE; + ret_status = QDF_STATUS_E_FAILURE; break; } @@ -4011,7 +4011,7 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, /* If successfully read from the registry, use the value read. * If not, use the default value. */ - if (match_status == CDF_STATUS_SUCCESS + if (match_status == QDF_STATUS_SUCCESS && (WLAN_PARAM_Integer == pRegEntry->RegType)) { rv = kstrtou32(value_str, 10, &value); if (rv < 0) { @@ -4020,7 +4020,7 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, __func__, pRegEntry->RegName); value = pRegEntry->VarDefault; } - } else if (match_status == CDF_STATUS_SUCCESS + } else if (match_status == QDF_STATUS_SUCCESS && (WLAN_PARAM_HexInteger == pRegEntry->RegType)) { rv = kstrtou32(value_str, 16, &value); @@ -4079,7 +4079,7 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, /* If successfully read from the registry, use the value read. * If not, use the default value. */ - if (CDF_STATUS_SUCCESS == match_status) { + if (QDF_STATUS_SUCCESS == match_status) { rv = kstrtos32(value_str, 10, &svalue); if (rv < 0) { hddLog(CDF_TRACE_LEVEL_WARN, @@ -4149,7 +4149,7 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, (char *)pRegEntry->VarDefault); #endif - if (match_status == CDF_STATUS_SUCCESS) { + if (match_status == QDF_STATUS_SUCCESS) { len_value_str = strlen(value_str); if (len_value_str > (pRegEntry->VarSize - 1)) { @@ -4192,7 +4192,7 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, continue; } candidate = (char *)pRegEntry->VarDefault; - if (match_status == CDF_STATUS_SUCCESS) { + if (match_status == QDF_STATUS_SUCCESS) { len_value_str = strlen(value_str); if (len_value_str != (CDF_MAC_ADDR_SIZE * 2)) { hddLog(LOGE, @@ -4217,7 +4217,7 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, } /* did we successfully parse a cfg item for this parameter? */ - if ((match_status == CDF_STATUS_SUCCESS) && + if ((match_status == QDF_STATUS_SUCCESS) && (idx < MAX_CFG_INI_ITEMS)) { set_bit(idx, (void *)&pHddCtx->config->bExplicitCfg); } @@ -4234,10 +4234,10 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, * @pHddCtx: the pointer to hdd context * @command: the command to run * - * Return: CDF_STATUS_SUCCESS if the command is found and able to execute, - * otherwise the appropriate CDF_STATUS will be returned + * Return: QDF_STATUS_SUCCESS if the command is found and able to execute, + * otherwise the appropriate QDF_STATUS will be returned */ -static CDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table, +static QDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table, unsigned long tableSize, uint8_t *ini_struct, hdd_context_t *pHddCtx, @@ -4254,11 +4254,11 @@ static CDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table, size_t len_value_str; unsigned int idx; unsigned int i; - CDF_STATUS vstatus; + QDF_STATUS vstatus; int rv; /* assume failure until proven otherwise */ - vstatus = CDF_STATUS_E_FAILURE; + vstatus = QDF_STATUS_E_FAILURE; /* clone the command so that we can manipulate it */ clone = kstrdup(command, GFP_ATOMIC); @@ -4329,7 +4329,7 @@ static CDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table, /* does not support dynamic configuration */ hddLog(LOGE, "%s: Global_Registry_Table.%s does not support " "dynamic configuration", __func__, name); - vstatus = CDF_STATUS_E_PERM; + vstatus = QDF_STATUS_E_PERM; goto done; } @@ -4438,7 +4438,7 @@ static CDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table, } /* if we get here, we had a successful modification */ - vstatus = CDF_STATUS_SUCCESS; + vstatus = QDF_STATUS_SUCCESS; /* config table has been modified, is there a notifier? */ if (NULL != pRegEntry->pfnDynamicnotify) { @@ -5241,10 +5241,10 @@ void hdd_cfg_print(hdd_context_t *pHddCtx) * * It overwrites the MAC address if config file exist. * - * Return: CDF_STATUS_SUCCESS if the MAC address is found from cfg file - * and overwritten, otherwise CDF_STATUS_E_INVAL + * Return: QDF_STATUS_SUCCESS if the MAC address is found from cfg file + * and overwritten, otherwise QDF_STATUS_E_INVAL */ -CDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) +QDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) { int status, i = 0; const struct firmware *fw = NULL; @@ -5253,7 +5253,7 @@ CDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) tCfgIniEntry macTable[CDF_MAX_CONCURRENCY_PERSONA]; tSirMacAddr customMacAddr; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; memset(macTable, 0, sizeof(macTable)); status = request_firmware(&fw, WLAN_MAC_FILE, pHddCtx->parent_dev); @@ -5261,12 +5261,12 @@ CDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) if (status) { hddLog(CDF_TRACE_LEVEL_WARN, "%s: request_firmware failed %d", __func__, status); - cdf_status = CDF_STATUS_E_FAILURE; - return cdf_status; + qdf_status = QDF_STATUS_E_FAILURE; + return qdf_status; } if (!fw || !fw->data || !fw->size) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: invalid firmware", __func__); - cdf_status = CDF_STATUS_E_INVAL; + qdf_status = QDF_STATUS_E_INVAL; goto config_exit; } @@ -5313,7 +5313,7 @@ CDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) hddLog(CDF_TRACE_LEVEL_ERROR, "%s: invalid number of Mac address provided, nMac = %d", __func__, i); - cdf_status = CDF_STATUS_E_INVAL; + qdf_status = QDF_STATUS_E_INVAL; goto config_exit; } @@ -5326,7 +5326,7 @@ CDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) config_exit: release_firmware(fw); - return cdf_status; + return qdf_status; } /** @@ -5336,10 +5336,10 @@ config_exit: * This function reads the qcom_cfg.ini file and * parses each 'Name=Value' pair in the ini file * - * Return: CDF_STATUS_SUCCESS if the qcom_cfg.ini is correctly read, - * otherwise CDF_STATUS_E_INVAL + * Return: QDF_STATUS_SUCCESS if the qcom_cfg.ini is correctly read, + * otherwise QDF_STATUS_E_INVAL */ -CDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) +QDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) { int status, i = 0; /** Pointer for firmware image data */ @@ -5349,7 +5349,7 @@ CDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) char *name, *value; /* cfgIniTable is static to avoid excess stack usage */ static tCfgIniEntry cfgIniTable[MAX_CFG_INI_ITEMS]; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; memset(cfgIniTable, 0, sizeof(cfgIniTable)); @@ -5358,13 +5358,13 @@ CDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) if (status) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: request_firmware failed %d", __func__, status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto config_exit; } if (!fw || !fw->data || !fw->size) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: %s download failed", __func__, WLAN_INI_FILE); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto config_exit; } @@ -5375,7 +5375,7 @@ CDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) if (NULL == buffer) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("cdf_mem_malloc failure")); release_firmware(fw); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pTemp = buffer; @@ -5426,9 +5426,9 @@ CDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) } /* Loop through the registry table and apply all these configs */ - cdf_status = hdd_apply_cfg_ini(pHddCtx, cfgIniTable, i); + qdf_status = hdd_apply_cfg_ini(pHddCtx, cfgIniTable, i); #ifdef FEATURE_NAPI - if (CDF_STATUS_SUCCESS == cdf_status) + if (QDF_STATUS_SUCCESS == qdf_status) hdd_napi_event(NAPI_EVT_INI_FILE, (void *)pHddCtx->config->napi_enable); #endif /* FEATURE_NAPI */ @@ -5436,7 +5436,7 @@ CDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) config_exit: release_firmware(fw); cdf_mem_free(pTemp); - return cdf_status; + return qdf_status; } /** @@ -5489,18 +5489,18 @@ eCsrPhyMode hdd_cfg_xlate_to_csr_phy_mode(eHddDot11Mode dot11Mode) * @pHddCtx: the pointer to hdd context * @val: the value to configure * - * Return: CDF_STATUS_SUCCESS if command set correctly, - * otherwise the CDF_STATUS return from SME layer + * Return: QDF_STATUS_SUCCESS if command set correctly, + * otherwise the QDF_STATUS return from SME layer */ -CDF_STATUS hdd_set_idle_ps_config(hdd_context_t *pHddCtx, uint32_t val) +QDF_STATUS hdd_set_idle_ps_config(hdd_context_t *pHddCtx, uint32_t val) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hddLog(LOG1, "hdd_set_idle_ps_config: Enter Val %d", val); status = sme_set_idle_powersave_config(pHddCtx->pcds_context, pHddCtx->hHal, val); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) hddLog(LOGE, "Fail to Set Idle PS Config val %d", val); return status; } @@ -5544,16 +5544,16 @@ static void hdd_set_fine_time_meas_cap(hdd_context_t *hdd_ctx, * This API is called to convert string (each byte separated by * a comma) into an u8 array * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS hdd_convert_string_to_array(char *str, uint8_t *array, +static QDF_STATUS hdd_convert_string_to_array(char *str, uint8_t *array, uint8_t *len, uint8_t array_max_len, bool to_hex) { char *format, *s = str; if (str == NULL || array == NULL || len == NULL) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; format = (to_hex) ? "%02x" : "%d"; @@ -5573,7 +5573,7 @@ static CDF_STATUS hdd_convert_string_to_array(char *str, uint8_t *array, s++; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5586,9 +5586,9 @@ static CDF_STATUS hdd_convert_string_to_array(char *str, uint8_t *array, * This API is called to convert hexadecimal string (each byte separated by * a comma) into an u8 array * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS hdd_hex_string_to_u8_array(char *str, uint8_t *hex_array, +QDF_STATUS hdd_hex_string_to_u8_array(char *str, uint8_t *hex_array, uint8_t *len, uint8_t array_max_len) { return hdd_convert_string_to_array(str, hex_array, len, @@ -5605,10 +5605,10 @@ CDF_STATUS hdd_hex_string_to_u8_array(char *str, uint8_t *hex_array, * This API is called to convert decimal string (each byte separated by * a comma) into an u8 array * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS hdd_string_to_u8_array(char *str, uint8_t *array, +QDF_STATUS hdd_string_to_u8_array(char *str, uint8_t *array, uint8_t *len, uint8_t array_max_len) { return hdd_convert_string_to_array(str, array, len, @@ -5621,8 +5621,8 @@ CDF_STATUS hdd_string_to_u8_array(char *str, uint8_t *array, * @intArray: the pointer of buffer to store the u8 value * @len: size of the buffer * - * Return: CDF_STATUS_SUCCESS if the configuration could be updated corectly, - * otherwise CDF_STATUS_E_INVAL + * Return: QDF_STATUS_SUCCESS if the configuration could be updated corectly, + * otherwise QDF_STATUS_E_INVAL */ bool hdd_update_config_dat(hdd_context_t *pHddCtx) { @@ -5635,20 +5635,20 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_SHORT_GI_20MHZ, pConfig->ShortGI20MhzEnable) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_SHORT_GI_20MHZ to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_FIXED_RATE, pConfig->TxRate) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_FIXED_RATE to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_MAX_RX_AMPDU_FACTOR, pConfig->MaxRxAmpduFactor) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_HT_AMPDU_PARAMS_MAX_RX_AMPDU_FACTOR to CFG"); @@ -5656,7 +5656,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_MPDU_DENSITY, pConfig->ht_mpdu_density) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_MPDU_DENSITY to CFG"); @@ -5664,7 +5664,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_SHORT_PREAMBLE, - pConfig->fIsShortPreamble) == CDF_STATUS_E_FAILURE) { + pConfig->fIsShortPreamble) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_SHORT_PREAMBLE to CFG"); @@ -5673,7 +5673,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME, pConfig->nPassiveMinChnTime) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME" @@ -5683,7 +5683,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME, pConfig->nPassiveMaxChnTime) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME" @@ -5692,7 +5692,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_BEACON_INTERVAL, - pConfig->nBeaconInterval) == CDF_STATUS_E_FAILURE) { + pConfig->nBeaconInterval) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_BEACON_INTERVAL to CFG"); @@ -5700,21 +5700,21 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_MAX_PS_POLL, - pConfig->nMaxPsPoll) == CDF_STATUS_E_FAILURE) { + pConfig->nMaxPsPoll) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_MAX_PS_POLL to CFG"); } if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_CURRENT_RX_ANTENNA, - pConfig->nRxAnt) == CDF_STATUS_E_FAILURE) { + pConfig->nRxAnt) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_CURRENT_RX_ANTENNA to CFG"); } if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_LOW_GAIN_OVERRIDE, - pConfig->fIsLowGainOverride) == CDF_STATUS_E_FAILURE) { + pConfig->fIsLowGainOverride) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_LOW_GAIN_OVERRIDE to HAL"); @@ -5722,7 +5722,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_RSSI_FILTER_PERIOD, - pConfig->nRssiFilterPeriod) == CDF_STATUS_E_FAILURE) { + pConfig->nRssiFilterPeriod) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_RSSI_FILTER_PERIOD to CFG"); @@ -5730,7 +5730,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_IGNORE_DTIM, - pConfig->fIgnoreDtim) == CDF_STATUS_E_FAILURE) { + pConfig->fIgnoreDtim) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_IGNORE_DTIM to CFG"); @@ -5739,7 +5739,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_PS_ENABLE_HEART_BEAT, pConfig->fEnableFwHeartBeatMonitoring) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_PS_HEART_BEAT to CFG"); @@ -5748,7 +5748,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_PS_ENABLE_BCN_FILTER, pConfig->fEnableFwBeaconFiltering) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_PS_BCN_FILTER to CFG"); @@ -5757,7 +5757,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_PS_ENABLE_RSSI_MONITOR, pConfig->fEnableFwRssiMonitoring) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_PS_RSSI_MONITOR to CFG"); @@ -5765,7 +5765,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT, - pConfig->nDataInactivityTimeout) == CDF_STATUS_E_FAILURE) { + pConfig->nDataInactivityTimeout) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT to CFG"); @@ -5773,7 +5773,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_ENABLE_LTE_COEX, - pConfig->enableLTECoex) == CDF_STATUS_E_FAILURE) { + pConfig->enableLTECoex) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_LTE_COEX to CFG"); @@ -5781,7 +5781,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE, - pConfig->nEnableListenMode) == CDF_STATUS_E_FAILURE) { + pConfig->nEnableListenMode) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE to CFG"); @@ -5789,7 +5789,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_AP_KEEP_ALIVE_TIMEOUT, - pConfig->apKeepAlivePeriod) == CDF_STATUS_E_FAILURE) { + pConfig->apKeepAlivePeriod) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_AP_KEEP_ALIVE_TIMEOUT to CFG"); @@ -5797,7 +5797,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_GO_KEEP_ALIVE_TIMEOUT, - pConfig->goKeepAlivePeriod) == CDF_STATUS_E_FAILURE) { + pConfig->goKeepAlivePeriod) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_GO_KEEP_ALIVE_TIMEOUT to CFG"); @@ -5805,7 +5805,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_AP_LINK_MONITOR_TIMEOUT, - pConfig->apLinkMonitorPeriod) == CDF_STATUS_E_FAILURE) { + pConfig->apLinkMonitorPeriod) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_AP_LINK_MONITOR_TIMEOUT to CFG"); @@ -5813,7 +5813,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_GO_LINK_MONITOR_TIMEOUT, - pConfig->goLinkMonitorPeriod) == CDF_STATUS_E_FAILURE) { + pConfig->goLinkMonitorPeriod) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_GO_LINK_MONITOR_TIMEOUT to CFG"); @@ -5822,7 +5822,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) #if defined WLAN_FEATURE_VOWIFI if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_MCAST_BCAST_FILTER_SETTING, - pConfig->mcastBcastFilterSetting) == CDF_STATUS_E_FAILURE) + pConfig->mcastBcastFilterSetting) == QDF_STATUS_E_FAILURE) fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_MCAST_BCAST_FILTER_SETTING to CFG"); @@ -5830,7 +5830,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_SINGLE_TID_RC, - pConfig->bSingleTidRc) == CDF_STATUS_E_FAILURE) { + pConfig->bSingleTidRc) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_SINGLE_TID_RC to CFG"); @@ -5838,7 +5838,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_TELE_BCN_WAKEUP_EN, - pConfig->teleBcnWakeupEn) == CDF_STATUS_E_FAILURE) { + pConfig->teleBcnWakeupEn) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TELE_BCN_WAKEUP_EN to CFG"); @@ -5847,7 +5847,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_TELE_BCN_TRANS_LI, pConfig->nTeleBcnTransListenInterval) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TELE_BCN_TRANS_LI to CFG"); @@ -5856,7 +5856,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_TELE_BCN_MAX_LI, pConfig->nTeleBcnMaxListenInterval) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TELE_BCN_MAX_LI to CFG"); @@ -5865,7 +5865,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS, pConfig->nTeleBcnTransLiNumIdleBeacons) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS to CFG"); @@ -5874,7 +5874,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS, pConfig->nTeleBcnMaxLiNumIdleBeacons) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS to CFG"); @@ -5882,7 +5882,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_RF_SETTLING_TIME_CLK, - pConfig->rfSettlingTimeUs) == CDF_STATUS_E_FAILURE) { + pConfig->rfSettlingTimeUs) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_RF_SETTLING_TIME_CLK to CFG"); @@ -5891,14 +5891,14 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD, pConfig->infraStaKeepAlivePeriod) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD to CFG"); } if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_DYNAMIC_PS_POLL_VALUE, - pConfig->dynamicPsPollValue) == CDF_STATUS_E_FAILURE) { + pConfig->dynamicPsPollValue) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_DYNAMIC_PS_POLL_VALUE to CFG"); @@ -5906,7 +5906,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT, - pConfig->nNullDataApRespTimeout) == CDF_STATUS_E_FAILURE) { + pConfig->nNullDataApRespTimeout) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_PS_NULLDATA_DELAY_TIMEOUT to CFG"); @@ -5915,21 +5915,21 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD, pConfig->apDataAvailPollPeriodInMs) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD to CFG"); } if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, - pConfig->FragmentationThreshold) == CDF_STATUS_E_FAILURE) { + pConfig->FragmentationThreshold) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_FRAGMENTATION_THRESHOLD to CFG"); } if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_RTS_THRESHOLD, - pConfig->RTSThreshold) == CDF_STATUS_E_FAILURE) { + pConfig->RTSThreshold) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_RTS_THRESHOLD to CFG"); @@ -5937,7 +5937,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_11D_ENABLED, - pConfig->Is11dSupportEnabled) == CDF_STATUS_E_FAILURE) { + pConfig->Is11dSupportEnabled) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_11D_ENABLED to CFG"); @@ -5945,7 +5945,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_DFS_MASTER_ENABLED, pConfig->enableDFSMasterCap) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Failure: Could not set value for WNI_CFG_DFS_MASTER_ENABLED"); @@ -5953,7 +5953,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_ENABLE_TXBF_20MHZ, pConfig->enableTxBFin20MHz) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not set value for WNI_CFG_VHT_ENABLE_TXBF_20MHZ"); @@ -5961,7 +5961,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_HEART_BEAT_THRESHOLD, - pConfig->HeartbeatThresh24) == CDF_STATUS_E_FAILURE) { + pConfig->HeartbeatThresh24) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_HEART_BEAT_THRESHOLD to CFG"); @@ -5970,7 +5970,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD, pConfig->apDataAvailPollPeriodInMs) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD to CFG"); @@ -5978,7 +5978,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_ENABLE_CLOSE_LOOP, pConfig->enableCloseLoop) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_CLOSE_LOOP to CFG"); @@ -5986,7 +5986,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_TX_PWR_CTRL_ENABLE, pConfig->enableAutomaticTxPowerControl) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TX_PWR_CTRL_ENABLE to CFG"); @@ -5994,14 +5994,14 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_SHORT_GI_40MHZ, pConfig->ShortGI40MhzEnable) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_SHORT_GI_40MHZ to CFG"); } if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_ENABLE_MC_ADDR_LIST, - pConfig->fEnableMCAddrList) == CDF_STATUS_E_FAILURE) { + pConfig->fEnableMCAddrList) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_MC_ADDR_LIST to CFG"); @@ -6023,7 +6023,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) temp = (temp & 0xFFF3) | (pConfig->vhtRxMCS2x2 << 2); if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_BASIC_MCS_SET, temp) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_BASIC_MCS_SET to CFG"); @@ -6036,7 +6036,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) temp = (temp & 0xFFF3) | (pConfig->vhtRxMCS2x2 << 2); if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_RX_MCS_MAP, temp) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_RX_MCS_MAP to CFG"); @@ -6051,7 +6051,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) pConfig->enable2x2); if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_TX_MCS_MAP, - temp) == CDF_STATUS_E_FAILURE) { + temp) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_TX_MCS_MAP to CFG"); @@ -6060,7 +6060,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_VHT_SHORT_GI_80MHZ, pConfig->ShortGI40MhzEnable) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass WNI_VHT_SHORT_GI_80MHZ to CFG"); @@ -6070,7 +6070,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_AMPDU_LEN_EXPONENT, pConfig->fVhtAmpduLenExponent) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_AMPDU_LEN_EXPONENT to CFG"); @@ -6084,7 +6084,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_MU_BEAMFORMEE_CAP, pConfig->enableMuBformee - ) == CDF_STATUS_E_FAILURE) { + ) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_MU_BEAMFORMEE_CAP to CFG"); @@ -6092,7 +6092,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) } } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_MAX_MPDU_LENGTH, - pConfig->vhtMpduLen) == CDF_STATUS_E_FAILURE) { + pConfig->vhtMpduLen) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_MAX_MPDU_LENGTH to CFG"); @@ -6102,14 +6102,14 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_SU_BEAMFORMER_CAP, pConfig->enable_su_tx_bformer) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hdd_err("set SU_BEAMFORMER_CAP to CFG failed"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS, NUM_OF_SOUNDING_DIMENSIONS) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hdd_err("failed to set NUM_OF_SOUNDING_DIM"); } @@ -6117,7 +6117,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_HT_RX_STBC, - pConfig->enableRxSTBC) == CDF_STATUS_E_FAILURE) { + pConfig->enableRxSTBC) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_HT_RX_STBC to CFG"); } @@ -6129,25 +6129,25 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) phtCapInfo->advCodingCap = pConfig->enableRxLDPC; val = val16; if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_HT_CAP_INFO, val) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_HT_CAP_INFO to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_RXSTBC, - pConfig->enableRxSTBC) == CDF_STATUS_E_FAILURE) { + pConfig->enableRxSTBC) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_RXSTBC to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_TXSTBC, - pConfig->enableTxSTBC) == CDF_STATUS_E_FAILURE) { + pConfig->enableTxSTBC) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_TXSTBC to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_LDPC_CODING_CAP, - pConfig->enableRxLDPC) == CDF_STATUS_E_FAILURE) { + pConfig->enableRxLDPC) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_LDPC_CODING_CAP to CFG"); @@ -6162,7 +6162,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_ASSOC_STA_LIMIT, val) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ASSOC_STA_LIMIT to CFG"); @@ -6170,7 +6170,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) #endif if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_ENABLE_LPWR_IMG_TRANSITION, pConfig->enableLpwrImgTransition) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_LPWR_IMG_TRANSITION to CFG"); @@ -6179,14 +6179,14 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED, pConfig->enableMCCAdaptiveScheduler) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED to CFG"); } if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP, - pConfig->disableLDPCWithTxbfAP) == CDF_STATUS_E_FAILURE) { + pConfig->disableLDPCWithTxbfAP) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP to CFG"); @@ -6194,7 +6194,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_DYNAMIC_THRESHOLD_ZERO, - pConfig->retryLimitZero) == CDF_STATUS_E_FAILURE) { + pConfig->retryLimitZero) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_DYNAMIC_THRESHOLD_ZERO to CFG"); @@ -6202,7 +6202,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_DYNAMIC_THRESHOLD_ONE, - pConfig->retryLimitOne) == CDF_STATUS_E_FAILURE) { + pConfig->retryLimitOne) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_DYNAMIC_THRESHOLD_ONE to CFG"); @@ -6210,7 +6210,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_DYNAMIC_THRESHOLD_TWO, - pConfig->retryLimitTwo) == CDF_STATUS_E_FAILURE) { + pConfig->retryLimitTwo) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_DYNAMIC_THRESHOLD_TWO to CFG"); @@ -6218,7 +6218,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_MAX_MEDIUM_TIME, - pConfig->cfgMaxMediumTime) == CDF_STATUS_E_FAILURE) { + pConfig->cfgMaxMediumTime) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_MAX_MEDIUM_TIME to CFG"); @@ -6226,28 +6226,28 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) #ifdef FEATURE_WLAN_TDLS if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK, - pConfig->fTDLSUapsdMask) == CDF_STATUS_E_FAILURE) { + pConfig->fTDLSUapsdMask) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_TDLS_BUF_STA_ENABLED, pConfig->fEnableTDLSBufferSta) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TDLS_BUF_STA_ENABLED to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_TDLS_PUAPSD_INACT_TIME, pConfig->fTDLSPuapsdInactivityTimer) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TDLS_PUAPSD_INACT_TIME to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_TDLS_RX_FRAME_THRESHOLD, pConfig->fTDLSRxFrameThreshold) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TDLS_RX_FRAME_THRESHOLD to CFG"); @@ -6255,14 +6255,14 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_TDLS_OFF_CHANNEL_ENABLED, pConfig->fEnableTDLSOffChannel) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TDLS_BUF_STA_ENABLED to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_TDLS_WMM_MODE_ENABLED, pConfig->fEnableTDLSWmmMode) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TDLS_WMM_MODE_ENABLED to CFG"); @@ -6271,7 +6271,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_ENABLE_ADAPT_RX_DRAIN, pConfig->fEnableAdaptRxDrain) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_ADAPT_RX_DRAIN to CFG"); @@ -6279,7 +6279,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_FLEX_CONNECT_POWER_FACTOR, pConfig->flexConnectPowerFactor) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Failure: Could not pass on " "WNI_CFG_FLEX_CONNECT_POWER_FACTOR to CFG"); @@ -6287,7 +6287,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_ANTENNA_DIVESITY, pConfig->antennaDiversity) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ANTENNA_DIVESITY to CFG"); @@ -6296,7 +6296,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_DEFAULT_RATE_INDEX_24GHZ, pConfig->defaultRateIndex24Ghz) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_DEFAULT_RATE_INDEX_24GHZ to CFG"); @@ -6305,7 +6305,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL, pConfig->debugP2pRemainOnChannel) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL to CFG"); @@ -6313,7 +6313,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) #ifdef WLAN_FEATURE_11W if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_PMF_SA_QUERY_MAX_RETRIES, pConfig->pmfSaQueryMaxRetries) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_SA_QUERY_MAX_RETRIES to CFG"); @@ -6321,7 +6321,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL, pConfig->pmfSaQueryRetryInterval) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_SA_QUERY_RETRY_INTERVAL to CFG"); @@ -6330,7 +6330,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_IBSS_ATIM_WIN_SIZE, pConfig->ibssATIMWinSize) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_IBSS_ATIM_WIN_SIZE to CFG"); @@ -6368,12 +6368,12 @@ void hdd_set_pno_channel_prediction_config( * * @pHddCtx: the pointer to hdd context * - * Return: CDF_STATUS_SUCCESS if configuration is correctly applied, - * otherwise the appropriate CDF_STATUS would be returned + * Return: QDF_STATUS_SUCCESS if configuration is correctly applied, + * otherwise the appropriate QDF_STATUS would be returned */ -CDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) +QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeConfigParams *smeConfig; uint8_t rrm_capab_len; @@ -6383,7 +6383,7 @@ CDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) if (NULL == smeConfig) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: unable to allocate smeConfig", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(smeConfig, sizeof(*smeConfig)); @@ -6672,7 +6672,7 @@ CDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) smeConfig->csrConfig.first_scan_bucket_threshold = pHddCtx->config->first_scan_bucket_threshold; status = sme_update_config(pHddCtx->hHal, smeConfig); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, "sme_update_config() return failure %d", status); } @@ -6686,9 +6686,9 @@ CDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) * @pHddCtx: the pointer to hdd context * @command: the command to run * - * Return: the CDF_STATUS return from hdd_execute_config_command + * Return: the QDF_STATUS return from hdd_execute_config_command */ -CDF_STATUS hdd_execute_global_config_command(hdd_context_t *pHddCtx, +QDF_STATUS hdd_execute_global_config_command(hdd_context_t *pHddCtx, char *command) { return hdd_execute_config_command(g_registry_table, @@ -6703,10 +6703,10 @@ CDF_STATUS hdd_execute_global_config_command(hdd_context_t *pHddCtx, * @pBuf: buffer to store the configuration * @buflen: size of the buffer * - * Return: CDF_STATUS_SUCCESS if the configuration and buffer size can carry - * the content, otherwise CDF_STATUS_E_RESOURCES + * Return: QDF_STATUS_SUCCESS if the configuration and buffer size can carry + * the content, otherwise QDF_STATUS_E_RESOURCES */ -CDF_STATUS hdd_cfg_get_global_config(hdd_context_t *pHddCtx, char *pBuf, +QDF_STATUS hdd_cfg_get_global_config(hdd_context_t *pHddCtx, char *pBuf, int buflen) { return hdd_cfg_get_config(g_registry_table, @@ -6744,10 +6744,10 @@ bool hdd_is_okc_mode_enabled(hdd_context_t *pHddCtx) * This function is used to modify the number of spatial streams * supported when not in connected state. * - * Return: CDF_STATUS_SUCCESS if nss is correctly updated, - * otherwise CDF_STATUS_E_FAILURE would be returned + * Return: QDF_STATUS_SUCCESS if nss is correctly updated, + * otherwise QDF_STATUS_E_FAILURE would be returned */ -CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) +QDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) { struct hdd_config *hdd_config = hdd_ctx->config; uint32_t temp = 0; @@ -6762,19 +6762,19 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) if ((nss == 2) && (hdd_ctx->num_rf_chains != 2)) { hddLog(LOGE, "No support for 2 spatial streams"); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } enable2x2 = (nss == 1) ? 0 : 1; if (hdd_config->enable2x2 == enable2x2) { hddLog(LOGE, "NSS same as requested"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (true == sme_is_any_session_in_connected_state(hdd_ctx->hHal)) { hddLog(LOGE, "Connected sessions present, Do not change NSS"); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } hdd_config->enable2x2 = enable2x2; @@ -6792,7 +6792,7 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) /* Update Rx Highest Long GI data Rate */ if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE, - rx_supp_data_rate) == CDF_STATUS_E_FAILURE) { + rx_supp_data_rate) == QDF_STATUS_E_FAILURE) { status = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE to CFG"); @@ -6801,7 +6801,7 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) /* Update Tx Highest Long GI data Rate */ if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE, - tx_supp_data_rate) == CDF_STATUS_E_FAILURE) { + tx_supp_data_rate) == QDF_STATUS_E_FAILURE) { status = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE to CFG"); @@ -6816,7 +6816,7 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) ht_cap_info->txSTBC = hdd_config->enableTxSTBC; temp = val16; if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_HT_CAP_INFO, - temp) == CDF_STATUS_E_FAILURE) { + temp) == QDF_STATUS_E_FAILURE) { status = false; hddLog(LOGE, "Could not pass on WNI_CFG_HT_CAP_INFO to CFG"); } @@ -6829,7 +6829,7 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) temp |= 0x000C; if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_BASIC_MCS_SET, - temp) == CDF_STATUS_E_FAILURE) { + temp) == QDF_STATUS_E_FAILURE) { status = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_BASIC_MCS_SET to CFG"); @@ -6843,7 +6843,7 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) temp |= 0x000C; if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_RX_MCS_MAP, - temp) == CDF_STATUS_E_FAILURE) { + temp) == QDF_STATUS_E_FAILURE) { status = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_RX_MCS_MAP to CFG"); } @@ -6856,7 +6856,7 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) temp |= 0x000C; if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_TX_MCS_MAP, - temp) == CDF_STATUS_E_FAILURE) { + temp) == QDF_STATUS_E_FAILURE) { status = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_TX_MCS_MAP to CFG"); } @@ -6874,14 +6874,14 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) if (sme_cfg_set_str(hdd_ctx->hHal, WNI_CFG_SUPPORTED_MCS_SET, mcs_set, SIZE_OF_SUPPORTED_MCS_SET) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { status = false; hddLog(LOGE, "Could not pass on MCS SET to CFG"); } #undef WLAN_HDD_RX_MCS_ALL_NSTREAM_RATES - if (CDF_STATUS_SUCCESS != sme_update_nss(hdd_ctx->hHal, nss)) + if (QDF_STATUS_SUCCESS != sme_update_nss(hdd_ctx->hHal, nss)) status = false; - return (status == false) ? CDF_STATUS_E_FAILURE : CDF_STATUS_SUCCESS; + return (status == false) ? QDF_STATUS_E_FAILURE : QDF_STATUS_SUCCESS; } diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 018e3b58ae..ce41c1e208 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -1529,7 +1529,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy, status = cds_get_pcl(CDS_SAP_MODE, sap_config->acs_cfg.pcl_channels, &sap_config->acs_cfg.pcl_ch_count); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) hddLog(LOGE, FL("Get PCL failed")); wlan_hdd_set_acs_ch_range(sap_config, ht_enabled, vht_enabled); @@ -1938,7 +1938,7 @@ __wlan_hdd_cfg80211_set_scanning_mac_oui(struct wiphy *wiphy, tpSirScanMacOui pReqMsg = NULL; hdd_context_t *pHddCtx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_SET_SCANNING_MAC_OUI_MAX + 1]; - CDF_STATUS status; + QDF_STATUS status; int ret; ENTER(); @@ -1977,7 +1977,7 @@ __wlan_hdd_cfg80211_set_scanning_mac_oui(struct wiphy *wiphy, hddLog(LOG1, FL("Oui (%02x:%02x:%02x)"), pReqMsg->oui[0], pReqMsg->oui[1], pReqMsg->oui[2]); status = sme_set_scanning_mac_oui(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("sme_set_scanning_mac_oui failed(err=%d)"), status); goto fail; @@ -2058,7 +2058,7 @@ __wlan_hdd_cfg80211_get_features(struct wiphy *wiphy, struct sk_buff *skb = NULL; uint32_t dbs_capability = 0; bool one_by_one_dbs, two_by_two_dbs; - CDF_STATUS ret = CDF_STATUS_E_FAILURE; + QDF_STATUS ret = QDF_STATUS_E_FAILURE; int ret_val; uint8_t feature_flags[(NUM_QCA_WLAN_VENDOR_FEATURES + 7) / 8] = {0}; @@ -2097,7 +2097,7 @@ __wlan_hdd_cfg80211_get_features(struct wiphy *wiphy, goto nla_put_failure; ret = wma_get_dbs_hw_modes(&one_by_one_dbs, &two_by_two_dbs); - if (CDF_STATUS_SUCCESS == ret) { + if (QDF_STATUS_SUCCESS == ret) { if (one_by_one_dbs) dbs_capability = DRV_DBS_CAPABILITY_1X1; @@ -2483,13 +2483,13 @@ static bool wlan_hdd_check_dfs_channel_for_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; hdd_ap_ctx_t *ap_ctx; hdd_station_ctx_t *sta_ctx; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; - cdf_status = hdd_get_front_adapter(hdd_ctx, + qdf_status = hdd_get_front_adapter(hdd_ctx, &adapter_node); while ((NULL != adapter_node) && - (CDF_STATUS_SUCCESS == cdf_status)) { + (QDF_STATUS_SUCCESS == qdf_status)) { adapter = adapter_node->pAdapter; if ((device_mode == adapter->device_mode) && @@ -2532,7 +2532,7 @@ static bool wlan_hdd_check_dfs_channel_for_adapter(hdd_context_t *hdd_ctx, } } - cdf_status = hdd_get_next_adapter(hdd_ctx, + qdf_status = hdd_get_next_adapter(hdd_ctx, adapter_node, &next); adapter_node = next; @@ -2559,7 +2559,7 @@ int wlan_hdd_disable_dfs_chan_scan(hdd_context_t *hdd_ctx, uint32_t no_dfs_flag) { tHalHandle h_hal = WLAN_HDD_GET_HAL_CTX(adapter); - CDF_STATUS status; + QDF_STATUS status; int ret_val = -EPERM; if (no_dfs_flag == hdd_ctx->config->enableDFSChnlScan) { @@ -2588,7 +2588,7 @@ int wlan_hdd_disable_dfs_chan_scan(hdd_context_t *hdd_ctx, status = sme_handle_dfs_chan_scan( h_hal, hdd_ctx->config->enableDFSChnlScan); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { ret_val = 0; /* @@ -2598,7 +2598,7 @@ int wlan_hdd_disable_dfs_chan_scan(hdd_context_t *hdd_ctx, * all sessions */ status = sme_scan_flush_result(h_hal); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) ret_val = -EPERM; } @@ -3135,7 +3135,7 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, u32 modulated_dtim; u16 stats_avg_factor; u32 guard_time; - CDF_STATUS status; + QDF_STATUS status; if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3163,7 +3163,7 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, adapter->sessionId, modulated_dtim); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) ret_val = -EPERM; } @@ -3174,7 +3174,7 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, adapter->sessionId, stats_avg_factor); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) ret_val = -EPERM; } @@ -3186,7 +3186,7 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, adapter->sessionId, guard_time); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) ret_val = -EPERM; } @@ -3251,7 +3251,7 @@ static int __wlan_hdd_cfg80211_wifi_logger_start(struct wiphy *wiphy, const void *data, int data_len) { - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_WIFI_LOGGER_START_MAX + 1]; struct sir_wifi_start_log start_log; @@ -3313,7 +3313,7 @@ static int __wlan_hdd_cfg80211_wifi_logger_start(struct wiphy *wiphy, } status = sme_wifi_start_logger(hdd_ctx->hHal, start_log); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_wifi_start_logger failed(err=%d)"), status); return -EINVAL; @@ -3374,7 +3374,7 @@ static int __wlan_hdd_cfg80211_wifi_logger_get_ring_data(struct wiphy *wiphy, const void *data, int data_len) { - CDF_STATUS status; + QDF_STATUS status; uint32_t ring_id; hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct nlattr *tb @@ -3417,7 +3417,7 @@ static int __wlan_hdd_cfg80211_wifi_logger_get_ring_data(struct wiphy *wiphy, status = cds_flush_logs(WLAN_LOG_TYPE_NON_FATAL, WLAN_LOG_INDICATOR_FRAMEWORK, WLAN_LOG_REASON_CODE_UNUSED); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("Failed to trigger bug report")); return -EINVAL; } @@ -3553,7 +3553,7 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, struct nlattr **tb) { struct sSirAddPeriodicTxPtrn *add_req; - CDF_STATUS status; + QDF_STATUS status; uint32_t request_id, ret, len; uint8_t pattern_id = 0; struct cdf_mac_addr dst_addr; @@ -3661,7 +3661,7 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, hddLog(LOG1, FL("pattern id: %d"), add_req->ucPtrnId); status = sme_add_periodic_tx_ptrn(hdd_ctx->hHal, add_req); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_add_periodic_tx_ptrn failed (err=%d)"), status); goto fail; @@ -3691,7 +3691,7 @@ wlan_hdd_del_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, struct nlattr **tb) { struct sSirDelPeriodicTxPtrn *del_req; - CDF_STATUS status; + QDF_STATUS status; uint32_t request_id, ret; uint8_t pattern_id = 0; @@ -3725,7 +3725,7 @@ wlan_hdd_del_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, request_id, del_req->ucPtrnId); status = sme_del_periodic_tx_ptrn(hdd_ctx->hHal, del_req); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_del_periodic_tx_ptrn failed (err=%d)"), status); goto fail; @@ -3878,7 +3878,7 @@ __wlan_hdd_cfg80211_monitor_rssi(struct wiphy *wiphy, hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct nlattr *tb[PARAM_MAX + 1]; struct rssi_monitor_req req; - CDF_STATUS status; + QDF_STATUS status; int ret; uint32_t control; static const struct nla_policy policy[PARAM_MAX + 1] = { @@ -3951,7 +3951,7 @@ __wlan_hdd_cfg80211_monitor_rssi(struct wiphy *wiphy, req.request_id, req.session_id, req.control); status = sme_set_rssi_monitoring(hdd_ctx->hHal, &req); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_set_rssi_monitoring failed(err=%d)"), status); return -EINVAL; @@ -4069,7 +4069,7 @@ static int __wlan_hdd_cfg80211_get_preferred_freq_list(struct wiphy *wiphy, { hdd_context_t *hdd_ctx = wiphy_priv(wiphy); int i, ret = 0; - CDF_STATUS status; + QDF_STATUS status; uint8_t pcl[MAX_NUM_CHAN]; uint32_t pcl_len = 0; uint32_t freq_list[MAX_NUM_CHAN]; @@ -4103,7 +4103,7 @@ static int __wlan_hdd_cfg80211_get_preferred_freq_list(struct wiphy *wiphy, hdd_debug("Userspace requested pref freq list"); status = cds_get_pcl(intf_mode, pcl, &pcl_len); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hdd_err("Get pcl failed"); return -EINVAL; } @@ -4234,19 +4234,19 @@ static int __wlan_hdd_cfg80211_set_probable_oper_channel(struct wiphy *wiphy, if (hdd_ctx->config->policy_manager_enabled) { ret = cdf_reset_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(ret)) + if (!QDF_IS_STATUS_SUCCESS(ret)) hdd_err("clearing event failed"); ret = cds_current_connections_update(adapter->sessionId, channel_hint, CDS_UPDATE_REASON_SET_OPER_CHAN); - if (CDF_STATUS_E_FAILURE == ret) { + if (QDF_STATUS_E_FAILURE == ret) { /* return in the failure case */ hdd_err("ERROR: connections update failed!!"); return -EINVAL; } - if (CDF_STATUS_SUCCESS == ret) { + if (QDF_STATUS_SUCCESS == ret) { /* * Success is the only case for which we expect hw mode * change to take place, hence we need to wait. @@ -4254,7 +4254,7 @@ static int __wlan_hdd_cfg80211_set_probable_oper_channel(struct wiphy *wiphy, * through */ ret = cdf_wait_for_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(ret)) { + if (!QDF_IS_STATUS_SUCCESS(ret)) { hdd_err("ERROR: cdf wait for event failed!!"); return -EINVAL; } @@ -4507,7 +4507,7 @@ static int __wlan_hdd_cfg80211_set_ota_test(struct wiphy *wiphy, hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_OTA_TEST_MAX + 1]; uint8_t ota_enable = 0; - CDF_STATUS status; + QDF_STATUS status; uint32_t current_roam_state; if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { @@ -4543,14 +4543,14 @@ static int __wlan_hdd_cfg80211_set_ota_test(struct wiphy *wiphy, sme_get_current_roam_state(hal, adapter->sessionId); status = sme_stop_roaming(hal, adapter->sessionId, eCsrHddIssued); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hdd_err("Enable/Disable roaming failed"); return -EINVAL; } status = sme_ps_enable_disable(hal, adapter->sessionId, SME_PS_DISABLE); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hdd_err("Enable/Disable power save failed"); /* restore previous roaming setting */ if (current_roam_state == eCSR_ROAMING_STATE_JOINING || @@ -4562,7 +4562,7 @@ static int __wlan_hdd_cfg80211_set_ota_test(struct wiphy *wiphy, status = sme_stop_roaming(hal, adapter->sessionId, eCsrHddIssued); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) hdd_err("Restoring roaming state failed"); return -EINVAL; @@ -5743,7 +5743,7 @@ uint8_t *wlan_hdd_cfg80211_get_ie_ptr(const uint8_t *ies_ptr, int length, * This function validates whether given channel is part of valid * channel list. */ -CDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, +QDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, int channel) { @@ -5767,7 +5767,7 @@ CDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, if (fValidChannel != true) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel [%d]", __func__, channel); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { if (0 != sme_cfg_get_str(hHal, WNI_CFG_VALID_CHANNEL_LIST, @@ -5775,7 +5775,7 @@ CDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, hddLog(CDF_TRACE_LEVEL_ERROR, "%s: failed to get valid channel list", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } for (indx = 0; indx < num_ch; indx++) { if (channel == valid_ch[indx]) { @@ -5786,10 +5786,10 @@ CDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, if (indx >= num_ch) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel [%d]", __func__, channel); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -5836,7 +5836,7 @@ static void wlan_hdd_set_dhcp_server_offload(hdd_adapter_t *pHostapdAdapter) temp = srv_ip[num]; pDhcpSrvInfo->dhcpSrvIP |= (temp << (8 * num)); } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_dhcp_srv_offload(pHddCtx->hHal, pDhcpSrvInfo)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: sme_setDHCPSrvOffload fail!", __func__); @@ -5857,7 +5857,7 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); int ret = 0; - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; ENTER(); @@ -5894,7 +5894,7 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy, pAdapter->sessionCtx. ap. apDisableIntraBssFwd); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { ret = -EINVAL; } } @@ -5929,7 +5929,7 @@ static int wlan_hdd_change_iface_to_sta_mode(struct net_device *ndev, hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); hdd_wext_state_t *wext; struct wireless_dev *wdev; - CDF_STATUS status; + QDF_STATUS status; ENTER(); @@ -6011,7 +6011,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, struct hdd_config *pConfig = NULL; eMib_dot11DesiredBssType connectedBssType; unsigned long rc; - CDF_STATUS vstatus; + QDF_STATUS vstatus; int status; ENTER(); @@ -6063,7 +6063,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_P2P_CLIENT: vstatus = wlan_hdd_change_iface_to_sta_mode(ndev, type); - if (vstatus != CDF_STATUS_SUCCESS) + if (vstatus != QDF_STATUS_SUCCESS) return -EINVAL; hdd_register_tx_flow_control(pAdapter, @@ -6129,7 +6129,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, hdd_set_ap_ops(pAdapter->dev); vstatus = hdd_init_ap_mode(pAdapter); - if (vstatus != CDF_STATUS_SUCCESS) { + if (vstatus != QDF_STATUS_SUCCESS) { hddLog(LOGP, FL ("Error initializing the ap mode")); @@ -6163,7 +6163,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, case NL80211_IFTYPE_P2P_CLIENT: case NL80211_IFTYPE_ADHOC: status = wlan_hdd_change_iface_to_sta_mode(ndev, type); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) return status; if ((NL80211_IFTYPE_P2P_CLIENT == type) || @@ -6208,7 +6208,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, || (eCSR_BSS_TYPE_START_IBSS == LastBSSType)) { /* Need to issue a disconnect to CSR. */ INIT_COMPLETION(pAdapter->disconnect_comp_var); - if (CDF_STATUS_SUCCESS == + if (QDF_STATUS_SUCCESS == sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED)) { @@ -6297,7 +6297,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, struct station_parameters *params) #endif { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx; hdd_station_ctx_t *pHddStaCtx; @@ -6337,7 +6337,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, &STAMacAddress, ol_txrx_peer_state_auth); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_INFO, FL ("Not able to change TL state to AUTHENTICATED")); @@ -6514,7 +6514,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, &StaParams, isBufSta, isOffChannelSupported); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, FL ("wlan_hdd_tdls_set_peer_caps failed!")); @@ -6524,7 +6524,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, status = wlan_hdd_tdls_add_station(wiphy, dev, mac, 1, &StaParams); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("wlan_hdd_tdls_add_station failed!")); return -EINVAL; @@ -6588,7 +6588,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, v_CONTEXT_t p_cds_context = (WLAN_HDD_GET_CTX(pAdapter))->pcds_context; #endif hdd_hostapd_state_t *pHostapdState; - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; hdd_context_t *pHddCtx; hdd_ap_ctx_t *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(pAdapter); @@ -6771,7 +6771,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, #else status = wlansap_set_key_sta(p_cds_context, &setKey); #endif - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "[%4d] wlansap_set_key_sta returned ERROR status= %d", @@ -6828,11 +6828,11 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, request */ cdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &setKey); - if (cdf_ret_status == CDF_STATUS_FT_PREAUTH_KEY_SUCCESS) { + if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) { hddLog(CDF_TRACE_LEVEL_INFO_MED, "%s: Update PreAuth Key success", __func__); return 0; - } else if (cdf_ret_status == CDF_STATUS_FT_PREAUTH_KEY_FAILED) { + } else if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Update PreAuth Key failed", __func__); return -EINVAL; @@ -7486,7 +7486,7 @@ int wlan_hdd_cfg80211_update_bss(struct wiphy *wiphy, { tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); tCsrScanResultInfo *pScanResult; - CDF_STATUS status = 0; + QDF_STATUS status = 0; tScanResultHandle pResult; struct cfg80211_bss *bss_status = NULL; hdd_context_t *pHddCtx; @@ -7615,7 +7615,7 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify(hdd_adapter_t *pAdapter, * Return: CDF status */ #define MAX_LFR_METRICS_EVENT_LENGTH 100 -CDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, +QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo) { unsigned char metrics_notification[MAX_LFR_METRICS_EVENT_LENGTH + 1]; @@ -7625,7 +7625,7 @@ CDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, if (NULL == pAdapter) { hddLog(LOGE, FL("pAdapter is NULL!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* create the event */ @@ -7643,7 +7643,7 @@ CDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7656,7 +7656,7 @@ CDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, * * Return: CDF status */ -CDF_STATUS +QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, bool preauth_status) @@ -7668,7 +7668,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t *pAdapter, if (NULL == pAdapter) { hddLog(LOGE, FL("pAdapter is NULL!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* create the event */ @@ -7694,7 +7694,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t *pAdapter, EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7706,7 +7706,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t *pAdapter, * * Return: CDF status */ -CDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(hdd_adapter_t *pAdapter, +QDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo) { unsigned char metrics_notification[MAX_LFR_METRICS_EVENT_LENGTH + 1]; @@ -7716,7 +7716,7 @@ CDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(hdd_adapter_t *pAdapter, if (NULL == pAdapter) { hddLog(LOGE, FL("pAdapter is NULL!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* create the event */ @@ -7735,7 +7735,7 @@ CDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(hdd_adapter_t *pAdapter, EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -7957,7 +7957,7 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, */ status = hdd_set_ibss_power_save_params(pAdapter); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("Set IBSS Power Save Params Failed")); return -EINVAL; @@ -8034,7 +8034,7 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, pAdapter->sessionId, pRoamProfile, &roamId); - if ((CDF_STATUS_SUCCESS != status) && + if ((QDF_STATUS_SUCCESS != status) && (WLAN_HDD_INFRA_STATION == pAdapter->device_mode || WLAN_HDD_P2P_CLIENT == pAdapter->device_mode)) { hddLog(LOGE, @@ -8757,7 +8757,7 @@ static int wlan_hdd_try_disconnect(hdd_adapter_t *pAdapter) * ssid and the previous connect command in CSR. Else we might * hit some race conditions leading to SME and HDD out of sync. */ - if (CDF_STATUS_CMD_NOT_QUEUED == status) { + if (QDF_STATUS_CMD_NOT_QUEUED == status) { hdd_info("Already disconnected or connect was in sme/roam pending list and removed by disconnect"); } else if (0 != status) { hdd_err("csrRoamDisconnect failure, returned %d", @@ -8770,7 +8770,7 @@ static int wlan_hdd_try_disconnect(hdd_adapter_t *pAdapter) rc = wait_for_completion_timeout( &pAdapter->disconnect_comp_var, msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT)); - if (!rc && (CDF_STATUS_CMD_NOT_QUEUED != status)) { + if (!rc && (QDF_STATUS_CMD_NOT_QUEUED != status)) { hdd_err("Sme disconnect event timed out session Id %d staDebugState %d", pAdapter->sessionId, pHddStaCtx->staDebugState); result = -ETIMEDOUT; @@ -8958,7 +8958,7 @@ int wlan_hdd_disconnect(hdd_adapter_t *pAdapter, u16 reason) * the previous connect command in CSR. Else we might hit some * race conditions leading to SME and HDD out of sync. */ - if (CDF_STATUS_CMD_NOT_QUEUED == status) { + if (QDF_STATUS_CMD_NOT_QUEUED == status) { hdd_info("Already disconnected or connect was in sme/roam pending list and removed by disconnect"); } else if (0 != status) { hddLog(LOGE, @@ -8972,7 +8972,7 @@ int wlan_hdd_disconnect(hdd_adapter_t *pAdapter, u16 reason) msecs_to_jiffies (WLAN_WAIT_TIME_DISCONNECT)); - if (!rc && (CDF_STATUS_CMD_NOT_QUEUED != status)) { + if (!rc && (QDF_STATUS_CMD_NOT_QUEUED != status)) { hddLog(LOGE, FL("Failed to disconnect, timed out")); result = -ETIMEDOUT; @@ -9370,20 +9370,20 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, } if (pHddCtx->config->policy_manager_enabled) { status = cdf_reset_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) hdd_err("ERR: clear event failed"); status = cds_current_connections_update(pAdapter->sessionId, channelNum, CDS_UPDATE_REASON_JOIN_IBSS); - if (CDF_STATUS_E_FAILURE == status) { + if (QDF_STATUS_E_FAILURE == status) { hdd_err("ERROR: connections update failed!!"); return -EINVAL; } - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { status = cdf_wait_for_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_err("ERROR: cdf wait for event failed!!"); return -EINVAL; } @@ -9409,7 +9409,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, /* enable selected protection checks in IBSS mode */ pRoamProfile->cfg_protection = IBSS_CFG_PROTECTION_ENABLE_MASK; - if (CDF_STATUS_E_FAILURE == sme_cfg_set_int(pHddCtx->hHal, + if (QDF_STATUS_E_FAILURE == sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_IBSS_ATIM_WIN_SIZE, pHddCtx->config-> ibssATIMWinSize)) { @@ -9420,7 +9420,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, /* BSSID is provided by upper layers hence no need to AUTO generate */ if (NULL != params->bssid) { if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_IBSS_AUTO_BSSID, 0) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("ccmCfgStInt failed for WNI_CFG_IBSS_AUTO_BSSID")); return -EIO; @@ -9428,7 +9428,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, cdf_mem_copy(bssid.bytes, params->bssid, CDF_MAC_ADDR_SIZE); } else if (pHddCtx->config->isCoalesingInIBSSAllowed == 0) { if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_IBSS_AUTO_BSSID, 0) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("ccmCfgStInt failed for WNI_CFG_IBSS_AUTO_BSSID")); return -EIO; @@ -9519,7 +9519,7 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy, tCsrRoamProfile *pRoamProfile; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); int status; - CDF_STATUS hal_status; + QDF_STATUS hal_status; unsigned long rc; ENTER(); @@ -9559,7 +9559,7 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy, hal_status = sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, eCSR_DISCONNECT_REASON_IBSS_LEAVE); - if (!CDF_IS_STATUS_SUCCESS(hal_status)) { + if (!QDF_IS_STATUS_SUCCESS(hal_status)) { hddLog(LOGE, FL("sme_roam_disconnect failed hal_status(%d)"), hal_status); @@ -9829,7 +9829,6 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; hdd_hostapd_state_t *hapd_state; int status; @@ -9895,10 +9894,10 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, qdf_event_reset(&hapd_state->cdf_event); hdd_softap_sta_disassoc(pAdapter, mac); - cdf_status = + qdf_status = hdd_softap_sta_deauth(pAdapter, pDelStaParams); - if (CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (QDF_IS_STATUS_SUCCESS(qdf_status)) { pAdapter->aStaInfo[i]. isDeauthInProgress = true; qdf_status = @@ -9914,11 +9913,11 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, } } } else { - cdf_status = + qdf_status = hdd_softap_get_sta_id(pAdapter, (struct cdf_mac_addr *) mac, &staId); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOG1, FL("Skip DEL STA as this is not used::" MAC_ADDRESS_STR), @@ -9958,9 +9957,9 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, qdf_event_reset(&hapd_state->cdf_event); hdd_softap_sta_disassoc(pAdapter, mac); - cdf_status = hdd_softap_sta_deauth(pAdapter, + qdf_status = hdd_softap_sta_deauth(pAdapter, pDelStaParams); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pAdapter->aStaInfo[staId].isDeauthInProgress = false; hddLog(LOG1, @@ -10131,7 +10130,7 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); tHalHandle halHandle; - CDF_STATUS result = CDF_STATUS_SUCCESS; + QDF_STATUS result = QDF_STATUS_SUCCESS; int status; tPmkidCacheInfo pmk_id; @@ -10175,7 +10174,7 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, pAdapter->sessionId, result)); EXIT(); - return CDF_IS_STATUS_SUCCESS(result) ? 0 : -EINVAL; + return QDF_IS_STATUS_SUCCESS(result) ? 0 : -EINVAL; } /** @@ -10247,7 +10246,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy, TRACE_CODE_HDD_CFG80211_DEL_PMKSA, pAdapter->sessionId, 0)); /* Delete the PMKID CSR cache */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_roam_del_pmkid_from_cache(halHandle, pAdapter->sessionId, pmksa->bssid, false)) { @@ -10315,7 +10314,7 @@ static int __wlan_hdd_cfg80211_flush_pmksa(struct wiphy *wiphy, halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter); /* Flush the PMKID cache in CSR */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_roam_del_pmkid_from_cache(halHandle, pAdapter->sessionId, NULL, true)) { hddLog(LOGE, FL("Cannot flush PMKIDCache")); @@ -10447,7 +10446,7 @@ void wlan_hdd_cfg80211_update_replay_counter_callback(void *callbackContext, return; } - if (CDF_STATUS_SUCCESS != pGtkOffloadGetInfoRsp->ulStatus) { + if (QDF_STATUS_SUCCESS != pGtkOffloadGetInfoRsp->ulStatus) { hddLog(LOGE, FL("wlan Failed to get replay counter value")); return; } @@ -10496,7 +10495,7 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy, tHalHandle hHal; int result; tSirGtkOffloadParams hddGtkOffloadReqParams; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; ENTER(); @@ -10551,7 +10550,7 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy, sme_set_gtk_offload(hHal, &hddGtkOffloadReqParams, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("sme_set_gtk_offload failed, status(%d)"), status); return -EINVAL; @@ -10608,7 +10607,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy, v_CONTEXT_t p_cds_context = NULL; hdd_context_t *pHddCtx; int status; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; ENTER(); @@ -10695,13 +10694,13 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy, } } #ifdef WLAN_FEATURE_MBSSID - cdf_status = + qdf_status = wlansap_set_mac_acl(WLAN_HDD_GET_SAP_CTX_PTR(pAdapter), pConfig); #else - cdf_status = wlansap_set_mac_acl(p_cds_context, pConfig); + qdf_status = wlansap_set_mac_acl(p_cds_context, pConfig); #endif - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("SAP Set Mac Acl fail")); return -EINVAL; } @@ -10837,7 +10836,7 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy, void *buf; tSirLPHBReq *hb_params = NULL; tSirLPHBReq *hb_params_temp = NULL; - CDF_STATUS smeStatus; + QDF_STATUS smeStatus; if (!tb[WLAN_HDD_TM_ATTR_DATA]) { hddLog(LOGE, FL("Testmode INV DATA")); @@ -10865,7 +10864,7 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy, sme_lphb_config_req((tHalHandle) (pHddCtx->hHal), hb_params, wlan_hdd_cfg80211_lphb_ind_handler); - if (CDF_STATUS_SUCCESS != smeStatus) { + if (QDF_STATUS_SUCCESS != smeStatus) { hddLog(LOGE, "LPHB Config Fail, disable"); cdf_mem_free(hb_params); } @@ -10878,7 +10877,7 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy, { int buf_len; void *buf; - CDF_STATUS status; + QDF_STATUS status; if (!tb[WLAN_HDD_TM_ATTR_DATA]) { hddLog(LOGE, FL @@ -10893,7 +10892,7 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy, status = wlan_hdd_ftm_testmode_cmd(buf, buf_len); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) err = -EBUSY; break; } @@ -11000,7 +10999,7 @@ __wlan_hdd_cfg80211_set_ap_channel_width(struct wiphy *wiphy, { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx; - CDF_STATUS status; + QDF_STATUS status; tSmeConfigParams sme_config; bool cbModeChange; @@ -11062,7 +11061,7 @@ __wlan_hdd_cfg80211_set_ap_channel_width(struct wiphy *wiphy, /* Change SAP ht2040 mode */ status = hdd_set_sap_ht2040_mode(pAdapter, cfg80211_get_chandef_type(chandef)); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Error!!! Cannot set SAP HT20/40 mode!")); return -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h index c830c06aa0..10962279f5 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.h +++ b/core/hdd/src/wlan_hdd_cfg80211.h @@ -2266,16 +2266,16 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify(hdd_adapter_t *pAdapter, int index, bool preauth); #ifdef FEATURE_WLAN_LFR_METRICS -CDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, +QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo); -CDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t * +QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t * pAdapter, tCsrRoamInfo * pRoamInfo, bool preauth_status); -CDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(hdd_adapter_t *pAdapter, +QDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo); #endif @@ -2304,7 +2304,7 @@ void hdd_reg_notifier(struct wiphy *wiphy, extern void hdd_conn_set_connection_state(hdd_adapter_t *pAdapter, eConnectionState connState); -CDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, +QDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, int channel); #ifdef FEATURE_WLAN_TDLS int wlan_hdd_cfg80211_send_tdls_discover_req(struct wiphy *wiphy, diff --git a/core/hdd/src/wlan_hdd_conc_ut.c b/core/hdd/src/wlan_hdd_conc_ut.c index 5647010597..c3cda33116 100644 --- a/core/hdd/src/wlan_hdd_conc_ut.c +++ b/core/hdd/src/wlan_hdd_conc_ut.c @@ -630,11 +630,11 @@ void wlan_hdd_one_connection_scenario(hdd_context_t *hdd_ctx) bool status = false; enum cds_pcl_type pcl_type; char reason[20] = {0}; - CDF_STATUS ret; + QDF_STATUS ret; /* flush the entire table first */ ret = cds_init_policy_mgr(); - if (!CDF_IS_STATUS_SUCCESS(ret)) { + if (!QDF_IS_STATUS_SUCCESS(ret)) { hdd_err("Policy manager initialization failed"); return; } @@ -681,7 +681,7 @@ void wlan_hdd_two_connections_scenario(hdd_context_t *hdd_ctx, enum cds_one_connection_mode second_index; char reason[20] = {0}; bool status = false; - CDF_STATUS ret; + QDF_STATUS ret; for (sub_type = CDS_STA_MODE; sub_type < CDS_MAX_NUM_OF_MODE; sub_type++) { @@ -689,7 +689,7 @@ void wlan_hdd_two_connections_scenario(hdd_context_t *hdd_ctx, /* flush the entire table first */ ret = cds_init_policy_mgr(); - if (!CDF_IS_STATUS_SUCCESS(ret)) { + if (!QDF_IS_STATUS_SUCCESS(ret)) { hdd_err("Policy manager initialization failed"); return; } @@ -761,7 +761,7 @@ void wlan_hdd_three_connections_scenario(hdd_context_t *hdd_ctx, enum cds_two_connection_mode third_index; char reason[20] = {0}; bool status = false; - CDF_STATUS ret; + QDF_STATUS ret; /* let's set the chain_mask, mac_ids*/ if (chain_mask == CDS_TWO_TWO) { @@ -787,7 +787,7 @@ void wlan_hdd_three_connections_scenario(hdd_context_t *hdd_ctx, type_1 = wlan_hdd_valid_type_of_persona(sub_type_1); /* flush the entire table first */ ret = cds_init_policy_mgr(); - if (!CDF_IS_STATUS_SUCCESS(ret)) { + if (!QDF_IS_STATUS_SUCCESS(ret)) { hdd_err("Policy manager initialization failed"); return; } diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c index 7cb79d3092..9af633692f 100644 --- a/core/hdd/src/wlan_hdd_debugfs.c +++ b/core/hdd/src/wlan_hdd_debugfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -321,7 +321,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, char *pattern_buf; uint16_t pattern_len = 0; uint16_t i = 0; - CDF_STATUS status; + QDF_STATUS status; int ret; ENTER(); @@ -411,7 +411,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, /* Delete pattern */ status = sme_del_periodic_tx_ptrn(pHddCtx->hHal, delPeriodicTxPtrnParams); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_del_periodic_tx_ptrn() failed!", __func__); @@ -489,7 +489,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, /* Add pattern */ status = sme_add_periodic_tx_ptrn(pHddCtx->hHal, addPeriodicTxPtrnParams); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_add_periodic_tx_ptrn() failed!", __func__); @@ -610,33 +610,33 @@ static const struct file_operations fops_patterngen = { * NB: The current implementation only supports debugfs operations * on the primary interface, i.e. wlan0 * - * Return: CDF_STATUS_SUCCESS if all files registered, - * CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS if all files registered, + * QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter) { hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); pHddCtx->debugfs_phy = debugfs_create_dir("wlan_wcnss", 0); if (NULL == pHddCtx->debugfs_phy) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (NULL == debugfs_create_file("wow_enable", S_IRUSR | S_IWUSR, pHddCtx->debugfs_phy, pAdapter, &fops_wowenable)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (NULL == debugfs_create_file("wow_pattern", S_IRUSR | S_IWUSR, pHddCtx->debugfs_phy, pAdapter, &fops_wowpattern)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (NULL == debugfs_create_file("pattern_gen", S_IRUSR | S_IWUSR, pHddCtx->debugfs_phy, pAdapter, &fops_patterngen)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index c66dcbbfe2..f09f1bad5d 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -38,7 +38,6 @@ #include #endif /* HIF_PCI */ #include "cds_api.h" -#include "cdf_status.h" #include "qdf_status.h" #include "cdf_lock.h" #include "cds_sched.h" @@ -182,7 +181,7 @@ static void hdd_hif_init_cds_callbacks(void *data, struct hif_callbacks *cbk) */ static int hdd_init_cds_hif_context(void *hif) { - CDF_STATUS status; + QDF_STATUS status; status = cds_set_context(CDF_MODULE_ID_HIF, hif); @@ -199,7 +198,7 @@ static int hdd_init_cds_hif_context(void *hif) */ static void hdd_deinit_cds_hif_context(void) { - CDF_STATUS status; + QDF_STATUS status; status = cds_set_context(CDF_MODULE_ID_HIF, NULL); @@ -224,7 +223,7 @@ static void hdd_deinit_cds_hif_context(void) static int hdd_hif_open(struct device *dev, void *bdev, const hif_bus_id *bid, enum ath_hal_bus_type bus_type, bool reinit) { - CDF_STATUS status; + QDF_STATUS status; int ret = 0; struct hif_opaque_softc *hif_ctx; cdf_device_t cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); @@ -259,7 +258,7 @@ static int hdd_hif_open(struct device *dev, void *bdev, const hif_bus_id *bid, status = hif_enable(hif_ctx, dev, bdev, bid, bus_type, (reinit == true) ? HIF_ENABLE_TYPE_REINIT : HIF_ENABLE_TYPE_PROBE); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_err("hif_enable error = %d, reinit = %d", status, reinit); ret = cdf_status_to_os_return(status); @@ -328,7 +327,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, enum ath_hal_bus_type bus_type, bool reinit) { void *hif_ctx; - CDF_STATUS status; + QDF_STATUS status; int ret = 0; cdf_device_t cdf_dev; uint32_t mode = cds_get_conparam(); @@ -358,7 +357,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, if (WLAN_IS_EPPING_ENABLED(mode)) { status = epping_open(); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) goto err_hdd_deinit; } @@ -374,7 +373,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, status = ol_cds_init(cdf_dev, hif_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { pr_err("%s No Memory to Create BMI Context\n", __func__); goto err_hif_close; } @@ -599,7 +598,7 @@ done: * * @state: state * - * Return: CDF_STATUS + * Return: QDF_STATUS */ int wlan_hdd_bus_suspend(pm_message_t state) { diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c index f33a6e20ea..65d31d5d78 100644 --- a/core/hdd/src/wlan_hdd_ext_scan.c +++ b/core/hdd/src/wlan_hdd_ext_scan.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. * @@ -1714,7 +1714,7 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy, hdd_context_t *pHddCtx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX + 1]; - CDF_STATUS status; + QDF_STATUS status; ENTER(); @@ -1759,7 +1759,7 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_ext_scan_get_capabilities(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_ext_scan_get_capabilities failed(err=%d)"), status); goto fail; @@ -1846,7 +1846,7 @@ static int __wlan_hdd_cfg80211_extscan_get_cached_results(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX + 1]; struct hdd_ext_scan_context *context; - CDF_STATUS status; + QDF_STATUS status; int retval = 0; unsigned long rc; @@ -1900,7 +1900,7 @@ static int __wlan_hdd_cfg80211_extscan_get_cached_results(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_get_cached_results(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_get_cached_results failed(err=%d)"), status); goto fail; @@ -1993,7 +1993,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy, struct nlattr *apTh; struct hdd_ext_scan_context *context; uint32_t request_id; - CDF_STATUS status; + QDF_STATUS status; uint8_t i; int rem, retval; unsigned long rc; @@ -2111,7 +2111,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_set_bss_hotlist(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_set_bss_hotlist failed(err=%d)"), status); goto fail; } @@ -2190,7 +2190,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy, struct nlattr *apTh; struct hdd_ext_scan_context *context; uint32_t request_id; - CDF_STATUS status; + QDF_STATUS status; uint8_t i; int rem, retval; unsigned long rc; @@ -2330,7 +2330,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_set_significant_change(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_set_significant_change failed(err=%d)"), status); cdf_mem_free(pReqMsg); @@ -2472,7 +2472,7 @@ __wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy, 1]; uint32_t requestId, maxChannels; tWifiBand wifiBand; - CDF_STATUS status; + QDF_STATUS status; struct sk_buff *reply_skb; uint8_t i; int ret; @@ -2527,7 +2527,7 @@ __wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy, status = sme_get_valid_channels_by_band((tHalHandle) (pHddCtx->hHal), wifiBand, chan_list, &num_channels); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("sme_get_valid_channels_by_band failed (err=%d)"), status); @@ -2693,7 +2693,7 @@ static int hdd_extscan_start_fill_bucket_channel_spec( struct nlattr *buckets; struct nlattr *channels; int rem1, rem2; - CDF_STATUS status; + QDF_STATUS status; uint8_t bkt_index, j, num_channels, total_channels = 0; uint32_t chan_list[WNI_CFG_VALID_CHANNEL_LIST_LEN] = {0}; @@ -2821,7 +2821,7 @@ static int hdd_extscan_start_fill_bucket_channel_spec( status = sme_get_valid_channels_by_band(hdd_ctx->hHal, req_msg->buckets[bkt_index].band, chan_list, &num_channels); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_GetValidChannelsByBand failed (err=%d)"), status); @@ -3138,7 +3138,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy, struct nlattr *tb[PARAM_MAX + 1]; struct hdd_ext_scan_context *context; uint32_t request_id, num_buckets; - CDF_STATUS status; + QDF_STATUS status; int retval; unsigned long rc; @@ -3250,7 +3250,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_ext_scan_start(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_ext_scan_start failed(err=%d)"), status); goto fail; @@ -3347,7 +3347,7 @@ __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy, hdd_context_t *pHddCtx = wiphy_priv(wiphy); struct nlattr *tb[PARAM_MAX + 1]; struct hdd_ext_scan_context *context; - CDF_STATUS status; + QDF_STATUS status; uint32_t request_id; int retval; unsigned long rc; @@ -3393,7 +3393,7 @@ __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_ext_scan_stop(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_ext_scan_stop failed(err=%d)"), status); goto fail; @@ -3475,7 +3475,7 @@ __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy, 1]; struct hdd_ext_scan_context *context; uint32_t request_id; - CDF_STATUS status; + QDF_STATUS status; int retval; unsigned long rc; @@ -3522,7 +3522,7 @@ __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_reset_bss_hotlist(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_reset_bss_hotlist failed(err=%d)"), status); goto fail; @@ -3600,7 +3600,7 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy 1]; struct hdd_ext_scan_context *context; uint32_t request_id; - CDF_STATUS status; + QDF_STATUS status; int retval; unsigned long rc; @@ -3647,7 +3647,7 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy spin_unlock(&context->context_lock); status = sme_reset_significant_change(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_reset_significant_change failed(err=%d)"), status); cdf_mem_free(pReqMsg); @@ -3812,7 +3812,7 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy, hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct nlattr *tb[ QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1]; - CDF_STATUS status; + QDF_STATUS status; uint32_t num_networks, len; int ret_val; @@ -3869,7 +3869,7 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy, goto fail; status = sme_set_epno_list(hdd_ctx->hHal, req_msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_set_epno_list failed(err=%d)"), status); goto fail; } @@ -4018,7 +4018,7 @@ static int __wlan_hdd_cfg80211_set_passpoint_list(struct wiphy *wiphy, hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1]; - CDF_STATUS status; + QDF_STATUS status; uint32_t num_networks = 0; int ret; @@ -4072,7 +4072,7 @@ static int __wlan_hdd_cfg80211_set_passpoint_list(struct wiphy *wiphy, goto fail; status = sme_set_passpoint_list(hdd_ctx->hHal, req_msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_set_passpoint_list failed(err=%d)"), status); goto fail; @@ -4135,7 +4135,7 @@ static int __wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy, hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1]; - CDF_STATUS status; + QDF_STATUS status; int ret; ENTER(); @@ -4174,7 +4174,7 @@ static int __wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy, req_msg->request_id, req_msg->session_id); status = sme_reset_passpoint_list(hdd_ctx->hHal, req_msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_reset_passpoint_list failed(err=%d)"), status); goto fail; @@ -4264,7 +4264,7 @@ __wlan_hdd_cfg80211_extscan_set_ssid_hotlist(struct wiphy *wiphy, uint32_t request_id; char ssid_string[SIR_MAC_MAX_SSID_LENGTH + 1]; int ssid_len, i, rem; - CDF_STATUS status; + QDF_STATUS status; int retval; unsigned long rc; @@ -4384,7 +4384,7 @@ __wlan_hdd_cfg80211_extscan_set_ssid_hotlist(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_set_ssid_hotlist(hdd_ctx->hHal, request); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_set_ssid_hotlist failed(err=%d)"), status); goto fail; @@ -4484,7 +4484,7 @@ __wlan_hdd_cfg80211_extscan_reset_ssid_hotlist(struct wiphy *wiphy, struct nlattr *tb[PARAM_MAX + 1]; struct hdd_ext_scan_context *context; uint32_t request_id; - CDF_STATUS status; + QDF_STATUS status; int retval; unsigned long rc; @@ -4534,7 +4534,7 @@ __wlan_hdd_cfg80211_extscan_reset_ssid_hotlist(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_set_ssid_hotlist(hdd_ctx->hHal, request); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_reset_ssid_hotlist failed(err=%d)"), status); goto fail; diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 65585520d0..645e7a0cc0 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -99,16 +99,16 @@ static uint32_t wlan_ftm_postmsg(uint8_t *cmd_ptr, uint16_t cmd_len) ftmMsg.bodyptr = (uint8_t *) cmd_ptr; ftmMsg.bodyval = 0; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &ftmMsg)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: : Failed to post Msg to HAL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -161,16 +161,16 @@ static inline void hdd_is_lpass_supported(tMacOpenParameters *mac_openParms, * - All the WLAN SW components should have been opened. This includes MAC. * * Returns: - * CDF_STATUS_SUCCESS - Scheduler was successfully initialized and + * QDF_STATUS_SUCCESS - Scheduler was successfully initialized and * is ready to be used. - * CDF_STATUS_E_RESOURCES - System resources (other than memory) + * QDF_STATUS_E_RESOURCES - System resources (other than memory) * are unavailable to initialize the scheduler - * CDF_STATUS_E_FAILURE - Failure to initialize the scheduler + * QDF_STATUS_E_FAILURE - Failure to initialize the scheduler */ -static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, +static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, uint32_t hddContextSize) { - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; int iter = 0; tSirRetStatus sirStatus = eSIR_SUCCESS; tMacOpenParameters mac_openParms; @@ -191,7 +191,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Trying to open CDS without a PreOpen", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Initialize the probe event */ @@ -199,7 +199,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Unable to init probeEvent", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (qdf_event_create(&(gp_cds_context->wmaCompleteEvent)) != @@ -213,7 +213,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, /* Initialize the free message queue */ vStatus = cds_mq_init(&gp_cds_context->freeVosMq); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, @@ -235,7 +235,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, vStatus = cds_sched_open(gp_cds_context, &gp_cds_context->cdf_sched, sizeof(cds_sched_context)); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to open CDS Scheduler %d", __func__, @@ -300,7 +300,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, vStatus = wma_open(gp_cds_context, wlan_hdd_ftm_update_tgt_cfg, NULL, &mac_openParms); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to open WMA module %d", __func__, @@ -346,7 +346,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, #ifndef QCA_WIFI_FTM /* Now proceed to open the SME */ vStatus = sme_open(gp_cds_context->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to open SME %d", __func__, vStatus); @@ -355,16 +355,16 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, vStatus = sme_init_chan_list(gp_cds_context->pMACContext, hdd_ctx->reg.alpha2, hdd_ctx->reg.cc_src); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to init sme channel list", __func__); } else { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS successfully Opened", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #else - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; #endif #ifndef QCA_WIFI_FTM @@ -397,7 +397,7 @@ err_wma_complete_event: err_probe_event: qdf_event_destroy(&gp_cds_context->ProbeEvent); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* wlan_ftm_cds_open() */ @@ -407,38 +407,37 @@ err_probe_event: * * The wlan_ftm_cds_close() function closes the CDF Module * - * Return: CDF_STATUS_SUCCESS - successfully closed + * Return: QDF_STATUS_SUCCESS - successfully closed */ -static CDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) +static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) { - CDF_STATUS cdf_status; QDF_STATUS qdf_status; p_cds_contextType gp_cds_context = (p_cds_contextType) cds_context; #ifndef QCA_WIFI_FTM - cdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: Failed to close SME %d", __func__, cdf_status); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + "%s: Failed to close SME %d", __func__, qdf_status); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } #endif - cdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: Failed to close MAC %d", __func__, cdf_status); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + "%s: Failed to close MAC %d", __func__, qdf_status); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } ((p_cds_contextType) cds_context)->pMACContext = NULL; - cdf_status = wma_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: Failed to close WMA %d", __func__, cdf_status); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + "%s: Failed to close WMA %d", __func__, qdf_status); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } #if defined(QCA_WIFI_FTM) if (gp_cds_context->htc_ctx) { @@ -446,11 +445,11 @@ static CDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) htc_destroy(gp_cds_context->htc_ctx); gp_cds_context->htc_ctx = NULL; } - cdf_status = wma_wmi_service_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_wmi_service_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_service", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } hif_disable_isr(gp_cds_context->pHIFContext); @@ -474,7 +473,7 @@ static CDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -484,12 +483,12 @@ static CDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) * The cds_ftm_pre_start() function performs all pre-start activities * in FTM mode. * - * Return: CDF_STATUS_SUCCESS if pre-start was successful, an + * Return: QDF_STATUS_SUCCESS if pre-start was successful, an * appropriate CDF_STATUS_E_* error code otherwise */ -static CDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) +static QDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) { - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; #if defined(QCA_WIFI_FTM) @@ -502,7 +501,7 @@ static CDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) CDF_ASSERT(0); CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "%s: WMA NULL context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Reset WMA wait event */ @@ -510,11 +509,11 @@ static CDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) /*call WMA pre start */ vStatus = wma_pre_start(p_cds_context); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Failed to WMA prestart "); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Need to update time out of complete */ @@ -531,20 +530,20 @@ static CDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) __func__); } CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #if defined(QCA_WIFI_FTM) vStatus = htc_start(gp_cds_context->htc_ctx); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, "Failed to Start HTC"); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_wait_for_ready_event(gp_cds_context->pWMAContext); #endif /* QCA_WIFI_FTM */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -558,7 +557,7 @@ static CDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) */ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx) { - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = NULL; CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, @@ -575,7 +574,7 @@ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx) vStatus = wlan_ftm_cds_open(p_cds_context, 0); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_open failed", __func__); goto err_cdf_status_failure; } @@ -656,7 +655,7 @@ static int wlan_ftm_stop(hdd_context_t *hdd_ctx) */ int wlan_hdd_ftm_close(hdd_context_t *hdd_ctx) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; v_CONTEXT_t cds_context = hdd_ctx->pcds_context; hdd_adapter_t *adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_FTM); @@ -675,11 +674,11 @@ int wlan_hdd_ftm_close(hdd_context_t *hdd_ctx) hdd_close_all_adapters(hdd_ctx, false); - cdf_status = cds_sched_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_sched_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close CDS Scheduler", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } /* Close CDS */ wlan_ftm_cds_close(cds_context); @@ -746,7 +745,7 @@ static void hdd_ftm_mc_process_msg(void *message) */ static int wlan_hdd_ftm_start(hdd_context_t *hdd_ctx) { - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) (hdd_ctx->pcds_context); @@ -771,7 +770,7 @@ static int wlan_hdd_ftm_start(hdd_context_t *hdd_ctx) } /* Vos preStart is calling */ - if (!CDF_IS_STATUS_SUCCESS(cds_ftm_pre_start(hdd_ctx->pcds_context))) { + if (!QDF_IS_STATUS_SUCCESS(cds_ftm_pre_start(hdd_ctx->pcds_context))) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_pre_enable failed", __func__); goto err_status_failure; @@ -780,7 +779,7 @@ static int wlan_hdd_ftm_start(hdd_context_t *hdd_ctx) sme_register_ftm_msg_processor(hdd_ctx->hHal, hdd_ftm_mc_process_msg); vStatus = wma_start(p_cds_context); - if (vStatus != CDF_STATUS_SUCCESS) { + if (vStatus != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to start WMA", __func__); goto err_status_failure; @@ -856,7 +855,7 @@ static int wlan_hdd_qcmbr_command(hdd_adapter_t *adapter, if (wlan_hdd_ftm_testmode_cmd(pqcmbr_data->buf, pqcmbr_data-> length) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { ret = -EBUSY; } else { ret = 0; @@ -1013,9 +1012,9 @@ static void wlanqcmbr_mc_process_msg(void *message) * @data: FTM testmode command * @len: length of @data * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) +QDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) { struct ar6k_testmode_cmd_data *cmd_data; @@ -1025,7 +1024,7 @@ CDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) if (!cmd_data) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("Failed to allocate FTM command data")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd_data->data = cdf_mem_malloc(len); @@ -1034,7 +1033,7 @@ CDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("Failed to allocate FTM command data buffer")); cdf_mem_free(cmd_data); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd_data->len = len; @@ -1043,9 +1042,9 @@ CDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) if (wlan_ftm_postmsg((uint8_t *) cmd_data, sizeof(*cmd_data))) { cdf_mem_free(cmd_data->data); cdf_mem_free(cmd_data); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /*QCA_WIFI_FTM */ diff --git a/core/hdd/src/wlan_hdd_green_ap.c b/core/hdd/src/wlan_hdd_green_ap.c index fed68aa1ae..c41e8f4757 100644 --- a/core/hdd/src/wlan_hdd_green_ap.c +++ b/core/hdd/src/wlan_hdd_green_ap.c @@ -302,19 +302,19 @@ static void hdd_wlan_green_ap_timer_fn(void *ctx) * hdd_wlan_green_ap_attach() - Attach Green AP context to HDD context * @hdd_ctx: Global HDD contect * - * Return: CDF_STATUS_SUCCESS on success, otherwise CDF_STATUS_E_* error + * Return: QDF_STATUS_SUCCESS on success, otherwise CDF_STATUS_E_* error */ -static CDF_STATUS hdd_wlan_green_ap_attach(struct hdd_context_s *hdd_ctx) +static QDF_STATUS hdd_wlan_green_ap_attach(struct hdd_context_s *hdd_ctx) { struct hdd_green_ap_ctx *green_ap; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; ENTER(); green_ap = cdf_mem_malloc(sizeof(*green_ap)); if (!green_ap) { hdd_alert("Memory allocation for Green-AP failed!"); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto error; } @@ -340,18 +340,18 @@ error: * hdd_wlan_green_ap_deattach() - Detach Green AP context from HDD context * @hdd_ctx: Global HDD contect * - * Return: CDF_STATUS_SUCCESS on success, otherwise CDF_STATUS_E_* error + * Return: QDF_STATUS_SUCCESS on success, otherwise CDF_STATUS_E_* error */ -static CDF_STATUS hdd_wlan_green_ap_deattach(struct hdd_context_s *hdd_ctx) +static QDF_STATUS hdd_wlan_green_ap_deattach(struct hdd_context_s *hdd_ctx) { struct hdd_green_ap_ctx *green_ap = hdd_ctx->green_ap_ctx; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; ENTER(); if (green_ap == NULL) { hdd_notice("Green-AP is not enabled"); - status = CDF_STATUS_E_NOSUPPORT; + status = QDF_STATUS_E_NOSUPPORT; goto done; } @@ -361,7 +361,7 @@ static CDF_STATUS hdd_wlan_green_ap_deattach(struct hdd_context_s *hdd_ctx) cdf_mc_timer_stop(&green_ap->ps_timer); /* Destroy the Green AP timer */ - if (!CDF_IS_STATUS_SUCCESS(cdf_mc_timer_destroy(&green_ap->ps_timer))) + if (!QDF_IS_STATUS_SUCCESS(cdf_mc_timer_destroy(&green_ap->ps_timer))) hdd_notice("Cannot deallocate Green-AP's timer"); /* release memory */ @@ -383,7 +383,7 @@ done: */ void hdd_wlan_green_ap_init(struct hdd_context_s *hdd_ctx) { - if (!CDF_IS_STATUS_SUCCESS(hdd_wlan_green_ap_attach(hdd_ctx))) + if (!QDF_IS_STATUS_SUCCESS(hdd_wlan_green_ap_attach(hdd_ctx))) hdd_err("Failed to allocate Green-AP resource"); } @@ -395,7 +395,7 @@ void hdd_wlan_green_ap_init(struct hdd_context_s *hdd_ctx) */ void hdd_wlan_green_ap_deinit(struct hdd_context_s *hdd_ctx) { - if (!CDF_IS_STATUS_SUCCESS(hdd_wlan_green_ap_deattach(hdd_ctx))) + if (!QDF_IS_STATUS_SUCCESS(hdd_wlan_green_ap_deattach(hdd_ctx))) hdd_err("Cannot deallocate Green-AP resource"); } diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index f10dcb8cff..85a6c92dd9 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -376,10 +376,10 @@ static int hdd_hostapd_change_mtu(struct net_device *dev, int new_mtu) } #ifdef QCA_HT_2040_COEX -CDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter, +QDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter, uint8_t channel_type) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; hddLog(LOGE, FL("change HT20/40 mode")); @@ -388,17 +388,17 @@ CDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter, hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter); if (NULL == hHal) { hddLog(LOGE, FL("Hal ctx is null")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_set_ht2040_mode(hHal, pHostapdAdapter->sessionId, channel_type, true); - if (cdf_ret_status == CDF_STATUS_E_FAILURE) { + if (cdf_ret_status == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Failed to change HT20/40 mode")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -456,7 +456,7 @@ void hdd_hostapd_inactivity_timer_cb(void *usrDataForCallback) uint8_t we_custom_event[64]; union iwreq_data wrqu; #ifdef DISABLE_CONCURRENCY_AUTOSAVE - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_adapter_t *pHostapdAdapter; hdd_ap_ctx_t *pHddApCtx; #endif /* DISABLE_CONCURRENCY_AUTOSAVE */ @@ -483,11 +483,11 @@ void hdd_hostapd_inactivity_timer_cb(void *usrDataForCallback) */ pHostapdAdapter = netdev_priv(dev); pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter); - cdf_status = + qdf_status = cdf_mc_timer_start(&pHddApCtx->hdd_ap_inactivity_timer, (WLAN_HDD_GET_CTX(pHostapdAdapter))-> config->nAPAutoShutOff * 1000); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Failed to init AP inactivity timer")); } EXIT(); @@ -532,7 +532,7 @@ static int hdd_stop_bss_link(hdd_adapter_t *pHostapdAdapter, { struct net_device *dev; hdd_context_t *pHddCtx = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; dev = (struct net_device *)usrDataForCallback; ENTER(); @@ -552,7 +552,7 @@ static int hdd_stop_bss_link(hdd_adapter_t *pHostapdAdapter, wlansap_stop_bss((WLAN_HDD_GET_CTX(pHostapdAdapter))-> pcds_context); #endif - if (CDF_IS_STATUS_SUCCESS(status)) + if (QDF_IS_STATUS_SUCCESS(status)) hddLog(LOGE, FL("Deleting SAP/P2P link!!!!!!")); clear_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags); @@ -560,7 +560,7 @@ static int hdd_stop_bss_link(hdd_adapter_t *pHostapdAdapter, pHostapdAdapter->sessionId); } EXIT(); - return (status == CDF_STATUS_SUCCESS) ? 0 : -EBUSY; + return (status == QDF_STATUS_SUCCESS) ? 0 : -EBUSY; } /** @@ -592,7 +592,7 @@ static void hdd_issue_stored_joinreq(hdd_adapter_t *sta_adapter, MTRACE(cdf_trace(CDF_MODULE_ID_HDD, TRACE_CODE_HDD_ISSUE_JOIN_REQ, sta_adapter->sessionId, roam_id)); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_issue_stored_joinreq(hal_handle, &roam_id, sta_adapter->sessionId)) { @@ -701,7 +701,7 @@ hdd_update_chandef(hdd_adapter_t *hostapd_adapter, * Return: Success on intimating userspace * */ -CDF_STATUS hdd_chan_change_notify(hdd_adapter_t *hostapd_adapter, +QDF_STATUS hdd_chan_change_notify(hdd_adapter_t *hostapd_adapter, struct net_device *dev, uint8_t oper_chan) { @@ -715,7 +715,7 @@ CDF_STATUS hdd_chan_change_notify(hdd_adapter_t *hostapd_adapter, if (NULL == hal) { hdd_err("hal is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } freq = cds_chan_to_freq(oper_chan); @@ -724,7 +724,7 @@ CDF_STATUS hdd_chan_change_notify(hdd_adapter_t *hostapd_adapter, if (!chan) { hdd_err("Invalid input frequency for channel conversion"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } phy_mode = hdd_sap_get_phymode(hostapd_adapter); @@ -766,7 +766,7 @@ CDF_STATUS hdd_chan_change_notify(hdd_adapter_t *hostapd_adapter, cfg80211_ch_switch_notify(dev, &chandef); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -782,7 +782,7 @@ CDF_STATUS hdd_chan_change_notify(hdd_adapter_t *hostapd_adapter, * Return: Success on sending notifying userspace * */ -CDF_STATUS hdd_send_radar_event(hdd_context_t *hdd_context, +QDF_STATUS hdd_send_radar_event(hdd_context_t *hdd_context, eSapHddEvent event, struct wlan_dfs_info dfs_info, struct wireless_dev *wdev) @@ -795,7 +795,7 @@ CDF_STATUS hdd_send_radar_event(hdd_context_t *hdd_context, if (!hdd_context) { hddLog(LOGE, FL("HDD context is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } freq = cds_chan_to_freq(dfs_info.channel); @@ -817,7 +817,7 @@ CDF_STATUS hdd_send_radar_event(hdd_context_t *hdd_context, data_size = sizeof(uint32_t); break; default: - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } vendor_event = cfg80211_vendor_event_alloc(hdd_context->wiphy, @@ -828,7 +828,7 @@ CDF_STATUS hdd_send_radar_event(hdd_context_t *hdd_context, if (!vendor_event) { hddLog(LOGE, FL("cfg80211_vendor_event_alloc failed for %d"), index); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = nla_put_u32(vendor_event, NL80211_ATTR_WIPHY_FREQ, freq); @@ -836,14 +836,14 @@ CDF_STATUS hdd_send_radar_event(hdd_context_t *hdd_context, if (ret) { hddLog(LOGE, FL("NL80211_ATTR_WIPHY_FREQ put fail")); kfree_skb(vendor_event); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cfg80211_vendor_event(vendor_event, GFP_KERNEL); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, +QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, void *usrDataForCallback) { hdd_adapter_t *pHostapdAdapter; @@ -856,7 +856,6 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, int we_event = 0; int i = 0; uint8_t staId; - CDF_STATUS cdf_status; QDF_STATUS qdf_status; bool bWPSState; bool bAuthRequired = true; @@ -873,7 +872,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, struct wlan_dfs_info dfs_info; uint8_t cc_len = WLAN_SVC_COUNTRY_CODE_LEN; hdd_adapter_t *con_sap_adapter; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; #if defined CONFIG_CNSS int ret = 0; #endif @@ -881,7 +880,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, dev = (struct net_device *)usrDataForCallback; if (!dev) { hddLog(LOGE, FL("usrDataForCallback is null")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pHostapdAdapter = netdev_priv(dev); @@ -889,7 +888,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, if ((NULL == pHostapdAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pHostapdAdapter->magic)) { hddLog(LOGE, "invalid adapter or adapter has invalid magic"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pHostapdAdapter); @@ -897,7 +896,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, if (!pSapEvent) { hddLog(LOGE, FL("pSapEvent is null")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sapEvent = pSapEvent->sapHddEventCode; @@ -906,14 +905,14 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, if (!pHddCtx) { hddLog(LOGE, FL("HDD context is null")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cfg = pHddCtx->config; if (!cfg) { hddLog(LOGE, FL("HDD config is null")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } dfs_info.channel = pHddApCtx->operatingChannel; @@ -932,12 +931,12 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pHostapdAdapter->sessionId = pSapEvent->sapevt.sapStartBssCompleteEvent.sessionId; - pHostapdState->cdf_status = + pHostapdState->qdf_status = pSapEvent->sapevt.sapStartBssCompleteEvent.status; qdf_status = qdf_event_set(&pHostapdState->cdf_event); if (!QDF_IS_STATUS_SUCCESS(qdf_status) - || pHostapdState->cdf_status) { + || pHostapdState->qdf_status) { hddLog(LOGE, ("ERROR: startbss event failed!!")); goto stopbss; } else { @@ -951,12 +950,12 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, hdd_softap_tx_resume_cb); /* @@@ need wep logic here to set privacy bit */ - cdf_status = + qdf_status = hdd_softap_register_bc_sta(pHostapdAdapter, pHddApCtx->uPrivacy); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGW, FL("Failed to register BC STA %d"), - cdf_status); + qdf_status); hdd_stop_bss_link(pHostapdAdapter, usrDataForCallback); } @@ -978,23 +977,23 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, (WLAN_HDD_GET_CTX(pHostapdAdapter))->config-> nAPAutoShutOff) { /* AP Inactivity timer init and start */ - cdf_status = + qdf_status = cdf_mc_timer_init(&pHddApCtx-> hdd_ap_inactivity_timer, CDF_TIMER_TYPE_SW, hdd_hostapd_inactivity_timer_cb, dev); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, FL("Failed to init inactivity timer")); - cdf_status = + qdf_status = cdf_mc_timer_start(&pHddApCtx-> hdd_ap_inactivity_timer, (WLAN_HDD_GET_CTX (pHostapdAdapter))->config-> nAPAutoShutOff * 1000); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, FL("Failed to init inactivity timer")); @@ -1024,7 +1023,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pcds_context, #endif &pHddApCtx->groupKey); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) hddLog(LOGE, FL("wlansap_set_key_sta failed")); } else { for (i = 0; i < CSR_MAX_NUM_KEY; i++) { @@ -1041,7 +1040,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, #endif &pHddApCtx-> wepKey[i]); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("set_key failed idx %d"), i); } @@ -1151,7 +1150,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, &dfs_info, sizeof(struct wlan_dfs_info)); pHddCtx->dev_dfs_cac_status = DFS_CAC_IN_PROGRESS; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_send_radar_event(pHddCtx, eSAP_DFS_CAC_START, dfs_info, &pHostapdAdapter->wdev)) { hddLog(LOGE, FL("Unable to indicate CAC start NL event")); @@ -1172,7 +1171,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, * space applications are waiting on CAC end for their state * management. */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_send_radar_event(pHddCtx, eSAP_DFS_CAC_END, dfs_info, &pHostapdAdapter->wdev)) { hdd_err("Unable to indicate CAC end (interrupted) event"); @@ -1186,7 +1185,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, sizeof(struct wlan_dfs_info)); pHddApCtx->dfs_cac_block_tx = false; pHddCtx->dev_dfs_cac_status = DFS_CAC_ALREADY_DONE; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_send_radar_event(pHddCtx, eSAP_DFS_CAC_END, dfs_info, &pHostapdAdapter->wdev)) { hddLog(LOGE, FL("Unable to indicate CAC end NL event")); @@ -1200,7 +1199,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, &dfs_info, sizeof(struct wlan_dfs_info)); pHddCtx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_send_radar_event(pHddCtx, eSAP_DFS_RADAR_DETECT, dfs_info, &pHostapdAdapter->wdev)) { hddLog(LOGE, FL("Unable to indicate Radar detect NL event")); @@ -1223,7 +1222,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, hddLog(LOG1, FL("SET Key: configured status = %s"), pSapEvent->sapevt.sapStationSetKeyCompleteEvent. status ? "eSAP_STATUS_FAILURE" : "eSAP_STATUS_SUCCESS"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_STA_MIC_FAILURE_EVENT: { memset(&msg, '\0', sizeof(msg)); @@ -1288,7 +1287,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, } if (bAuthRequired || bWPSState == true) { - cdf_status = hdd_softap_register_sta( + qdf_status = hdd_softap_register_sta( pHostapdAdapter, true, pHddApCtx->uPrivacy, @@ -1300,13 +1299,13 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pSapEvent->sapevt. sapStationAssocReassocCompleteEvent. wmmEnabled); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGW, FL("Failed to register STA %d " - MAC_ADDRESS_STR ""), cdf_status, + MAC_ADDRESS_STR ""), qdf_status, MAC_ADDR_ARRAY(wrqu.addr.sa_data)); } else { - cdf_status = hdd_softap_register_sta( + qdf_status = hdd_softap_register_sta( pHostapdAdapter, false, pHddApCtx->uPrivacy, @@ -1318,16 +1317,16 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pSapEvent->sapevt. sapStationAssocReassocCompleteEvent. wmmEnabled); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGW, FL("Failed to register STA %d " - MAC_ADDRESS_STR ""), cdf_status, + MAC_ADDRESS_STR ""), qdf_status, MAC_ADDR_ARRAY(wrqu.addr.sa_data)); } staId = pSapEvent->sapevt.sapStationAssocReassocCompleteEvent.staId; - if (CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (QDF_IS_STATUS_SUCCESS(qdf_status)) { pHostapdAdapter->aStaInfo[staId].nss = pSapEvent->sapevt. sapStationAssocReassocCompleteEvent. @@ -1376,10 +1375,10 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, /* Stop AP inactivity timer */ if (pHddApCtx->hdd_ap_inactivity_timer.state == CDF_TIMER_STATE_RUNNING) { - cdf_status = + qdf_status = cdf_mc_timer_stop(&pHddApCtx-> hdd_ap_inactivity_timer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Failed to start inactivity timer")); } @@ -1454,14 +1453,14 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, else hddLog(LOG1, " MAC initiated disassociation"); we_event = IWEVEXPIRED; - cdf_status = + qdf_status = hdd_softap_get_sta_id(pHostapdAdapter, &pSapEvent->sapevt. sapStationDisassocCompleteEvent.staMac, &staId); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("ERROR: HDD Failed to find sta id!!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #ifdef IPA_OFFLOAD if (hdd_ipa_is_enabled(pHddCtx)) { @@ -1506,7 +1505,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, if (pHddApCtx->bApActive == false) { if (pHddApCtx->hdd_ap_inactivity_timer.state == CDF_TIMER_STATE_STOPPED) { - cdf_status = + qdf_status = cdf_mc_timer_start(&pHddApCtx-> hdd_ap_inactivity_timer, (WLAN_HDD_GET_CTX @@ -1514,7 +1513,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, config-> nAPAutoShutOff * 1000); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, FL("Failed to init AP inactivity timer")); } else @@ -1535,10 +1534,10 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, bytes[0], GFP_KERNEL); /* Update the beacon Interval if it is P2P GO */ - cdf_status = cds_change_mcc_go_beacon_interval(pHostapdAdapter); - if (CDF_STATUS_SUCCESS != cdf_status) { + qdf_status = cds_change_mcc_go_beacon_interval(pHostapdAdapter); + if (QDF_STATUS_SUCCESS != qdf_status) { hddLog(LOGE, FL("failed to update Beacon interval %d"), - cdf_status); + qdf_status); } if (pHostapdAdapter->device_mode == WLAN_HDD_P2P_GO) { /* send peer status indication to oem app */ @@ -1589,7 +1588,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, wireless_send_event(dev, IWEVCUSTOM, &wreq, (char *)message); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } case eSAP_ASSOC_STA_CALLBACK_EVENT: pAssocStasArray = @@ -1611,17 +1610,17 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, } cdf_mem_free(pSapEvent->sapevt.sapAssocStaListEvent.pAssocStas); /* Release caller allocated memory here */ pSapEvent->sapevt.sapAssocStaListEvent.pAssocStas = NULL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_REMAIN_CHAN_READY: hdd_remain_chan_ready_handler(pHostapdAdapter, pSapEvent->sapevt.sap_roc_ind.scan_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_SEND_ACTION_CNF: hdd_send_action_cnf(pHostapdAdapter, (eSAP_STATUS_SUCCESS == pSapEvent->sapevt.sapActionCnf. actionSendSuccess) ? true : false); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_UNKNOWN_STA_JOIN: snprintf(unknownSTAEvent, IW_CUSTOM_MAX, "JOIN_UNKNOWN_STA-%02x:%02x:%02x:%02x:%02x:%02x", @@ -1657,21 +1656,21 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, hddLog(LOG1, "%s", maxAssocExceededEvent); break; case eSAP_STA_ASSOC_IND: - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_DISCONNECT_ALL_P2P_CLIENT: hddLog(LOG1, FL(" Disconnecting all the P2P Clients....")); hdd_clear_all_sta(pHostapdAdapter, usrDataForCallback); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_MAC_TRIG_STOP_BSS_EVENT: - cdf_status = + qdf_status = hdd_stop_bss_link(pHostapdAdapter, usrDataForCallback); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGW, FL("hdd_stop_bss_link failed %d"), - cdf_status); + qdf_status); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_CHANNEL_CHANGE_EVENT: hddLog(LOG1, FL("Received eSAP_CHANNEL_CHANGE_EVENT event")); @@ -1706,7 +1705,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, */ if (pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP && pHddCtx->config->force_sap_acs) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; else return hdd_chan_change_notify(pHostapdAdapter, dev, pSapEvent->sapevt.sap_ch_selected.pri_ch); @@ -1717,13 +1716,13 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, hddLog(LOG1, FL("Reusing Last ACS scan result for %d sec"), ACS_SCAN_EXPIRY_TIMEOUT_S); cdf_mc_timer_stop(&pHddCtx->skip_acs_scan_timer); - cdf_status = cdf_mc_timer_start(&pHddCtx->skip_acs_scan_timer, + qdf_status = cdf_mc_timer_start(&pHddCtx->skip_acs_scan_timer, ACS_SCAN_EXPIRY_TIMEOUT_S * 1000); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, FL("Failed to start ACS scan expiry timer")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; #endif case eSAP_DFS_NOL_GET: @@ -1740,14 +1739,14 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, if (ret > 0) { hddLog(LOG2, FL("Get %d bytes of dfs nol from cnss"), ret); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else { hddLog(LOG2, FL("No dfs nol entry in CNSS, ret: %d"), ret); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } #else - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; #endif case eSAP_DFS_NOL_SET: hddLog(LOG1, FL("Received eSAP_DFS_NOL_SET event")); @@ -1768,9 +1767,9 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pSapEvent->sapevt.sapDfsNolInfo.sDfsList); } #else - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_ACS_CHANNEL_SELECTED: hddLog(LOG1, FL("ACS Completed for wlan%d"), pHostapdAdapter->dev->ifindex); @@ -1789,7 +1788,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, /* send vendor event to hostapd only for hostapd based acs*/ if (!pHddCtx->config->force_sap_acs) wlan_hdd_cfg80211_acs_ch_select_evt(pHostapdAdapter); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_ECSA_CHANGE_CHAN_IND: hddLog(LOG1, FL("Channel change indication from peer for channel %d"), @@ -1797,18 +1796,18 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, if (hdd_softap_set_channel_change(dev, pSapEvent->sapevt.sap_chan_cng_ind.new_chan, CH_WIDTH_MAX)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; else - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; default: hddLog(LOG1, "SAP message is not handled"); goto stopbss; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } wireless_send_event(dev, we_event, &wrqu, (char *)we_custom_event_generic); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; stopbss: { @@ -1829,19 +1828,19 @@ stopbss: nAPAutoShutOff) { if (CDF_TIMER_STATE_RUNNING == pHddApCtx->hdd_ap_inactivity_timer.state) { - cdf_status = + qdf_status = cdf_mc_timer_stop(&pHddApCtx-> hdd_ap_inactivity_timer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Failed to stop AP inactivity timer")); } } - cdf_status = + qdf_status = cdf_mc_timer_destroy(&pHddApCtx-> hdd_ap_inactivity_timer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, FL("Failed to Destroy AP inactivity timer")); } #ifdef FEATURE_WLAN_AUTO_SHUTDOWN @@ -1853,11 +1852,11 @@ stopbss: hdd_hostapd_stop(dev); /* reclaim all resources allocated to the BSS */ - cdf_status = hdd_softap_stop_bss(pHostapdAdapter); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = hdd_softap_stop_bss(pHostapdAdapter); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGW, FL("hdd_softap_stop_bss failed %d"), - cdf_status); + qdf_status); } /* once the event is set, structure dev/pHostapdAdapter should @@ -1879,7 +1878,7 @@ stopbss: /* Send SCC/MCC Switching event to IPA */ hdd_ipa_send_mcc_scc_msg(pHddCtx, pHddCtx->mcc_mode); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } int hdd_softap_unpack_ie(tHalHandle halHandle, @@ -1910,7 +1909,7 @@ int hdd_softap_unpack_ie(tHalHandle halHandle, /* Validity checks */ if ((gen_ie_len < DOT11F_IE_RSN_MIN_LEN) || (gen_ie_len > DOT11F_IE_RSN_MAX_LEN)) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Skip past the EID byte and length byte */ pRsnIe = gen_ie + 2; @@ -1946,7 +1945,7 @@ int hdd_softap_unpack_ie(tHalHandle halHandle, /* Validity checks */ if ((gen_ie_len < DOT11F_IE_WPA_MIN_LEN) || (gen_ie_len > DOT11F_IE_WPA_MAX_LEN)) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Skip past the EID byte and length byte - and four byte WiFi OUI */ pRsnIe = gen_ie + 2 + 4; @@ -1976,9 +1975,9 @@ int hdd_softap_unpack_ie(tHalHandle halHandle, *pMFPRequired = false; } else { hddLog(LOGW, FL("gen_ie[0]: %d"), gen_ie[0]); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1996,7 +1995,7 @@ int hdd_softap_unpack_ie(tHalHandle halHandle, int hdd_softap_set_channel_change(struct net_device *dev, int target_channel, phy_ch_width target_bw) { - CDF_STATUS status; + QDF_STATUS status; int ret = 0; hdd_adapter_t *pHostapdAdapter = (netdev_priv(dev)); hdd_context_t *pHddCtx = NULL; @@ -2068,7 +2067,7 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_channel, target_channel, target_bw); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("SAP set channel failed for channel = %d, bw:%d"), target_channel, target_bw); @@ -2092,7 +2091,7 @@ static __iw_softap_set_ini_cfg(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - CDF_STATUS vstatus; + QDF_STATUS vstatus; int ret = 0; /* success */ hdd_adapter_t *pAdapter = (netdev_priv(dev)); hdd_context_t *pHddCtx; @@ -2112,7 +2111,7 @@ static __iw_softap_set_ini_cfg(struct net_device *dev, hddLog(LOG1, FL("Received data %s"), extra); vstatus = hdd_execute_global_config_command(pHddCtx, extra); - if (CDF_STATUS_SUCCESS != vstatus) { + if (QDF_STATUS_SUCCESS != vstatus) { ret = -EINVAL; } @@ -2258,7 +2257,7 @@ static void print_mac_list(struct cdf_mac_addr *macList, uint8_t size) return; } -static CDF_STATUS hdd_print_acl(hdd_adapter_t *pHostapdAdapter) +static QDF_STATUS hdd_print_acl(hdd_adapter_t *pHostapdAdapter) { eSapMacAddrACL acl_mode; struct cdf_mac_addr MacList[MAX_ACL_MAC_ADDRESS]; @@ -2271,7 +2270,7 @@ static CDF_STATUS hdd_print_acl(hdd_adapter_t *pHostapdAdapter) p_cds_gctx = (WLAN_HDD_GET_CTX(pHostapdAdapter))->pcds_context; #endif cdf_mem_zero(&MacList[0], sizeof(MacList)); - if (CDF_STATUS_SUCCESS == wlansap_get_acl_mode(p_cds_gctx, &acl_mode)) { + if (QDF_STATUS_SUCCESS == wlansap_get_acl_mode(p_cds_gctx, &acl_mode)) { pr_info("******** ACL MODE *********\n"); switch (acl_mode) { case eSAP_ACCEPT_UNLESS_DENIED: @@ -2288,32 +2287,32 @@ static CDF_STATUS hdd_print_acl(hdd_adapter_t *pHostapdAdapter) break; default: pr_info("Invalid SAP ACL Mode = %d\n", acl_mode); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - if (CDF_STATUS_SUCCESS == wlansap_get_acl_accept_list(p_cds_gctx, + if (QDF_STATUS_SUCCESS == wlansap_get_acl_accept_list(p_cds_gctx, &MacList[0], &listnum)) { pr_info("******* WHITE LIST ***********\n"); if (listnum <= MAX_ACL_MAC_ADDRESS) print_mac_list(&MacList[0], listnum); } else { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - if (CDF_STATUS_SUCCESS == wlansap_get_acl_deny_list(p_cds_gctx, + if (QDF_STATUS_SUCCESS == wlansap_get_acl_deny_list(p_cds_gctx, &MacList[0], &listnum)) { pr_info("******* BLACK LIST ***********\n"); if (listnum <= MAX_ACL_MAC_ADDRESS) print_mac_list(&MacList[0], listnum); } else { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } int @@ -2326,7 +2325,7 @@ static __iw_softap_setparam(struct net_device *dev, int *value = (int *)extra; int sub_cmd = value[0]; int set_value = value[1]; - CDF_STATUS status; + QDF_STATUS status; int ret = 0; /* success */ v_CONTEXT_t p_cds_context; hdd_context_t *hdd_ctx; @@ -2358,7 +2357,7 @@ static __iw_softap_setparam(struct net_device *dev, break; case QCSAP_PARAM_CLR_ACL: - if (CDF_STATUS_SUCCESS != wlansap_clear_acl( + if (QDF_STATUS_SUCCESS != wlansap_clear_acl( #ifdef WLAN_FEATURE_MBSSID WLAN_HDD_GET_SAP_CTX_PTR (pHostapdAdapter) @@ -2427,7 +2426,7 @@ static __iw_softap_setparam(struct net_device *dev, } status = sme_cfg_set_int(hHal, WNI_CFG_ASSOC_STA_LIMIT, set_value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("setMaxAssoc failure, status %d"), status); @@ -2438,11 +2437,11 @@ static __iw_softap_setparam(struct net_device *dev, case QCSAP_PARAM_HIDE_SSID: { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_hide_ssid(hHal, pHostapdAdapter->sessionId, set_value); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("QCSAP_PARAM_HIDE_SSID failed")); return status; } @@ -2463,7 +2462,7 @@ static __iw_softap_setparam(struct net_device *dev, rateUpdate.mcastDataRate5GHz = set_value; rateUpdate.bcastDataRate = -1; status = sme_send_rate_update_ind(hHal, &rateUpdate); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("SET_MC_RATE failed")); ret = -1; } @@ -2990,7 +2989,7 @@ static __iw_softap_getparam(struct net_device *dev, tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter); int *value = (int *)extra; int sub_cmd = value[0]; - CDF_STATUS status; + QDF_STATUS status; int ret; hdd_context_t *hdd_ctx; @@ -3006,7 +3005,7 @@ static __iw_softap_getparam(struct net_device *dev, status = sme_cfg_get_int(hHal, WNI_CFG_ASSOC_STA_LIMIT, (uint32_t *) value); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("failed to get WNI_CFG_ASSOC_STA_LIMIT from cfg %d"), status); @@ -3132,7 +3131,7 @@ static __iw_softap_getparam(struct net_device *dev, { hddLog(LOG1, FL("QCSAP_GET_ACL")); if (hdd_print_acl(pHostapdAdapter) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(LOGE, FL ("QCSAP_GET_ACL returned Error: not completed")); @@ -3236,7 +3235,7 @@ int __iw_softap_modify_acl(struct net_device *dev, uint8_t pPeerStaMac[CDF_MAC_ADDR_SIZE]; int listType, cmd, i; int ret; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; hdd_context_t *hdd_ctx; ENTER(); @@ -3266,16 +3265,16 @@ int __iw_softap_modify_acl(struct net_device *dev, MAC_ADDR_ARRAY(pPeerStaMac), listType, cmd); #ifdef WLAN_FEATURE_MBSSID - cdf_status = + qdf_status = wlansap_modify_acl(WLAN_HDD_GET_SAP_CTX_PTR(pHostapdAdapter), pPeerStaMac, (eSapACLType) listType, (eSapACLCmdType) cmd); #else - cdf_status = + qdf_status = wlansap_modify_acl(p_cds_context, pPeerStaMac, (eSapACLType) listType, (eSapACLCmdType) cmd); #endif - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Modify ACL failed")); ret = -EIO; } @@ -3365,7 +3364,7 @@ static __iw_softap_set_max_tx_power(struct net_device *dev, cdf_copy_macaddr(&selfMac, &pHostapdAdapter->macAddressCurrent); set_value = value[0]; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_max_tx_power(hHal, bssid, selfMac, set_value)) { hddLog(LOGE, FL("Setting maximum tx power failed")); return -EIO; @@ -3414,7 +3413,7 @@ static __iw_softap_set_tx_power(struct net_device *dev, cdf_copy_macaddr(&bssid, &pHostapdAdapter->macAddressCurrent); set_value = value[0]; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_tx_power(hHal, pHostapdAdapter->sessionId, bssid, pHostapdAdapter->device_mode, set_value)) { hddLog(LOGE, FL("Setting tx power failed")); @@ -3661,9 +3660,9 @@ static int wlan_hdd_set_force_acs_ch_range(struct net_device *dev, } if (wlan_hdd_validate_operation_channel(adapter, value[0]) != - CDF_STATUS_SUCCESS || + QDF_STATUS_SUCCESS || wlan_hdd_validate_operation_channel(adapter, value[1]) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { return -EINVAL; } else { hdd_ctx->config->force_sap_acs_st_ch = value[0]; @@ -3704,7 +3703,7 @@ static int __iw_softap_get_channel_list(struct net_device *dev, if (0 != ret) return ret; - if (CDF_STATUS_SUCCESS != sme_get_freq_band(hHal, &curBand)) { + if (QDF_STATUS_SUCCESS != sme_get_freq_band(hHal, &curBand)) { hddLog(LOGE, FL("not able get the current frequency band")); return -EIO; } @@ -3767,7 +3766,7 @@ int __iw_get_genie(struct net_device *dev, #ifndef WLAN_FEATURE_MBSSID v_CONTEXT_t cds_ctx; #endif - CDF_STATUS status; + QDF_STATUS status; uint32_t length = DOT11F_IE_RSN_MAX_LEN; uint8_t genIeBytes[DOT11F_IE_RSN_MAX_LEN]; @@ -3799,7 +3798,7 @@ int __iw_get_genie(struct net_device *dev, cds_ctx, #endif &length, genIeBytes); - if (status == CDF_STATUS_SUCCESS) { + if (status == QDF_STATUS_SUCCESS) { length = CDF_MIN(length, DOT11F_IE_RSN_MAX_LEN); if (wrqu->data.length < length || copy_to_user(wrqu->data.pointer, (void *)genIeBytes, length)) { @@ -3993,7 +3992,7 @@ static int __iw_set_ap_encodeext(struct net_device *dev, hdd_ap_ctx_t *pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter); hdd_context_t *hdd_ctx; int ret; - CDF_STATUS vstatus; + QDF_STATUS vstatus; struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; int key_index; struct iw_point *encoding = &wrqu->encoding; @@ -4123,7 +4122,7 @@ static int __iw_set_ap_encodeext(struct net_device *dev, vstatus = wlansap_set_key_sta(cds_ctx, &setKey); #endif - if (vstatus != CDF_STATUS_SUCCESS) { + if (vstatus != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("wlansap_set_key_sta failed, status= %d"), vstatus); ret = -EINVAL; @@ -4330,7 +4329,7 @@ static int __iw_get_ap_freq(struct net_device *dev, if (pHostapdState->bssState == BSS_STOP) { if (sme_cfg_get_int(hHal, WNI_CFG_CURRENT_CHANNEL, &channel) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { return -EIO; } else { status = hdd_wlan_get_freq(channel, &freq); @@ -4442,7 +4441,7 @@ __iw_softap_setwpsie(struct net_device *dev, v_CONTEXT_t cds_ctx; #endif hdd_hostapd_state_t *pHostapdState; - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; uint8_t *wps_genie; uint8_t *fwps_genie; uint8_t *pos; @@ -5035,7 +5034,7 @@ __iw_softap_stopbss(struct net_device *dev, union iwreq_data *wrqu, char *extra) { hdd_adapter_t *pHostapdAdapter = (netdev_priv(dev)); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; hdd_context_t *hdd_ctx; @@ -5059,7 +5058,7 @@ __iw_softap_stopbss(struct net_device *dev, wlansap_stop_bss((WLAN_HDD_GET_CTX(pHostapdAdapter))-> pcds_context); #endif - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { qdf_status = qdf_wait_single_event(&pHostapdState-> cdf_stop_bss_event, @@ -5076,7 +5075,7 @@ __iw_softap_stopbss(struct net_device *dev, pHostapdAdapter->sessionId); } EXIT(); - return (status == CDF_STATUS_SUCCESS) ? 0 : -EBUSY; + return (status == QDF_STATUS_SUCCESS) ? 0 : -EBUSY; } static int iw_softap_stopbss(struct net_device *dev, @@ -5129,7 +5128,7 @@ static int iw_softap_version(struct net_device *dev, } static -CDF_STATUS hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, uint8_t *pBuf, +QDF_STATUS hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, uint8_t *pBuf, int buf_len) { uint8_t i; uint8_t maxSta = 0; @@ -5147,7 +5146,7 @@ CDF_STATUS hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, uint8_t *pBuf, hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); if (0 != wlan_hdd_validate_context(hdd_ctx)) - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; len = scnprintf(pBuf, buf_len, sta_info_header); pBuf += len; @@ -5176,7 +5175,7 @@ CDF_STATUS hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, uint8_t *pBuf, } } EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static int __iw_softap_get_sta_info(struct net_device *dev, @@ -5184,7 +5183,7 @@ static int __iw_softap_get_sta_info(struct net_device *dev, union iwreq_data *wrqu, char *extra) { hdd_adapter_t *pHostapdAdapter = netdev_priv(dev); - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx; int ret; @@ -5199,7 +5198,7 @@ static int __iw_softap_get_sta_info(struct net_device *dev, hdd_softap_get_sta_info(pHostapdAdapter, extra, WE_SAP_MAX_STA_INFO); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("Failed to get sta info: %d"), status); return -EINVAL; } @@ -5241,7 +5240,7 @@ static int __iw_set_ap_genie(struct net_device *dev, v_CONTEXT_t cds_ctx; #endif hdd_context_t *hdd_ctx; - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; uint8_t *genie = (uint8_t *)extra; int ret; @@ -5332,7 +5331,7 @@ int __iw_get_softap_linkspeed(struct net_device *dev, int len = sizeof(uint32_t) + 1; struct cdf_mac_addr macAddress; char pmacAddress[MAC_ADDRESS_STR_LEN + 1]; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; int rc, valid, i; ENTER(); @@ -5360,7 +5359,7 @@ int __iw_get_softap_linkspeed(struct net_device *dev, /* If no mac address is passed and/or its length is less than 17, * link speed for first connected client will be returned. */ - if (wrqu->data.length < 17 || !CDF_IS_STATUS_SUCCESS(status)) { + if (wrqu->data.length < 17 || !QDF_IS_STATUS_SUCCESS(status)) { for (i = 0; i < WLAN_MAX_STA_COUNT; i++) { if (pHostapdAdapter->aStaInfo[i].isUsed && (!cdf_is_macaddr_broadcast @@ -5369,18 +5368,18 @@ int __iw_get_softap_linkspeed(struct net_device *dev, &macAddress, &pHostapdAdapter->aStaInfo[i]. macAddrSTA); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } } } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("Invalid peer macaddress")); return -EINVAL; } status = wlan_hdd_get_linkspeed_for_peermac(pHostapdAdapter, macAddress); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("Unable to retrieve SME linkspeed")); return -EINVAL; } @@ -5977,7 +5976,7 @@ struct net_device_ops net_ops_struct = { static int hdd_set_hostapd(hdd_adapter_t *pAdapter) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void hdd_set_ap_ops(struct net_device *pWlanHostapdDev) @@ -5985,12 +5984,12 @@ void hdd_set_ap_ops(struct net_device *pWlanHostapdDev) pWlanHostapdDev->netdev_ops = &net_ops_struct; } -CDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) { hdd_hostapd_state_t *phostapdBuf; struct net_device *dev = pAdapter->dev; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - CDF_STATUS status; + QDF_STATUS status; QDF_STATUS qdf_status; #ifdef WLAN_FEATURE_MBSSID v_CONTEXT_t p_cds_context = (WLAN_HDD_GET_CTX(pAdapter))->pcds_context; @@ -6004,13 +6003,13 @@ CDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) sapContext = wlansap_open(p_cds_context); if (sapContext == NULL) { hddLog(LOGE, ("ERROR: wlansap_open failed!!")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pAdapter->sessionCtx.ap.sapContext = sapContext; status = wlansap_start(sapContext); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, ("ERROR: wlansap_start failed!!")); wlansap_close(sapContext); return status; @@ -6028,7 +6027,7 @@ CDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) /* Set up the pointer to the Wireless Extensions state structure */ /* NOP */ status = hdd_set_hostapd(pAdapter); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, ("ERROR: hdd_set_hostapd failed!!")); #ifdef WLAN_FEATURE_MBSSID wlansap_close(sapContext); @@ -6065,12 +6064,12 @@ CDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) /* Initialize the data path module */ status = hdd_softap_init_tx_rx(pAdapter); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGP, FL("hdd_softap_init_tx_rx failed")); } status = hdd_wmm_adapter_init(pAdapter); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, "hdd_wmm_adapter_init() failed code %08d [x%08x]", status, status); @@ -6192,10 +6191,10 @@ hdd_adapter_t *hdd_wlan_create_ap_dev(hdd_context_t *pHddCtx, * * Return: CDF status */ -CDF_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter, uint8_t rtnl_lock_held) { struct net_device *dev = pAdapter->dev; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; ENTER(); @@ -6203,17 +6202,17 @@ CDF_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter, if (strnchr(dev->name, strlen(dev->name), '%')) { if (dev_alloc_name(dev, dev->name) < 0) { hddLog(LOGE, FL("Failed:dev_alloc_name")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } if (register_netdevice(dev)) { hddLog(LOGE, FL("Failed:register_netdevice")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { if (register_netdev(dev)) { hddLog(LOGE, FL("Failed:register_netdev")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } set_bit(NET_DEVICE_REGISTERED, &pAdapter->event_flags); @@ -6227,12 +6226,12 @@ CDF_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter, * @pAdapter: Pointer to hostapd adapter * @rtnl_held: true if rtnl lock held; false otherwise * - * Return: CDF_STATUS enumaration + * Return: QDF_STATUS enumaration */ -CDF_STATUS hdd_unregister_hostapd(hdd_adapter_t *pAdapter, bool rtnl_held) +QDF_STATUS hdd_unregister_hostapd(hdd_adapter_t *pAdapter, bool rtnl_held) { #ifdef WLAN_FEATURE_MBSSID - CDF_STATUS status; + QDF_STATUS status; void *sapContext = WLAN_HDD_GET_SAP_CTX_PTR(pAdapter); #endif @@ -6257,11 +6256,11 @@ CDF_STATUS hdd_unregister_hostapd(hdd_adapter_t *pAdapter, bool rtnl_held) #ifdef WLAN_FEATURE_MBSSID status = wlansap_stop(sapContext); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) hddLog(LOGE, FL("Failed:wlansap_stop")); status = wlansap_close(sapContext); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) hddLog(LOGE, FL("Failed:WLANSAP_close")); pAdapter->sessionCtx.ap.sapContext = NULL; #endif @@ -6405,7 +6404,7 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy, if ((WLAN_HDD_SOFTAP != pAdapter->device_mode) && (WLAN_HDD_P2P_GO != pAdapter->device_mode)) { - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(pAdapter, channel)) { hddLog(LOGE, FL("Invalid Channel [%d]"), channel); return -EINVAL; @@ -6443,7 +6442,7 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy, ) { sap_config = &((WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->sapConfig); if (WLAN_HDD_P2P_GO == pAdapter->device_mode) { - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(pAdapter, channel)) { hddLog(LOGE, @@ -6454,7 +6453,7 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy, sap_config->ch_params.center_freq_seg1 = channel_seg2; } else { /* set channel to what hostapd configured */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(pAdapter, channel)) { hddLog(LOGE, @@ -6919,7 +6918,7 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter) if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(adapter), &updateIE, eUPDATE_IE_PROBE_BCN) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Could not pass on Add Ie probe beacon data")); ret = -EINVAL; @@ -6942,7 +6941,7 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter) if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(adapter), &updateIE, eUPDATE_IE_PROBE_RESP) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Could not pass on PROBE_RESP add Ie data")); ret = -EINVAL; @@ -6965,7 +6964,7 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter) if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(adapter), &updateIE, eUPDATE_IE_ASSOC_RESP) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Could not pass on Add Ie Assoc Response data")); ret = -EINVAL; @@ -7049,9 +7048,9 @@ static void wlan_hdd_set_sap_hwmode(hdd_adapter_t *pHostapdAdapter) * This function get ACS related INI paramters and populated * sap config and smeConfig for ACS needed configurations. * - * Return: The CDF_STATUS code associated with performing the operation. + * Return: The QDF_STATUS code associated with performing the operation. */ -CDF_STATUS wlan_hdd_config_acs(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) +QDF_STATUS wlan_hdd_config_acs(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) { tsap_Config_t *sap_config; struct hdd_config *ini_config; @@ -7165,7 +7164,7 @@ CDF_STATUS wlan_hdd_config_acs(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) } #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7316,7 +7315,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, eCsrAuthType RSNAuthType; eCsrEncryptionType RSNEncryptType; eCsrEncryptionType mcRSNEncryptType; - int status = CDF_STATUS_SUCCESS, ret; + int status = QDF_STATUS_SUCCESS, ret; int qdf_status = QDF_STATUS_SUCCESS; tpWLAN_SAPEventCB pSapEventCallback; hdd_hostapd_state_t *pHostapdState; @@ -7394,7 +7393,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, } } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(pHostapdAdapter, pConfig->channel)) { hddLog(LOGE, FL("Invalid Channel [%d]"), @@ -7493,7 +7492,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, pConfig->RSNWPAReqIE[1] + 2, pConfig->RSNWPAReqIE); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* Now copy over all the security attributes you have * parsed out. Use the cipher type in the RSN IE */ @@ -7541,7 +7540,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, pConfig->RSNWPAReqIE[1] + 2, pConfig->RSNWPAReqIE); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* Now copy over all the security attributes * you have parsed out. Use the cipher type * in the RSN IE @@ -7789,7 +7788,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, #endif pSapEventCallback, pConfig, pHostapdAdapter->dev); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { wlansap_reset_sap_config_add_ie(pConfig, eUPDATE_IE_ALL); cds_set_connection_in_progress(false); hddLog(LOGE, FL("SAP Start Bss fail")); @@ -7862,7 +7861,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, hdd_context_t *pHddCtx = NULL; hdd_scaninfo_t *pScanInfo = NULL; hdd_adapter_t *staAdapter = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; tSirUpdateIE updateIE; beacon_data_t *old; @@ -7897,7 +7896,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, pAdapter->device_mode); status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { staAdapter = pAdapterNode->pAdapter; if (WLAN_HDD_INFRA_STATION == staAdapter->device_mode || @@ -7968,7 +7967,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, #else status = wlansap_stop_bss(pHddCtx->pcds_context); #endif - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { qdf_status = qdf_wait_single_event(&pHostapdState-> cdf_stop_bss_event, @@ -7989,7 +7988,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, } mutex_unlock(&pHddCtx->sap_lock); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Stopping the BSS")); return -EINVAL; } @@ -8002,13 +8001,13 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, updateIE.notify = true; if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(pAdapter), &updateIE, - eUPDATE_IE_PROBE_BCN) == CDF_STATUS_E_FAILURE) { + eUPDATE_IE_PROBE_BCN) == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Could not pass on PROBE_RSP_BCN data to PE")); } if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(pAdapter), &updateIE, - eUPDATE_IE_ASSOC_RESP) == CDF_STATUS_E_FAILURE) { + eUPDATE_IE_ASSOC_RESP) == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Could not pass on ASSOC_RSP data to PE")); } /* Reset WNI_CFG_PROBE_RSP Flags */ @@ -8139,20 +8138,20 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, } if (pHddCtx->config->policy_manager_enabled) { status = cdf_reset_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) hdd_err("ERR: clear event failed"); status = cds_current_connections_update(pAdapter->sessionId, channel, CDS_UPDATE_REASON_START_AP); - if (CDF_STATUS_E_FAILURE == status) { + if (QDF_STATUS_E_FAILURE == status) { hdd_err("ERROR: connections update failed!!"); return -EINVAL; } - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { status = cdf_wait_for_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_err("ERROR: cdf wait for event failed!!"); return -EINVAL; } @@ -8292,7 +8291,7 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy, status = wlan_hdd_cfg80211_alloc_new_beacon(pAdapter, &new, params, 0); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("new beacon alloc failed")); return -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_hostapd.h b/core/hdd/src/wlan_hdd_hostapd.h index 1fb38dfa23..cf53354792 100644 --- a/core/hdd/src/wlan_hdd_hostapd.h +++ b/core/hdd/src/wlan_hdd_hostapd.h @@ -50,9 +50,9 @@ hdd_adapter_t *hdd_wlan_create_ap_dev(hdd_context_t *pHddCtx, tSirMacAddr macAddr, uint8_t *name); -CDF_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter, uint8_t rtnl_held); +QDF_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter, uint8_t rtnl_held); -CDF_STATUS hdd_unregister_hostapd(hdd_adapter_t *pAdapter, bool rtnl_held); +QDF_STATUS hdd_unregister_hostapd(hdd_adapter_t *pAdapter, bool rtnl_held); eCsrAuthType hdd_translate_rsn_to_csr_auth_type(uint8_t auth_suite[4]); @@ -73,7 +73,7 @@ hdd_translate_wpa_to_csr_auth_type(uint8_t auth_suite[4]); eCsrEncryptionType hdd_translate_wpa_to_csr_encryption_type(uint8_t cipher_suite[4]); -CDF_STATUS hdd_softap_sta_deauth(hdd_adapter_t *, +QDF_STATUS hdd_softap_sta_deauth(hdd_adapter_t *, struct tagCsrDelStaParams *); void hdd_softap_sta_disassoc(hdd_adapter_t *, uint8_t *); void hdd_softap_tkip_mic_fail_counter_measure(hdd_adapter_t *, bool); @@ -85,9 +85,9 @@ int hdd_softap_unpack_ie(tHalHandle halHandle, bool *pMFPRequired, uint16_t gen_ie_len, uint8_t *gen_ie); -CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, +QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, void *usrDataForCallback); -CDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter); void hdd_set_ap_ops(struct net_device *pWlanHostapdDev); int hdd_hostapd_stop(struct net_device *dev); void hdd_hostapd_channel_wakelock_init(hdd_context_t *pHddCtx); @@ -96,7 +96,7 @@ void hdd_hostapd_channel_wakelock_deinit(hdd_context_t *pHddCtx); void hdd_restart_softap(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter); #endif /* FEATURE_WLAN_FORCE_SAP_SCC */ #ifdef QCA_HT_2040_COEX -CDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter, +QDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter, uint8_t channel_type); #endif @@ -112,5 +112,5 @@ int wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_beacon_data *params); -CDF_STATUS wlan_hdd_config_acs(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter); +QDF_STATUS wlan_hdd_config_acs(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter); #endif /* end #if !defined(WLAN_HDD_HOSTAPD_H) */ diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index f86143ee04..79e10689f3 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -180,13 +180,13 @@ static void hdd_get_tsm_stats_cb(tAniTrafStrmMetrics tsm_metrics, } static -CDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, +QDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, const uint8_t tid, tAniTrafStrmMetrics *tsm_metrics) { hdd_station_ctx_t *hdd_sta_ctx = NULL; - CDF_STATUS hstatus; - CDF_STATUS vstatus = CDF_STATUS_SUCCESS; + QDF_STATUS hstatus; + QDF_STATUS vstatus = QDF_STATUS_SUCCESS; unsigned long rc; struct statsContext context; hdd_context_t *hdd_ctx = NULL; @@ -194,7 +194,7 @@ CDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, if (NULL == adapter) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: adapter is NULL", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -210,10 +210,10 @@ CDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, hdd_sta_ctx->conn_info.staId[0], hdd_sta_ctx->conn_info.bssId, &context, hdd_ctx->pcds_context, tid); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve statistics", __func__); - vstatus = CDF_STATUS_E_FAULT; + vstatus = QDF_STATUS_E_FAULT; } else { /* request was sent -- wait for the response */ rc = wait_for_completion_timeout(&context.completion, @@ -222,7 +222,7 @@ CDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, hddLog(CDF_TRACE_LEVEL_ERROR, "%s: SME timed out while retrieving statistics", __func__); - vstatus = CDF_STATUS_E_TIMEOUT; + vstatus = QDF_STATUS_E_TIMEOUT; } } @@ -243,7 +243,7 @@ CDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, context.magic = 0; spin_unlock(&hdd_context_lock); - if (CDF_STATUS_SUCCESS == vstatus) { + if (QDF_STATUS_SUCCESS == vstatus) { tsm_metrics->UplinkPktQueueDly = adapter->tsmStats.UplinkPktQueueDly; cdf_mem_copy(tsm_metrics->UplinkPktQueueDlyHist, @@ -566,7 +566,7 @@ hdd_reassoc(hdd_adapter_t *adapter, const uint8_t *bssid, } /* Check channel number is a valid channel number */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(adapter, channel)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel %d", __func__, channel); @@ -1107,7 +1107,7 @@ hdd_parse_set_roam_scan_channels_v1(hdd_adapter_t *adapter, { uint8_t channel_list[WNI_CFG_VALID_CHANNEL_LIST_LEN] = { 0 }; uint8_t num_chan = 0; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int ret; @@ -1135,7 +1135,7 @@ hdd_parse_set_roam_scan_channels_v1(hdd_adapter_t *adapter, sme_change_roam_scan_channel_list(hdd_ctx->hHal, adapter->sessionId, channel_list, num_chan); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to update channel list information", __func__); @@ -1174,7 +1174,7 @@ hdd_parse_set_roam_scan_channels_v2(hdd_adapter_t *adapter, uint8_t num_chan; int i; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - CDF_STATUS status; + QDF_STATUS status; int ret = 0; /* array of values begins after "SETROAMSCANCHANNELS " */ @@ -1208,7 +1208,7 @@ hdd_parse_set_roam_scan_channels_v2(hdd_adapter_t *adapter, sme_change_roam_scan_channel_list(hdd_ctx->hHal, adapter->sessionId, channel_list, num_chan); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to update channel list information", __func__); @@ -1278,7 +1278,7 @@ hdd_parse_set_roam_scan_channels(hdd_adapter_t *adapter, const char *command) * * Return: 0 for success non-zero for failure */ -CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) +QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) { uint8_t *cmdPtr = NULL; int count, content = 0, ret = 0; @@ -1287,11 +1287,11 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* move to argument list */ cmdPtr = strnchr(pValue, strlen(pValue), SPACE_ASCII_VALUE); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* no space after the command */ if (SPACE_ASCII_VALUE != *cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1300,17 +1300,17 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* START/STOP PLM req */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->enable = content; cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1319,11 +1319,11 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* Dialog token of radio meas req containing meas reqIE */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->diag_token = content; hddLog(CDF_TRACE_LEVEL_DEBUG, "diag token %d", @@ -1331,7 +1331,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1340,11 +1340,11 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* measurement token of meas req IE */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->meas_token = content; hddLog(CDF_TRACE_LEVEL_DEBUG, "meas token %d", @@ -1357,7 +1357,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1366,14 +1366,14 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* total number of bursts after which STA stops sending */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (content < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->numBursts = content; hddLog(CDF_TRACE_LEVEL_DEBUG, "num burst %d", @@ -1381,7 +1381,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1390,14 +1390,14 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* burst interval in seconds */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (content <= 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->burstInt = content; hddLog(CDF_TRACE_LEVEL_DEBUG, "burst Int %d", @@ -1405,7 +1405,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1414,14 +1414,14 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* Meas dur in TU's,STA goes off-ch and transmit PLM bursts */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (content <= 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->measDuration = content; hddLog(CDF_TRACE_LEVEL_DEBUG, "measDur %d", @@ -1429,7 +1429,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1438,14 +1438,14 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* burst length of PLM bursts */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (content <= 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->burstLen = content; hddLog(CDF_TRACE_LEVEL_DEBUG, "burstLen %d", @@ -1453,7 +1453,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1462,14 +1462,14 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* desired tx power for transmission of PLM bursts */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (content <= 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->desiredTxPwr = content; hddLog(CDF_TRACE_LEVEL_DEBUG, @@ -1479,7 +1479,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) @@ -1488,11 +1488,11 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 16, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->mac_addr.bytes[count] = content; } @@ -1503,7 +1503,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1512,14 +1512,14 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* number of channels */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (content < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->plmNumCh = content; hddLog(CDF_TRACE_LEVEL_DEBUG, "numch %d", @@ -1530,7 +1530,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) @@ -1539,14 +1539,14 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (content <= 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->plmChList[count] = content; hddLog(CDF_TRACE_LEVEL_DEBUG, " ch- %d", @@ -1554,7 +1554,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) } } /* If PLM START */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -1577,7 +1577,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, tpSirExtWoWParams arg_params) { tSirExtWoWParams params; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter); int rc; @@ -1589,7 +1589,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, cdf_ret_status = sme_configure_ext_wow(hHal, ¶ms, &wlan_hdd_ready_to_extwow, hdd_ctx); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("sme_configure_ext_wow returned failure %d"), cdf_ret_status); @@ -1621,7 +1621,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, return rc; } cdf_ret_status = wlan_hdd_bus_suspend(state); - if (cdf_ret_status != CDF_STATUS_SUCCESS) { + if (cdf_ret_status != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: wlan_hdd_suspend failed, status = %d", __func__, cdf_ret_status); @@ -1685,12 +1685,12 @@ static int hdd_set_app_type1_params(tHalHandle hHal, tpSirAppType1Params arg_params) { tSirAppType1Params params; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; cdf_mem_copy(¶ms, arg_params, sizeof(params)); cdf_ret_status = sme_configure_app_type1_params(hHal, ¶ms); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("sme_configure_app_type1_params returned failure %d"), cdf_ret_status); @@ -1743,12 +1743,12 @@ static int hdd_set_app_type2_params(tHalHandle hHal, tpSirAppType2Params arg_params) { tSirAppType2Params params; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; cdf_mem_copy(¶ms, arg_params, sizeof(params)); cdf_ret_status = sme_configure_app_type2_params(hHal, ¶ms); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("sme_configure_app_type2_params returned failure %d"), cdf_ret_status); @@ -2105,7 +2105,7 @@ static int wlan_hdd_get_link_status(hdd_adapter_t *adapter) hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); struct statsContext context; - CDF_STATUS hstatus; + QDF_STATUS hstatus; unsigned long rc; if (cds_is_driver_recovering()) { @@ -2137,7 +2137,7 @@ static int wlan_hdd_get_link_status(hdd_adapter_t *adapter) hstatus = sme_get_link_status(WLAN_HDD_GET_HAL_CTX(adapter), hdd_get_link_status_cb, &context, adapter->sessionId); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve link status", __func__); /* return a cached value */ @@ -2399,7 +2399,7 @@ static int hdd_parse_get_cckm_ie(uint8_t *pValue, uint8_t **pCckmIe, int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate) { tSirRateUpdateInd rateUpdate = {0}; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); struct hdd_config *pConfig = NULL; @@ -2433,7 +2433,7 @@ int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate) hdd_device_mode_to_string(pAdapter->device_mode), pAdapter->device_mode); status = sme_send_rate_update_ind(pHddCtx->hHal, &rateUpdate); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: SETMCRATE failed", __func__); return -EFAULT; @@ -2557,7 +2557,7 @@ static int drv_cmd_country(hdd_adapter_t *adapter, hdd_priv_data_t *priv_data) { int ret = 0; - CDF_STATUS status; + QDF_STATUS status; unsigned long rc; char *country_code; @@ -2572,7 +2572,7 @@ static int drv_cmd_country(hdd_adapter_t *adapter, hdd_ctx->pcds_context, eSIR_TRUE, eSIR_TRUE); - if (status == CDF_STATUS_SUCCESS) { + if (status == QDF_STATUS_SUCCESS) { rc = wait_for_completion_timeout( &adapter->change_country_code, msecs_to_jiffies(WLAN_WAIT_TIME_COUNTRY)); @@ -2600,7 +2600,7 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, uint8_t *value = command; int8_t rssi = 0; uint8_t lookUpThreshold = CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_DEFAULT; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* Move pointer to ahead of SETROAMTRIGGER */ value = value + command_len + 1; @@ -2648,7 +2648,7 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, status = sme_set_neighbor_lookup_rssi_threshold(hdd_ctx->hHal, adapter->sessionId, lookUpThreshold); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to set roam trigger, try again", @@ -3131,7 +3131,7 @@ static int drv_cmd_get_roam_scan_channels(hdd_adapter_t *adapter, char extra[128] = { 0 }; int len; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_get_roam_scan_channel_list(hdd_ctx->hHal, ChannelList, &numChannels, @@ -4160,7 +4160,7 @@ static void hdd_wma_send_fastreassoc_cmd(int sessionId, tSirMacAddr bssid, msg.type = SIR_HAL_ROAM_INVOKE; msg.reserved = 0; msg.bodyptr = fastreassoc; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { cdf_mem_free(fastreassoc); CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, @@ -4237,7 +4237,7 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, } /* Check channel number is a valid channel number */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(adapter, channel)) { hddLog(LOGE, FL("Invalid Channel [%d]"), channel); return -EINVAL; @@ -4272,7 +4272,7 @@ static int drv_cmd_ccx_plm_req(hdd_adapter_t *adapter, { int ret = 0; uint8_t *value = command; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpSirPlmReq pPlmRequest = NULL; pPlmRequest = cdf_mem_malloc(sizeof(tSirPlmReq)); @@ -4282,7 +4282,7 @@ static int drv_cmd_ccx_plm_req(hdd_adapter_t *adapter, } status = hdd_parse_plm_cmd(value, pPlmRequest); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { cdf_mem_free(pPlmRequest); pPlmRequest = NULL; ret = -EINVAL; @@ -4291,7 +4291,7 @@ static int drv_cmd_ccx_plm_req(hdd_adapter_t *adapter, pPlmRequest->sessionId = adapter->sessionId; status = sme_set_plm_request(hdd_ctx->hHal, pPlmRequest); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { cdf_mem_free(pPlmRequest); pPlmRequest = NULL; ret = -EINVAL; @@ -4600,7 +4600,7 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter, uint8_t command_len, hdd_priv_data_t *priv_data) { - CDF_STATUS ret_status; + QDF_STATUS ret_status; int ret = 0; tHalHandle hHal; uint8_t filterType = 0; @@ -4646,7 +4646,7 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter, pHddCtx->miracast_value = filterType; ret_status = sme_set_miracast(hHal, filterType); - if (CDF_STATUS_SUCCESS != ret_status) { + if (QDF_STATUS_SUCCESS != ret_status) { hddLog(LOGE, "Failed to set miracast"); return -EBUSY; } @@ -4669,7 +4669,7 @@ static int drv_cmd_set_ccx_roam_scan_channels(hdd_adapter_t *adapter, uint8_t *value = command; uint8_t ChannelList[WNI_CFG_VALID_CHANNEL_LIST_LEN] = { 0 }; uint8_t numChannels = 0; - CDF_STATUS status; + QDF_STATUS status; ret = hdd_parse_channellist(value, ChannelList, &numChannels); if (ret) { @@ -4693,7 +4693,7 @@ static int drv_cmd_set_ccx_roam_scan_channels(hdd_adapter_t *adapter, adapter->sessionId, ChannelList, numChannels); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to update channel list information", @@ -4769,7 +4769,7 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, CDF_TRACE_LEVEL_INFO, "%s: Received Command to get tsm stats tid = %d", __func__, tid); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_get_tsm_stats(adapter, tid, &tsm_metrics)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, @@ -4878,7 +4878,7 @@ static int drv_cmd_ccx_beacon_req(hdd_adapter_t *adapter, int ret; uint8_t *value = command; tCsrEseBeaconReq eseBcnReq; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (WLAN_HDD_INFRA_STATION != adapter->device_mode) { hdd_warn("Unsupported in mode %s(%d)", @@ -4909,13 +4909,13 @@ static int drv_cmd_ccx_beacon_req(hdd_adapter_t *adapter, adapter->sessionId, &eseBcnReq); - if (CDF_STATUS_E_RESOURCES == status) { + if (QDF_STATUS_E_RESOURCES == status) { hddLog(CDF_TRACE_LEVEL_INFO, FL("sme_set_ese_beacon_request failed (%d), a request already in progress"), status); ret = -EBUSY; goto exit; - } else if (CDF_STATUS_SUCCESS != status) { + } else if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_set_ese_beacon_request failed (%d)", @@ -4960,8 +4960,8 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter, int ret = 0; int status; int txPower; - CDF_STATUS cdf_status; - CDF_STATUS smeStatus; + QDF_STATUS qdf_status; + QDF_STATUS smeStatus; uint8_t *value = command; struct cdf_mac_addr bssid = CDF_MAC_ADDR_BROADCAST_INITIALIZER; struct cdf_mac_addr selfMac = CDF_MAC_ADDR_BROADCAST_INITIALIZER; @@ -4977,9 +4977,9 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter, goto exit; } - cdf_status = hdd_get_front_adapter(hdd_ctx, &pAdapterNode); + qdf_status = hdd_get_front_adapter(hdd_ctx, &pAdapterNode); while (NULL != pAdapterNode - && CDF_STATUS_SUCCESS == cdf_status) { + && QDF_STATUS_SUCCESS == qdf_status) { adapter = pAdapterNode->pAdapter; /* Assign correct self MAC address */ cdf_copy_macaddr(&bssid, @@ -4995,7 +4995,7 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter, smeStatus = sme_set_max_tx_power(hdd_ctx->hHal, bssid, selfMac, txPower); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s:Set max tx power failed", __func__); @@ -5005,7 +5005,7 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter, hddLog(CDF_TRACE_LEVEL_INFO, "%s: Set max tx power success", __func__); - cdf_status = hdd_get_next_adapter(hdd_ctx, pAdapterNode, + qdf_status = hdd_get_next_adapter(hdd_ctx, pAdapterNode, &pNext); pAdapterNode = pNext; } @@ -5910,7 +5910,7 @@ static int drv_cmd_set_fcc_channel(hdd_adapter_t *adapter, { uint8_t *value; uint8_t fcc_constraint; - CDF_STATUS status; + QDF_STATUS status; int ret = 0; /* @@ -5936,7 +5936,7 @@ static int drv_cmd_set_fcc_channel(hdd_adapter_t *adapter, } status = sme_disable_non_fcc_channel(hdd_ctx->hHal, !fcc_constraint); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hdd_err("sme disable fn. returned err"); ret = -EPERM; } diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index d15388e45a..6199d4d7b5 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -1234,7 +1234,7 @@ static void hdd_ipa_uc_rm_notify_handler(void *context, enum ipa_rm_event event) { struct hdd_ipa_priv *hdd_ipa = context; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* * When SSR is going on or driver is unloading, just return. @@ -1354,7 +1354,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) struct IpaHwStatsWDIInfoData_t ipa_stat; struct hdd_ipa_priv *hdd_ipa; hdd_context_t *hdd_ctx; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (!op_msg || !usr_ctxt) { HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "%s, INVALID ARG", __func__); @@ -1664,7 +1664,7 @@ static void hdd_ipa_uc_offload_enable_disable(hdd_adapter_t *adapter, ipa_offload_enable_disable.vdev_id, ipa_offload_enable_disable.enable); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_ipa_offload_enable_disable(WLAN_HDD_GET_HAL_CTX(adapter), adapter->sessionId, &ipa_offload_enable_disable)) { HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, @@ -1716,7 +1716,7 @@ static void hdd_ipa_uc_op_event_handler(uint8_t *op_msg, void *hdd_ctx) struct hdd_ipa_priv *hdd_ipa; struct op_msg_type *msg; struct uc_op_work_struct *uc_op_work; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) { @@ -1775,9 +1775,9 @@ static void hdd_ipa_init_uc_op_work(struct work_struct *work, * hdd_ipa_uc_ol_init() - Initialize IPA uC offload * @hdd_ctx: Global HDD context * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) +static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) { struct ipa_wdi_in_params pipe_in; struct ipa_wdi_out_params pipe_out; @@ -1879,7 +1879,7 @@ static CDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) ipa_ctxt->uc_op_work[i].msg = NULL; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2827,7 +2827,7 @@ static void hdd_ipa_i2w_cb(void *priv, enum ipa_dp_evt_type evt, struct hdd_ipa_iface_context *iface_context; cdf_nbuf_t skb; struct hdd_ipa_pm_tx_cb *pm_tx_cb = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; iface_context = (struct hdd_ipa_iface_context *)priv; if (evt != IPA_RECEIVE) { @@ -3511,7 +3511,7 @@ static void hdd_ipa_msg_free_fn(void *buff, uint32_t len, uint32_t type) int hdd_ipa_send_mcc_scc_msg(hdd_context_t *pHddCtx, bool mcc_mode) { hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *pAdapter; struct ipa_msg_meta meta; struct ipa_wlan_msg *msg; @@ -3523,7 +3523,7 @@ int hdd_ipa_send_mcc_scc_msg(hdd_context_t *pHddCtx, bool mcc_mode) if (!pHddCtx->mcc_mode) { /* Flush TxRx queue for each adapter before switch to SCC */ status = hdd_get_front_adapter(pHddCtx, &adapter_node); - while (NULL != adapter_node && CDF_STATUS_SUCCESS == status) { + while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) { pAdapter = adapter_node->pAdapter; if (pAdapter->device_mode == WLAN_HDD_INFRA_STATION || pAdapter->device_mode == WLAN_HDD_SOFTAP) { @@ -4002,16 +4002,16 @@ static inline char *hdd_ipa_rm_state_to_str(enum hdd_ipa_rm_state state) * Allocate hdd_ipa resources, ipa pipe resource and register * wlan interface with IPA module. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) { struct hdd_ipa_priv *hdd_ipa = NULL; int ret, i; struct hdd_ipa_iface_context *iface_context = NULL; if (!hdd_ipa_is_enabled(hdd_ctx)) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; hdd_ipa = cdf_mem_malloc(sizeof(*hdd_ipa)); if (!hdd_ipa) { @@ -4097,7 +4097,7 @@ CDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) goto fail_create_sys_pipe; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; fail_create_sys_pipe: hdd_ipa_destroy_rm_resource(hdd_ipa); @@ -4108,7 +4108,7 @@ fail_get_resource: hdd_ctx->hdd_ipa = NULL; ghdd_ipa = NULL; fail_return: - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -4133,9 +4133,9 @@ void hdd_ipa_cleanup_pending_event(struct hdd_ipa_priv *hdd_ipa) * hdd_ipa_cleanup - IPA cleanup function * @hdd_ctx: HDD global context * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) { struct hdd_ipa_priv *hdd_ipa = hdd_ctx->hdd_ipa; int i; @@ -4144,7 +4144,7 @@ CDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) struct hdd_ipa_pm_tx_cb *pm_tx_cb = NULL; if (!hdd_ipa_is_enabled(hdd_ctx)) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; if (!hdd_ipa_uc_is_enabled(hdd_ctx)) { unregister_inetaddr_notifier(&hdd_ipa->ipv4_notifier); @@ -4222,6 +4222,6 @@ CDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) cdf_mem_free(hdd_ipa); hdd_ctx->hdd_ipa = NULL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* IPA_OFFLOAD */ diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 65e09be75e..1f26a1bb80 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -589,15 +589,15 @@ void hdd_checkandupdate_phymode(hdd_context_t *hdd_ctx) ((eCSR_CFG_DOT11_MODE_11AC_ONLY == pHddStaCtx->conn_info.dot11Mode) || (eCSR_CFG_DOT11_MODE_11AC == pHddStaCtx->conn_info.dot11Mode))) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; /* need to issue a disconnect to CSR. */ INIT_COMPLETION(adapter->disconnect_comp_var); - cdf_status = sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(adapter), + qdf_status = sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(adapter), adapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); - if (CDF_STATUS_SUCCESS == cdf_status) { + if (QDF_STATUS_SUCCESS == qdf_status) { unsigned long rc; rc = wait_for_completion_timeout( @@ -618,10 +618,10 @@ void hdd_checkandupdate_phymode(hdd_context_t *hdd_ctx) * which will send it to firmware if FW supports IBSS power save * before vdev start. * - * Return: CDF_STATUS CDF_STATUS_SUCCESS on Success and CDF_STATUS_E_FAILURE + * Return: QDF_STATUS QDF_STATUS_SUCCESS on Success and QDF_STATUS_E_FAILURE * on failure. */ -CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) +QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) { int ret; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -629,7 +629,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) if (hdd_ctx == NULL) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is null")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -639,7 +639,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) if (0 != ret) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_SET_ATIM_WINDOW_SIZE failed %d"), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -650,7 +650,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) hddLog(CDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_SET_POWER_SAVE_ALLOWED failed %d"), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -661,7 +661,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) hddLog(CDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_SET_POWER_COLLAPSE_ALLOWED failed %d"), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -671,7 +671,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) if (0 != ret) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_SET_AWAKE_ON_TX_RX failed %d"), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -681,7 +681,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) if (0 != ret) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_SET_INACTIVITY_TIME failed %d"), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -694,7 +694,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) "WMA_VDEV_IBSS_SET_TXSP_END_INACTIVITY_TIME failed %d" ), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -705,7 +705,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) hddLog(CDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_PS_SET_WARMUP_TIME_SECS failed %d"), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -718,10 +718,10 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) "WMA_VDEV_IBSS_PS_SET_1RX_CHAIN_IN_ATIM_WINDOW failed %d" ), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #define INTF_MACADDR_MASK 0x7 @@ -818,7 +818,7 @@ static void hdd_update_tgt_services(hdd_context_t *hdd_ctx, static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, struct wma_tgt_ht_cap *cfg) { - CDF_STATUS status; + QDF_STATUS status; uint32_t value, val32; uint16_t val16; struct hdd_config *pconfig = hdd_ctx->config; @@ -833,7 +833,7 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, /* get the MPDU density */ status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_MPDU_DENSITY, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get MPDU DENSITY")); value = 0; @@ -848,14 +848,14 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_MPDU_DENSITY, cfg->mpdu_density); - if (status == CDF_STATUS_E_FAILURE) + if (status == QDF_STATUS_E_FAILURE) hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set MPDU DENSITY to CCM")); } /* get the HT capability info */ status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_HT_CAP_INFO, &val32); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get HT capability info")); return; @@ -888,7 +888,7 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE, HDD_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE_1_1) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL( "Could not pass on WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE to CCM" @@ -900,7 +900,7 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, (hdd_ctx->hHal, WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE, HDD_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE_1_1) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL( "Could not pass on HDD_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE_1_1 to CCM" @@ -913,13 +913,13 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, val32 = val16; status = sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_HT_CAP_INFO, val32); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set HT capability to CCM")); #define WLAN_HDD_RX_MCS_ALL_NSTREAM_RATES 0xff value = SIZE_OF_SUPPORTED_MCS_SET; if (sme_cfg_get_str(hdd_ctx->hHal, WNI_CFG_SUPPORTED_MCS_SET, mcs_set, - &value) == CDF_STATUS_SUCCESS) { + &value) == QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_INFO, FL("Read MCS rate set")); if (pconfig->enable2x2) { @@ -932,7 +932,7 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, WNI_CFG_SUPPORTED_MCS_SET, mcs_set, SIZE_OF_SUPPORTED_MCS_SET); - if (status == CDF_STATUS_E_FAILURE) + if (status == QDF_STATUS_E_FAILURE) hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set MCS SET to CCM")); } @@ -944,7 +944,7 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, struct wma_tgt_vht_cap *cfg) { - CDF_STATUS status; + QDF_STATUS status; uint32_t value = 0; struct hdd_config *pconfig = hdd_ctx->config; struct wiphy *wiphy = hdd_ctx->wiphy; @@ -956,7 +956,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_MAX_MPDU_LENGTH, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get MPDU LENGTH")); value = 0; } @@ -971,7 +971,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_MAX_MPDU_LENGTH, cfg->vht_max_mpdu); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set VHT MAX MPDU LENGTH")); } @@ -982,7 +982,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get MPDU LENGTH")); value = 0; @@ -993,7 +993,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_LDPC_CODING_CAP, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT LDPC CODING CAP")); value = 0; @@ -1005,7 +1005,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_LDPC_CODING_CAP, cfg->vht_rx_ldpc); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set VHT LDPC CODING CAP to CCM")); } @@ -1015,7 +1015,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_SHORT_GI_80MHZ, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get SHORT GI 80MHZ")); value = 0; @@ -1027,7 +1027,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_SHORT_GI_80MHZ, cfg->vht_short_gi_80); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set SHORT GI 80MHZ to CCM")); } @@ -1038,7 +1038,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get SHORT GI 80 & 160")); value = 0; @@ -1047,7 +1047,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, /* Get VHT TX STBC cap */ status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_TXSTBC, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT TX STBC")); value = 0; @@ -1058,7 +1058,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_TXSTBC, cfg->vht_tx_stbc); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set the VHT TX STBC to CCM")); } @@ -1067,7 +1067,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, /* Get VHT RX STBC cap */ status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_RXSTBC, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT RX STBC")); value = 0; @@ -1078,7 +1078,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_RXSTBC, cfg->vht_rx_stbc); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set the VHT RX STBC to CCM")); } @@ -1088,7 +1088,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_SU_BEAMFORMER_CAP, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT SU BEAMFORMER CAP")); value = 0; @@ -1100,7 +1100,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_SU_BEAMFORMER_CAP, cfg->vht_su_bformer); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set VHT SU BEAMFORMER CAP")); } @@ -1114,7 +1114,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_SU_BEAMFORMEE_CAP, pconfig->enableTxBF); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set VHT SU BEAMFORMEE CAP")); } @@ -1123,7 +1123,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_MU_BEAMFORMER_CAP, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT MU BEAMFORMER CAP")); value = 0; @@ -1135,7 +1135,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_MU_BEAMFORMER_CAP, cfg->vht_mu_bformer); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL( "could not set the VHT MU BEAMFORMER CAP to CCM" @@ -1147,7 +1147,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_MU_BEAMFORMEE_CAP, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT MU BEAMFORMEE CAP")); value = 0; @@ -1159,7 +1159,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_MU_BEAMFORMEE_CAP, cfg->vht_mu_bformee); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set VHT MU BEAMFORMER CAP")); } @@ -1169,7 +1169,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_AMPDU_LEN_EXPONENT, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT AMPDU LEN")); value = 0; @@ -1188,7 +1188,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_AMPDU_LEN_EXPONENT, cfg->vht_max_ampdu_len_exp); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set the VHT AMPDU LEN EXP")); } @@ -1197,7 +1197,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, /* Get VHT TXOP PS CAP */ status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_TXOP_PS, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT TXOP PS")); value = 0; @@ -1208,7 +1208,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_TXOP_PS, cfg->vht_txop_ps); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set the VHT TXOP PS")); } @@ -1352,7 +1352,7 @@ bool hdd_dfs_indicate_radar(void *context, void *param) (struct wma_dfs_radar_ind *)param; hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; hdd_adapter_t *adapter; - CDF_STATUS status; + QDF_STATUS status; if (!hdd_ctx || !hdd_radar_event || hdd_ctx->config->disableDFSChSwitch) @@ -1373,7 +1373,7 @@ bool hdd_dfs_indicate_radar(void *context, void *param) mutex_unlock(&hdd_ctx->dfs_lock); status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (WLAN_HDD_SOFTAP == adapter->device_mode || WLAN_HDD_P2P_GO == adapter->device_mode) { @@ -1636,7 +1636,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr) hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *hdd_ctx; struct sockaddr *psta_mac_addr = addr; - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; int ret; ENTER(); @@ -1931,51 +1931,51 @@ static hdd_adapter_t *hdd_alloc_station_adapter(hdd_context_t *hdd_ctx, return adapter; } -CDF_STATUS hdd_register_interface(hdd_adapter_t *adapter, +QDF_STATUS hdd_register_interface(hdd_adapter_t *adapter, bool rtnl_held) { struct net_device *pWlanDev = adapter->dev; /* hdd_station_ctx_t *pHddStaCtx = &adapter->sessionCtx.station; */ /* hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX( adapter ); */ - /* CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; */ + /* QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; */ if (rtnl_held) { if (strnchr(pWlanDev->name, strlen(pWlanDev->name), '%')) { if (dev_alloc_name(pWlanDev, pWlanDev->name) < 0) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Failed:dev_alloc_name")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } if (register_netdevice(pWlanDev)) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Failed:register_netdev")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { if (register_netdev(pWlanDev)) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Failed:register_netdev")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } set_bit(NET_DEVICE_REGISTERED, &adapter->event_flags); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS hdd_sme_close_session_callback(void *pContext) +static QDF_STATUS hdd_sme_close_session_callback(void *pContext) { hdd_adapter_t *adapter = pContext; if (NULL == adapter) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("NULL adapter")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Invalid magic")); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } clear_bit(SME_SESSION_OPENED, &adapter->event_flags); @@ -2007,16 +2007,16 @@ static CDF_STATUS hdd_sme_close_session_callback(void *pContext) if (WLAN_HDD_ADAPTER_MAGIC == adapter->magic) complete(&adapter->session_close_comp_var); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) +QDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) { struct net_device *pWlanDev = adapter->dev; hdd_station_ctx_t *pHddStaCtx = &adapter->sessionCtx.station; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t type, subType; unsigned long rc; int ret_val; @@ -2024,7 +2024,7 @@ CDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) INIT_COMPLETION(adapter->session_open_comp_var); sme_set_curr_device_mode(hdd_ctx->hHal, adapter->device_mode); status = cds_get_vdev_types(adapter->device_mode, &type, &subType); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("failed to get vdev type")); goto error_sme_open; } @@ -2033,11 +2033,11 @@ CDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) sme_open_session(hdd_ctx->hHal, hdd_sme_roam_callback, adapter, (uint8_t *) &adapter->macAddressCurrent, &adapter->sessionId, type, subType); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { hddLog(LOGP, FL("sme_open_session() failed, status code %08d [x%08x]"), cdf_ret_status, cdf_ret_status); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto error_sme_open; } /* Block on a completion variable. Can't wait forever though. */ @@ -2048,17 +2048,17 @@ CDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) hddLog(LOGP, FL("Session is not opened within timeout period code %ld"), rc); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto error_sme_open; } /* Register wireless extensions */ cdf_ret_status = hdd_register_wext(pWlanDev); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { hddLog(LOGP, FL("hdd_register_wext() failed, status code %08d [x%08x]"), cdf_ret_status, cdf_ret_status); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto error_register_wext; } /* Set the Connection State to Not Connected */ @@ -2074,7 +2074,7 @@ CDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) pHddStaCtx->conn_info.authType = eCSR_AUTH_TYPE_OPEN_SYSTEM; status = hdd_init_tx_rx(adapter); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGP, FL("hdd_init_tx_rx() failed, status code %08d [x%08x]"), status, status); @@ -2084,7 +2084,7 @@ CDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) set_bit(INIT_TX_RX_SUCCESS, &adapter->event_flags); status = hdd_wmm_adapter_init(adapter); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGP, FL("hdd_wmm_adapter_init() failed, status code %08d [x%08x]"), status, status); @@ -2105,14 +2105,14 @@ CDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) } #ifdef FEATURE_WLAN_TDLS if (0 != wlan_hdd_tdls_init(adapter)) { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; hddLog(LOGE, FL("wlan_hdd_tdls_init failed")); goto error_tdls_init; } set_bit(TDLS_INIT_DONE, &adapter->event_flags); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; #ifdef FEATURE_WLAN_TDLS error_tdls_init: @@ -2127,7 +2127,7 @@ error_init_txrx: error_register_wext: if (test_bit(SME_SESSION_OPENED, &adapter->event_flags)) { INIT_COMPLETION(adapter->session_close_comp_var); - if (CDF_STATUS_SUCCESS == sme_close_session(hdd_ctx->hHal, + if (QDF_STATUS_SUCCESS == sme_close_session(hdd_ctx->hHal, adapter->sessionId, hdd_sme_close_session_callback, adapter)) { @@ -2263,24 +2263,24 @@ void hdd_cleanup_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, } } -CDF_STATUS hdd_check_for_existing_macaddr(hdd_context_t *hdd_ctx, +QDF_STATUS hdd_check_for_existing_macaddr(hdd_context_t *hdd_ctx, tSirMacAddr macAddr) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; hdd_adapter_t *adapter; - CDF_STATUS status; + QDF_STATUS status; status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (adapter && cdf_mem_compare(adapter->macAddressCurrent.bytes, macAddr, sizeof(tSirMacAddr))) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = hdd_get_next_adapter(hdd_ctx, adapterNode, &pNext); adapterNode = pNext; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, const char *iface_name, tSirMacAddr macAddr, @@ -2288,7 +2288,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, { hdd_adapter_t *adapter = NULL; hdd_adapter_list_node_t *pHddAdapterNode = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; hdd_cfg80211_state_t *cfgState; int ret; @@ -2316,7 +2316,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, return NULL; } status = hdd_check_for_existing_macaddr(hdd_ctx, macAddr); - if (CDF_STATUS_E_FAILURE == status) { + if (QDF_STATUS_E_FAILURE == status) { hddLog(CDF_TRACE_LEVEL_ERROR, "Duplicate MAC addr: " MAC_ADDRESS_STR " already exists", @@ -2353,7 +2353,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, adapter->device_mode = session_type; status = hdd_init_station_mode(adapter); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) goto err_free_netdev; hdd_lro_enable(hdd_ctx, adapter); @@ -2384,7 +2384,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, #endif #endif status = hdd_register_interface(adapter, rtnl_held); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hdd_deinit_adapter(hdd_ctx, adapter, rtnl_held); goto err_lro_cleanup; } @@ -2422,11 +2422,11 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, adapter->device_mode = session_type; status = hdd_init_ap_mode(adapter); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) goto err_free_netdev; status = hdd_register_hostapd(adapter, rtnl_held); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hdd_deinit_adapter(hdd_ctx, adapter, rtnl_held); goto err_free_netdev; } @@ -2480,19 +2480,19 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, cfgState = WLAN_HDD_GET_CFG_STATE_PTR(adapter); mutex_init(&cfgState->remain_on_chan_ctx_lock); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* Add it to the hdd's session list. */ pHddAdapterNode = cdf_mem_malloc(sizeof(hdd_adapter_list_node_t)); if (NULL == pHddAdapterNode) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; } else { pHddAdapterNode->pAdapter = adapter; status = hdd_add_adapter_back(hdd_ctx, pHddAdapterNode); } } - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { if (NULL != adapter) { hdd_cleanup_adapter(hdd_ctx, adapter, rtnl_held); adapter = NULL; @@ -2503,7 +2503,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, return NULL; } - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { cds_set_concurrency_mode(session_type); /* Initialize the WoWL service */ @@ -2665,14 +2665,14 @@ err_free_netdev: return NULL; } -CDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, +QDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, bool rtnl_held) { hdd_adapter_list_node_t *adapterNode, *pCurrent, *pNext; - CDF_STATUS status; + QDF_STATUS status; status = hdd_get_front_adapter(hdd_ctx, &pCurrent); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_WARN, FL("adapter list empty %d"), status); return status; @@ -2680,13 +2680,13 @@ CDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, while (pCurrent->pAdapter != adapter) { status = hdd_get_next_adapter(hdd_ctx, pCurrent, &pNext); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) break; pCurrent = pNext; } adapterNode = pCurrent; - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { cds_clear_concurrency_mode(adapter->device_mode); hdd_cleanup_adapter(hdd_ctx, adapterNode->pAdapter, rtnl_held); @@ -2699,9 +2699,9 @@ CDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, hdd_ctx->current_intf_count--; /* Fw will take care incase of concurrency */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -2713,25 +2713,25 @@ CDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, * * Return: CDF status code */ -CDF_STATUS hdd_close_all_adapters(hdd_context_t *hdd_ctx, bool rtnl_held) +QDF_STATUS hdd_close_all_adapters(hdd_context_t *hdd_ctx, bool rtnl_held) { hdd_adapter_list_node_t *pHddAdapterNode; - CDF_STATUS status; + QDF_STATUS status; ENTER(); do { status = hdd_remove_front_adapter(hdd_ctx, &pHddAdapterNode); - if (pHddAdapterNode && CDF_STATUS_SUCCESS == status) { + if (pHddAdapterNode && QDF_STATUS_SUCCESS == status) { hdd_cleanup_adapter(hdd_ctx, pHddAdapterNode->pAdapter, rtnl_held); cdf_mem_free(pHddAdapterNode); } - } while (NULL != pHddAdapterNode && CDF_STATUS_E_EMPTY != status); + } while (NULL != pHddAdapterNode && QDF_STATUS_E_EMPTY != status); EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter) @@ -2775,15 +2775,15 @@ void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter) updateIE.notify = false; if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(pHostapdAdapter), &updateIE, - eUPDATE_IE_PROBE_RESP) == CDF_STATUS_E_FAILURE) { + eUPDATE_IE_PROBE_RESP) == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Could not pass on PROBE_RSP_BCN data to PE")); } } -CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, +QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, const bool bCloseSession) { - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(adapter); union iwreq_data wrqu; tSirUpdateIE updateIE; @@ -2815,7 +2815,7 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, adapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); /* success implies disconnect command got queued up successfully */ - if (cdf_ret_status == CDF_STATUS_SUCCESS) { + if (cdf_ret_status == QDF_STATUS_SUCCESS) { rc = wait_for_completion_timeout( &adapter->disconnect_comp_var, msecs_to_jiffies @@ -2862,7 +2862,7 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, if (true == bCloseSession && test_bit(SME_SESSION_OPENED, &adapter->event_flags)) { INIT_COMPLETION(adapter->session_close_comp_var); - if (CDF_STATUS_SUCCESS == + if (QDF_STATUS_SUCCESS == sme_close_session(hdd_ctx->hHal, adapter->sessionId, hdd_sme_close_session_callback, adapter)) { @@ -2905,7 +2905,7 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, mutex_lock(&hdd_ctx->sap_lock); if (test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags)) { - CDF_STATUS status; + QDF_STATUS status; QDF_STATUS qdf_status; /* Stop Bss. */ @@ -2917,7 +2917,7 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, (WLAN_HDD_GET_CTX(adapter))->pcds_context); #endif - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { hdd_hostapd_state_t *hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter); qdf_event_reset(&hostapd_state-> @@ -2952,7 +2952,7 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, /* Probe bcn reset */ if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(adapter), &updateIE, eUPDATE_IE_PROBE_BCN) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL( "Could not pass on PROBE_RSP_BCN data to PE" @@ -2962,7 +2962,7 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(adapter), &updateIE, eUPDATE_IE_ASSOC_RESP) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL( "Could not pass on ASSOC_RSP data to PE" @@ -2984,20 +2984,20 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, } EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS hdd_stop_all_adapters(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_stop_all_adapters(hdd_context_t *hdd_ctx) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; ENTER(); status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; hdd_stop_adapter(hdd_ctx, adapter, true); status = hdd_get_next_adapter(hdd_ctx, adapterNode, &pNext); @@ -3006,20 +3006,20 @@ CDF_STATUS hdd_stop_all_adapters(hdd_context_t *hdd_ctx) EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS hdd_reset_all_adapters(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_reset_all_adapters(hdd_context_t *hdd_ctx) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; ENTER(); status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; hddLog(LOG1, FL("Disabling queues")); wlan_hdd_netif_queue_control(adapter, @@ -3042,13 +3042,13 @@ CDF_STATUS hdd_reset_all_adapters(hdd_context_t *hdd_ctx) EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; #ifndef MSM_PLATFORM struct cdf_mac_addr bcastMac = CDF_MAC_ADDR_BROADCAST_INITIALIZER; @@ -3059,7 +3059,7 @@ CDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; hdd_wmm_init(adapter); @@ -3142,10 +3142,10 @@ CDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS hdd_get_front_adapter(hdd_context_t *hdd_ctx, +QDF_STATUS hdd_get_front_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t **padapterNode) { QDF_STATUS status; @@ -3156,7 +3156,7 @@ CDF_STATUS hdd_get_front_adapter(hdd_context_t *hdd_ctx, return status; } -CDF_STATUS hdd_get_next_adapter(hdd_context_t *hdd_ctx, +QDF_STATUS hdd_get_next_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode, hdd_adapter_list_node_t **pNextAdapterNode) { @@ -3170,7 +3170,7 @@ CDF_STATUS hdd_get_next_adapter(hdd_context_t *hdd_ctx, return status; } -CDF_STATUS hdd_remove_adapter(hdd_context_t *hdd_ctx, +QDF_STATUS hdd_remove_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode) { QDF_STATUS status; @@ -3181,7 +3181,7 @@ CDF_STATUS hdd_remove_adapter(hdd_context_t *hdd_ctx, return status; } -CDF_STATUS hdd_remove_front_adapter(hdd_context_t *hdd_ctx, +QDF_STATUS hdd_remove_front_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t **padapterNode) { QDF_STATUS status; @@ -3192,7 +3192,7 @@ CDF_STATUS hdd_remove_front_adapter(hdd_context_t *hdd_ctx, return status; } -CDF_STATUS hdd_add_adapter_back(hdd_context_t *hdd_ctx, +QDF_STATUS hdd_add_adapter_back(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode) { QDF_STATUS status; @@ -3203,10 +3203,10 @@ CDF_STATUS hdd_add_adapter_back(hdd_context_t *hdd_ctx, return status; } -CDF_STATUS hdd_add_adapter_front(hdd_context_t *hdd_ctx, +QDF_STATUS hdd_add_adapter_front(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode) { - CDF_STATUS status; + QDF_STATUS status; cdf_spin_lock(&hdd_ctx->hdd_adapter_lock); status = qdf_list_insert_front(&hdd_ctx->hddAdapters, (qdf_list_node_t *) adapterNode); @@ -3219,11 +3219,11 @@ hdd_adapter_t *hdd_get_adapter_by_macaddr(hdd_context_t *hdd_ctx, { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; hdd_adapter_t *adapter; - CDF_STATUS status; + QDF_STATUS status; status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (adapter @@ -3244,17 +3244,17 @@ hdd_adapter_t *hdd_get_adapter_by_vdev(hdd_context_t *hdd_ctx, { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; hdd_adapter_t *adapter; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; - cdf_status = hdd_get_front_adapter(hdd_ctx, &adapterNode); + qdf_status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while ((NULL != adapterNode) && (CDF_STATUS_SUCCESS == cdf_status)) { + while ((NULL != adapterNode) && (QDF_STATUS_SUCCESS == qdf_status)) { adapter = adapterNode->pAdapter; if (adapter->sessionId == vdev_id) return adapter; - cdf_status = + qdf_status = hdd_get_next_adapter(hdd_ctx, adapterNode, &pNext); adapterNode = pNext; } @@ -3281,20 +3281,20 @@ hdd_adapter_t *hdd_get_adapter_by_sme_session_id(hdd_context_t *hdd_ctx, { hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; hdd_adapter_t *adapter; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; - cdf_status = hdd_get_front_adapter(hdd_ctx, &adapter_node); + qdf_status = hdd_get_front_adapter(hdd_ctx, &adapter_node); while ((NULL != adapter_node) && - (CDF_STATUS_SUCCESS == cdf_status)) { + (QDF_STATUS_SUCCESS == qdf_status)) { adapter = adapter_node->pAdapter; if (adapter && adapter->sessionId == sme_session_id) return adapter; - cdf_status = + qdf_status = hdd_get_next_adapter(hdd_ctx, adapter_node, &next); adapter_node = next; @@ -3306,11 +3306,11 @@ hdd_adapter_t *hdd_get_adapter(hdd_context_t *hdd_ctx, device_mode_t mode) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; hdd_adapter_t *adapter; - CDF_STATUS status; + QDF_STATUS status; status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (adapter && (mode == adapter->device_mode)) @@ -3342,13 +3342,13 @@ hdd_adapter_t *hdd_get_adapter(hdd_context_t *hdd_ctx, device_mode_t mode) uint8_t hdd_get_operating_channel(hdd_context_t *hdd_ctx, device_mode_t mode) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; uint8_t operatingChannel = 0; status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (mode == adapter->device_mode) { @@ -3387,18 +3387,18 @@ uint8_t hdd_get_operating_channel(hdd_context_t *hdd_ctx, device_mode_t mode) return operatingChannel; } -static inline CDF_STATUS hdd_unregister_wext_all_adapters(hdd_context_t * +static inline QDF_STATUS hdd_unregister_wext_all_adapters(hdd_context_t * hdd_ctx) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; ENTER(); status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if ((adapter->device_mode == WLAN_HDD_INFRA_STATION) || (adapter->device_mode == WLAN_HDD_P2P_CLIENT) || @@ -3415,20 +3415,20 @@ static inline CDF_STATUS hdd_unregister_wext_all_adapters(hdd_context_t * EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS hdd_abort_mac_scan_all_adapters(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_abort_mac_scan_all_adapters(hdd_context_t *hdd_ctx) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; ENTER(); status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if ((adapter->device_mode == WLAN_HDD_INFRA_STATION) || (adapter->device_mode == WLAN_HDD_P2P_CLIENT) || @@ -3445,7 +3445,7 @@ CDF_STATUS hdd_abort_mac_scan_all_adapters(hdd_context_t *hdd_ctx) EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_NS_OFFLOAD @@ -3662,7 +3662,7 @@ static void hdd_free_context(hdd_context_t *hdd_ctx) void hdd_wlan_exit(hdd_context_t *hdd_ctx) { v_CONTEXT_t p_cds_context = hdd_ctx->pcds_context; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; struct wiphy *wiphy = hdd_ctx->wiphy; ENTER(); @@ -3704,7 +3704,7 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) cdf_mc_timer_stop(&hdd_ctx->bus_bw_timer); } - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cdf_mc_timer_destroy(&hdd_ctx->bus_bw_timer))) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Cannot deallocate Bus bandwidth timer")); @@ -3717,7 +3717,7 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) cdf_mc_timer_stop(&hdd_ctx->skip_acs_scan_timer); } - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cdf_mc_timer_destroy(&hdd_ctx->skip_acs_scan_timer))) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Cannot deallocate ACS Skip timer")); @@ -3729,7 +3729,7 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) cdf_mc_timer_stop(&hdd_ctx->dbs_opportunistic_timer); } - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cdf_mc_timer_destroy( &hdd_ctx->dbs_opportunistic_timer))) { hdd_err("Cannot deallocate dbs opportunistic timer"); @@ -3754,11 +3754,11 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) hdd_stop_all_adapters(hdd_ctx); /* Stop all the modules */ - cdf_status = cds_disable(p_cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_disable(p_cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Failed to stop CDS")); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } /* @@ -3766,11 +3766,11 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) * is scheduled after the each module close is called i.e after all the * data structures are freed. */ - cdf_status = cds_sched_close(p_cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_sched_close(p_cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Failed to close CDS Scheduler")); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } #ifdef WLAN_FEATURE_HOLD_RX_WAKELOCK /* Destroy the wake lock */ @@ -3805,7 +3805,7 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) qdf_list_destroy(&hdd_ctx->hdd_roc_req_q); qdf_list_destroy(&hdd_ctx->hdd_scan_req_q); - if (!CDF_IS_STATUS_SUCCESS(cds_deinit_policy_mgr())) { + if (!QDF_IS_STATUS_SUCCESS(cds_deinit_policy_mgr())) { hdd_err("Failed to deinit policy manager"); /* Proceed and complete the clean up */ } @@ -3877,7 +3877,7 @@ int hdd_wlan_set_ht2040_mode(hdd_adapter_t *adapter, uint16_t staId, struct cdf_mac_addr macAddrSTA, int channel_type) { int status; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_context_t *hdd_ctx = NULL; hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -3890,9 +3890,9 @@ int hdd_wlan_set_ht2040_mode(hdd_adapter_t *adapter, uint16_t staId, if (!hdd_ctx->hHal) return -EINVAL; - cdf_status = sme_notify_ht2040_mode(hdd_ctx->hHal, staId, macAddrSTA, + qdf_status = sme_notify_ht2040_mode(hdd_ctx->hHal, staId, macAddrSTA, adapter->sessionId, channel_type); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { hddLog(LOGE, "Fail to send notification with ht2040 mode"); return -EINVAL; } @@ -3912,7 +3912,7 @@ int hdd_wlan_set_ht2040_mode(hdd_adapter_t *adapter, uint16_t staId, int hdd_wlan_notify_modem_power_state(int state) { int status; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_context_t *hdd_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); @@ -3924,8 +3924,8 @@ int hdd_wlan_notify_modem_power_state(int state) if (!hdd_ctx->hHal) return -EINVAL; - cdf_status = sme_notify_modem_power_state(hdd_ctx->hHal, state); - if (CDF_STATUS_SUCCESS != cdf_status) { + qdf_status = sme_notify_modem_power_state(hdd_ctx->hHal, state); + if (QDF_STATUS_SUCCESS != qdf_status) { hddLog(LOGE, "Fail to send notification with modem power state %d", state); @@ -3941,25 +3941,25 @@ int hdd_wlan_notify_modem_power_state(int state) * * Return: None */ -CDF_STATUS hdd_post_cds_enable_config(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_post_cds_enable_config(hdd_context_t *hdd_ctx) { - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; /* * Send ready indication to the HDD. This will kick off the MAC * into a 'running' state and should kick off an initial scan. */ cdf_ret_status = sme_hdd_ready_ind(hdd_ctx->hHal); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { hddLog(CDF_TRACE_LEVEL_ERROR, FL( "sme_hdd_ready_ind() failed with status code %08d [x%08x]" ), cdf_ret_status, cdf_ret_status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* wake lock APIs for HDD */ @@ -4002,7 +4002,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) tSirVersionType versionReported; tSirVersionString versionString; uint8_t fwFeatCapsMsgSupported = 0; - CDF_STATUS vstatus; + QDF_STATUS vstatus; memset(&versionCompiled, 0, sizeof(versionCompiled)); memset(&versionReported, 0, sizeof(versionReported)); @@ -4012,7 +4012,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) vstatus = sme_get_wcnss_wlan_compiled_version(hdd_ctx->hHal, &versionCompiled); - if (!CDF_IS_STATUS_SUCCESS(vstatus)) { + if (!QDF_IS_STATUS_SUCCESS(vstatus)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL( "unable to retrieve WCNSS WLAN compiled version" @@ -4022,7 +4022,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) vstatus = sme_get_wcnss_wlan_reported_version(hdd_ctx->hHal, &versionReported); - if (!CDF_IS_STATUS_SUCCESS(vstatus)) { + if (!QDF_IS_STATUS_SUCCESS(vstatus)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL( "unable to retrieve WCNSS WLAN reported version" @@ -4057,7 +4057,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) vstatus = sme_get_wcnss_software_version(hdd_ctx->hHal, versionString, sizeof(versionString)); - if (!CDF_IS_STATUS_SUCCESS(vstatus)) { + if (!QDF_IS_STATUS_SUCCESS(vstatus)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL( "unable to retrieve WCNSS software version string" @@ -4071,7 +4071,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) vstatus = sme_get_wcnss_hardware_version(hdd_ctx->hHal, versionString, sizeof(versionString)); - if (!CDF_IS_STATUS_SUCCESS(vstatus)) { + if (!QDF_IS_STATUS_SUCCESS(vstatus)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL( "unable to retrieve WCNSS hardware version string" @@ -4117,7 +4117,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) } /* Initialize channel list in sme based on the country code */ -CDF_STATUS hdd_set_sme_chan_list(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_set_sme_chan_list(hdd_context_t *hdd_ctx) { return sme_init_chan_list(hdd_ctx->hHal, hdd_ctx->reg.alpha2, hdd_ctx->reg.cc_src); @@ -4140,10 +4140,10 @@ bool hdd_is_5g_supported(hdd_context_t *hdd_ctx) return true; } -static CDF_STATUS wlan_hdd_regulatory_init(hdd_context_t *hdd_ctx) +static QDF_STATUS wlan_hdd_regulatory_init(hdd_context_t *hdd_ctx) { struct wiphy *wiphy; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; wiphy = hdd_ctx->wiphy; @@ -4152,7 +4152,7 @@ static CDF_STATUS wlan_hdd_regulatory_init(hdd_context_t *hdd_ctx) * wiphy needs to be initialized before wiphy registration */ status = cds_regulatory_init(); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("cds_init_wiphy failed")); return status; @@ -4179,7 +4179,7 @@ static CDF_STATUS wlan_hdd_regulatory_init(hdd_context_t *hdd_ctx) /* registration of wiphy dev with cfg80211 */ if (0 > wlan_hdd_cfg80211_register(wiphy)) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("wiphy register failed")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; @@ -4274,12 +4274,12 @@ static void hdd_bus_bw_compute_cbk(void *priv) uint64_t tx_packets = 0, rx_packets = 0; uint64_t total_tx = 0, total_rx = 0; hdd_adapter_list_node_t *adapterNode = NULL; - CDF_STATUS status = 0; + QDF_STATUS status = 0; bool connected = false; uint32_t ipa_tx_packets = 0, ipa_rx_packets = 0; for (status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - NULL != adapterNode && CDF_STATUS_SUCCESS == status; + NULL != adapterNode && QDF_STATUS_SUCCESS == status; status = hdd_get_next_adapter(hdd_ctx, adapterNode, &adapterNode)) { @@ -4408,11 +4408,11 @@ void wlan_hdd_display_netif_queue_history(hdd_context_t *hdd_ctx) hdd_adapter_t *adapter = NULL; hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; - CDF_STATUS status; + QDF_STATUS status; int i; status = hdd_get_front_adapter(hdd_ctx, &adapter_node); - while (NULL != adapter_node && CDF_STATUS_SUCCESS == status) { + while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) { adapter = adapter_node->pAdapter; hddLog(CDF_TRACE_LEVEL_ERROR, @@ -4469,10 +4469,10 @@ void wlan_hdd_clear_netif_queue_history(hdd_context_t *hdd_ctx) { hdd_adapter_t *adapter = NULL; hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; - CDF_STATUS status; + QDF_STATUS status; status = hdd_get_front_adapter(hdd_ctx, &adapter_node); - while (NULL != adapter_node && CDF_STATUS_SUCCESS == status) { + while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) { adapter = adapter_node->pAdapter; cdf_mem_zero(adapter->queue_oper_stats, @@ -4503,9 +4503,9 @@ void wlan_hdd_clear_netif_queue_history(hdd_context_t *hdd_ctx) * it may try to connect to these APs, thus flush out all the scan results * which are present in SME after 11d scan is done. * - * Return: CDF_STATUS_SUCCESS + * Return: QDF_STATUS_SUCCESS */ -static CDF_STATUS hdd_11d_scan_done(tHalHandle halHandle, void *pContext, +static QDF_STATUS hdd_11d_scan_done(tHalHandle halHandle, void *pContext, uint8_t sessionId, uint32_t scanId, eCsrScanStatus status) { @@ -4515,7 +4515,7 @@ static CDF_STATUS hdd_11d_scan_done(tHalHandle halHandle, void *pContext, EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_FEATURE_OFFLOAD_PACKETS @@ -4956,16 +4956,16 @@ static void hdd_set_thermal_level_cb(void *context, u_int8_t level) * * Disables all the dual mac features like DBS, Agile DFS etc. * - * Return: CDF_STATUS_SUCCESS on success + * Return: QDF_STATUS_SUCCESS on success */ -static CDF_STATUS wlan_hdd_disable_all_dual_mac_features(hdd_context_t *hdd_ctx) +static QDF_STATUS wlan_hdd_disable_all_dual_mac_features(hdd_context_t *hdd_ctx) { struct sir_dual_mac_config cfg; - CDF_STATUS status; + QDF_STATUS status; if (!hdd_ctx) { hdd_err("HDD context is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cfg.scan_config = 0; @@ -4976,12 +4976,12 @@ static CDF_STATUS wlan_hdd_disable_all_dual_mac_features(hdd_context_t *hdd_ctx) hdd_debug("Disabling all dual mac features..."); status = sme_soc_set_dual_mac_config(hdd_ctx->hHal, cfg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hdd_err("sme_soc_set_dual_mac_config failed %d", status); return status; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5068,7 +5068,7 @@ static void hdd_set_trace_level_for_each(hdd_context_t *hdd_ctx) */ hdd_context_t *hdd_init_context(struct device *dev, void *hif_sc) { - CDF_STATUS status; + QDF_STATUS status; int ret = 0; hdd_context_t *hdd_ctx; v_CONTEXT_t p_cds_context; @@ -5101,7 +5101,7 @@ hdd_context_t *hdd_init_context(struct device *dev, void *hif_sc) /* Read and parse the qcom_cfg.ini file */ status = hdd_parse_config_ini(hdd_ctx); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hdd_alert("Error (status: %d) parsing INI file: %s", status, WLAN_INI_FILE); ret = -EINVAL; @@ -5319,7 +5319,7 @@ err_close_adapter: static int hdd_update_country_code(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) { - CDF_STATUS status; + QDF_STATUS status; int ret = 0; unsigned long rc; @@ -5335,7 +5335,7 @@ static int hdd_update_country_code(hdd_context_t *hdd_ctx, eSIR_TRUE); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_err("SME Change Country code from module param fail ret=%d", ret); return -EINVAL; @@ -5363,7 +5363,7 @@ static int hdd_update_country_code(hdd_context_t *hdd_ctx, static int hdd_init_thermal_info(hdd_context_t *hdd_ctx) { tSmeThermalParams thermal_param; - CDF_STATUS status; + QDF_STATUS status; thermal_param.smeThermalMgmtEnabled = hdd_ctx->config->thermalMitigationEnable; @@ -5388,7 +5388,7 @@ static int hdd_init_thermal_info(hdd_context_t *hdd_ctx) status = sme_init_thermal_info(hdd_ctx->hHal, thermal_param); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return cdf_status_to_os_return(status); sme_add_set_thermal_level_callback(hdd_ctx->hHal, @@ -5438,7 +5438,7 @@ static inline void hdd_release_rtnl_lock(void) { } */ int hdd_wlan_startup(struct device *dev, void *hif_sc) { - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter = NULL; hdd_context_t *hdd_ctx = NULL; int ret; @@ -5471,7 +5471,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) hdd_wlan_green_ap_init(hdd_ctx); status = cds_open(); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("cds_open failed")); goto err_hdd_free_context; } @@ -5486,7 +5486,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) } status = cds_pre_enable(hdd_ctx->pcds_context); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("cds_pre_enable failed")); goto err_cds_close; } @@ -5495,7 +5495,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) status = wlan_hdd_regulatory_init(hdd_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Failed to init channel list")); goto err_cds_close; @@ -5517,7 +5517,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) */ status = hdd_set_sme_config(hdd_ctx); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Failed hdd_set_sme_config")); goto err_wiphy_unregister; } @@ -5532,7 +5532,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) } status = hdd_set_sme_chan_list(hdd_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Failed to init channel list")); goto err_wiphy_unregister; @@ -5545,7 +5545,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) goto err_wiphy_unregister; } - if (CDF_STATUS_SUCCESS != hdd_update_mac_config(hdd_ctx)) { + if (QDF_STATUS_SUCCESS != hdd_update_mac_config(hdd_ctx)) { hddLog(CDF_TRACE_LEVEL_WARN, FL("can't update mac config, using MAC from ini file")); } @@ -5565,7 +5565,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) goto err_wiphy_unregister; } - if (hdd_ipa_init(hdd_ctx) == CDF_STATUS_E_FAILURE) + if (hdd_ipa_init(hdd_ctx) == QDF_STATUS_E_FAILURE) goto err_wiphy_unregister; /* @@ -5573,7 +5573,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) * else */ status = cds_enable(hdd_ctx->pcds_context); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("cds_enable failed")); goto err_ipa_cleanup; } @@ -5581,7 +5581,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) hdd_init_channel_avoidance(hdd_ctx); status = hdd_post_cds_enable_config(hdd_ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("hdd_post_cds_enable_config failed")); goto err_cds_disable; @@ -5621,7 +5621,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) status = hdd_debugfs_init(adapter); - if (CDF_IS_STATUS_SUCCESS(status)) + if (QDF_IS_STATUS_SUCCESS(status)) hdd_err("hdd_debugfs_init failed: %d!", status); /* FW capabilities received, Set the Dot11 mode */ @@ -5685,7 +5685,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) if (hdd_ctx->config->WlanAutoShutdown != 0) if (sme_set_auto_shutdown_cb (hdd_ctx->hHal, wlan_hdd_auto_shutdown_cb) - != CDF_STATUS_SUCCESS) + != QDF_STATUS_SUCCESS) hddLog(LOGE, FL( "Auto shutdown feature could not be enabled" @@ -5697,13 +5697,13 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) CDF_TIMER_TYPE_SW, hdd_skip_acs_scan_timer_handler, (void *)hdd_ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) hddLog(LOGE, FL("Failed to init ACS Skip timer")); #endif wlan_hdd_nan_init(hdd_ctx); status = cds_init_policy_mgr(); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_err("Policy manager initialization failed"); goto err_unreg_netdev_notifier; } @@ -5721,7 +5721,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) hddtxlimit.txPower2g = hdd_ctx->config->TxPower2g; hddtxlimit.txPower5g = hdd_ctx->config->TxPower5g; status = sme_txpower_limit(hdd_ctx->hHal, &hddtxlimit); - if (CDF_IS_STATUS_SUCCESS(status)) + if (QDF_IS_STATUS_SUCCESS(status)) hdd_err("Error setting txlimit in sme: %d", status); #ifdef MSM_PLATFORM @@ -5778,7 +5778,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) if (hdd_ctx->config->dual_mac_feature_disable) { status = wlan_hdd_disable_all_dual_mac_features(hdd_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hdd_err("Failed to disable dual mac features"); goto err_unreg_netdev_notifier; } @@ -5800,7 +5800,7 @@ err_nl_srv: #endif /* WLAN_KD_READY_NOTIFIER */ nl_srv_exit(); - if (!CDF_IS_STATUS_SUCCESS(cds_deinit_policy_mgr())) { + if (!QDF_IS_STATUS_SUCCESS(cds_deinit_policy_mgr())) { hdd_err("Failed to deinit policy manager"); /* Proceed and complete the clean up */ } @@ -5823,10 +5823,10 @@ err_wiphy_unregister: err_cds_close: status = cds_sched_close(hdd_ctx->pcds_context); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Failed to close CDS Scheduler")); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); } cds_close(hdd_ctx->pcds_context); @@ -5850,13 +5850,13 @@ success: * * Return: None */ -CDF_STATUS hdd_softap_sta_deauth(hdd_adapter_t *adapter, +QDF_STATUS hdd_softap_sta_deauth(hdd_adapter_t *adapter, struct tagCsrDelStaParams *pDelStaParams) { #ifndef WLAN_FEATURE_MBSSID v_CONTEXT_t p_cds_context = (WLAN_HDD_GET_CTX(adapter))->pcds_context; #endif - CDF_STATUS cdf_status = CDF_STATUS_E_FAULT; + QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; ENTER(); @@ -5865,18 +5865,18 @@ CDF_STATUS hdd_softap_sta_deauth(hdd_adapter_t *adapter, /* Ignore request to deauth bcmc station */ if (pDelStaParams->peerMacAddr.bytes[0] & 0x1) - return cdf_status; + return qdf_status; #ifdef WLAN_FEATURE_MBSSID - cdf_status = + qdf_status = wlansap_deauth_sta(WLAN_HDD_GET_SAP_CTX_PTR(adapter), pDelStaParams); #else - cdf_status = wlansap_deauth_sta(p_cds_context, pDelStaParams); + qdf_status = wlansap_deauth_sta(p_cds_context, pDelStaParams); #endif EXIT(); - return cdf_status; + return qdf_status; } /** @@ -5939,7 +5939,7 @@ void hdd_softap_tkip_mic_fail_counter_measure(hdd_adapter_t *adapter, * * Return: true if connected; false otherwise */ -CDF_STATUS hdd_issta_p2p_clientconnected(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_issta_p2p_clientconnected(hdd_context_t *hdd_ctx) { return sme_is_sta_p2p_client_connected(hdd_ctx->hHal); } @@ -6042,7 +6042,7 @@ void wlan_hdd_disable_roaming(hdd_adapter_t *adapter) hdd_adapter_t *adapterIdx = NULL; hdd_adapter_list_node_t *adapterNode = NULL; hdd_adapter_list_node_t *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; if (hdd_ctx->config->isFastRoamIniFeatureEnabled && hdd_ctx->config->isRoamOffloadScanEnabled && @@ -6056,7 +6056,7 @@ void wlan_hdd_disable_roaming(hdd_adapter_t *adapter) */ status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapterIdx = adapterNode->pAdapter; if (WLAN_HDD_INFRA_STATION == adapterIdx->device_mode @@ -6094,7 +6094,7 @@ void wlan_hdd_enable_roaming(hdd_adapter_t *adapter) hdd_adapter_t *adapterIdx = NULL; hdd_adapter_list_node_t *adapterNode = NULL; hdd_adapter_list_node_t *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; if (hdd_ctx->config->isFastRoamIniFeatureEnabled && hdd_ctx->config->isRoamOffloadScanEnabled && @@ -6108,7 +6108,7 @@ void wlan_hdd_enable_roaming(hdd_adapter_t *adapter) */ status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapterIdx = adapterNode->pAdapter; if (WLAN_HDD_INFRA_STATION == adapterIdx->device_mode @@ -6253,7 +6253,7 @@ void wlan_hdd_send_all_scan_intf_info(hdd_context_t *hdd_ctx) hdd_adapter_t *pDataAdapter = NULL; hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; bool scan_intf_found = false; - CDF_STATUS status; + QDF_STATUS status; if (!hdd_ctx) { hddLog(CDF_TRACE_LEVEL_ERROR, @@ -6262,7 +6262,7 @@ void wlan_hdd_send_all_scan_intf_info(hdd_context_t *hdd_ctx) } status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { pDataAdapter = adapterNode->pAdapter; if (pDataAdapter) { if (pDataAdapter->device_mode == WLAN_HDD_INFRA_STATION @@ -6311,7 +6311,7 @@ void wlan_hdd_auto_shutdown_cb(void) void wlan_hdd_auto_shutdown_enable(hdd_context_t *hdd_ctx, bool enable) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; bool ap_connected = false, sta_connected = false; tHalHandle hal_handle; @@ -6325,7 +6325,7 @@ void wlan_hdd_auto_shutdown_enable(hdd_context_t *hdd_ctx, bool enable) if (enable == false) { if (sme_set_auto_shutdown_timer(hal_handle, 0) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Failed to stop wlan auto shutdown timer")); } @@ -6336,7 +6336,7 @@ void wlan_hdd_auto_shutdown_enable(hdd_context_t *hdd_ctx, bool enable) if (cds_concurrent_open_sessions_running()) { status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (adapter && adapter->device_mode == @@ -6371,7 +6371,7 @@ void wlan_hdd_auto_shutdown_enable(hdd_context_t *hdd_ctx, bool enable) if (sme_set_auto_shutdown_timer(hal_handle, hdd_ctx->config-> WlanAutoShutdown) - != CDF_STATUS_SUCCESS) + != QDF_STATUS_SUCCESS) hddLog(LOGE, FL("Failed to start wlan auto shutdown timer")); else @@ -6388,13 +6388,13 @@ hdd_adapter_t *hdd_get_con_sap_adapter(hdd_adapter_t *this_sap_adapter, { hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(this_sap_adapter); hdd_adapter_t *adapter, *con_sap_adapter; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; con_sap_adapter = NULL; status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (adapter && ((adapter->device_mode == WLAN_HDD_SOFTAP) || (adapter->device_mode == WLAN_HDD_P2P_GO)) && @@ -6433,7 +6433,7 @@ void hdd_start_bus_bw_compute_timer(hdd_adapter_t *adapter) void hdd_stop_bus_bw_compute_timer(hdd_adapter_t *adapter) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; bool can_stop = true; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -6448,7 +6448,7 @@ void hdd_stop_bus_bw_compute_timer(hdd_adapter_t *adapter) if (cds_concurrent_open_sessions_running()) { status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (adapter && (adapter->device_mode == WLAN_HDD_INFRA_STATION @@ -6492,9 +6492,9 @@ void hdd_stop_bus_bw_compute_timer(hdd_adapter_t *adapter) * if both are same then it will return false else it will restart the sap in * sta's channel and return true. * - * Return: CDF_STATUS_SUCCESS or CDF_STATUS_E_FAILURE. + * Return: QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE. */ -CDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, +QDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, hdd_adapter_t *ap_adapter, tCsrRoamProfile *roam_profile, tScanResultHandle *scan_cache, @@ -6502,7 +6502,7 @@ CDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, { hdd_ap_ctx_t *hdd_ap_ctx; uint8_t channel_id; - CDF_STATUS status; + QDF_STATUS status; device_mode_t device_mode = ap_adapter->device_mode; *concurrent_chnl_same = true; @@ -6512,7 +6512,7 @@ CDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, roam_profile, scan_cache, &channel_id); - if ((CDF_STATUS_SUCCESS == status)) { + if ((QDF_STATUS_SUCCESS == status)) { if ((WLAN_HDD_SOFTAP == device_mode) && (channel_id < SIR_11A_CHANNEL_BEGIN)) { if (hdd_ap_ctx->operatingChannel != channel_id) { @@ -6538,9 +6538,9 @@ CDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, */ hddLog(CDF_TRACE_LEVEL_ERROR, FL("Finding AP from scan cache failed")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_FEATURE_MBSSID @@ -6594,7 +6594,7 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter) hddLog(CDF_TRACE_LEVEL_INFO_HIGH, FL("Now doing SAP STOPBSS")); qdf_event_reset(&hostapd_state->cdf_stop_bss_event); - if (CDF_STATUS_SUCCESS == wlansap_stop_bss(hdd_ap_ctx-> + if (QDF_STATUS_SUCCESS == wlansap_stop_bss(hdd_ap_ctx-> sapContext)) { qdf_status = qdf_wait_single_event(&hostapd_state-> cdf_stop_bss_event, @@ -6669,7 +6669,7 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter) if (wlansap_start_bss(hdd_ap_ctx->sapContext, hdd_hostapd_sap_event_cb, &hdd_ap_ctx->sapConfig, ap_adapter->dev) - != CDF_STATUS_SUCCESS) + != QDF_STATUS_SUCCESS) goto end; hddLog(CDF_TRACE_LEVEL_INFO_HIGH, diff --git a/core/hdd/src/wlan_hdd_memdump.c b/core/hdd/src/wlan_hdd_memdump.c index 9013e81a77..80951ccd12 100644 --- a/core/hdd/src/wlan_hdd_memdump.c +++ b/core/hdd/src/wlan_hdd_memdump.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -197,7 +197,7 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, const void *data, int data_len) { int status; - CDF_STATUS sme_status; + QDF_STATUS sme_status; hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct fw_dump_req fw_mem_dump_req; struct fw_dump_seg_req *seg_req; @@ -296,7 +296,7 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, spin_unlock(&hdd_context_lock); sme_status = sme_fw_mem_dump(hdd_ctx->hHal, &fw_mem_dump_req); - if (CDF_STATUS_SUCCESS != sme_status) { + if (QDF_STATUS_SUCCESS != sme_status) { hddLog(LOGE, FL("sme_fw_mem_dump Failed")); mutex_lock(&hdd_ctx->memdump_lock); cdf_os_mem_free_consistent(cdf_ctx, @@ -539,8 +539,8 @@ int memdump_init(void) { hdd_context_t *hdd_ctx; int status = 0; - CDF_STATUS cb_status; - CDF_STATUS cdf_status; + QDF_STATUS cb_status; + QDF_STATUS qdf_status; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (!hdd_ctx) { @@ -555,7 +555,7 @@ int memdump_init(void) cb_status = sme_fw_mem_dump_register_cb(hdd_ctx->hHal, wlan_hdd_cfg80211_fw_mem_dump_cb); - if (CDF_STATUS_SUCCESS != cb_status) { + if (QDF_STATUS_SUCCESS != cb_status) { hddLog(LOGE , FL("Failed to register the callback")); return -EINVAL; } @@ -568,10 +568,10 @@ int memdump_init(void) init_completion(&fw_dump_context.response_event); - cdf_status = cdf_mc_timer_init(&hdd_ctx->memdump_cleanup_timer, + qdf_status = cdf_mc_timer_init(&hdd_ctx->memdump_cleanup_timer, CDF_TIMER_TYPE_SW, memdump_cleanup_timer_cb, (void *)hdd_ctx); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Failed to init memdump cleanup timer")); return -EINVAL; } @@ -594,7 +594,7 @@ void memdump_deinit(void) cdf_dma_addr_t paddr; cdf_dma_addr_t dma_ctx = 0; cdf_device_t cdf_ctx; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (!hdd_ctx) { @@ -631,7 +631,7 @@ void memdump_deinit(void) cdf_mc_timer_stop(&hdd_ctx->memdump_cleanup_timer); } - cdf_status = cdf_mc_timer_destroy(&hdd_ctx->memdump_cleanup_timer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + qdf_status = cdf_mc_timer_destroy(&hdd_ctx->memdump_cleanup_timer); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, FL("Failed to deallocate timer")); } diff --git a/core/hdd/src/wlan_hdd_nan.c b/core/hdd/src/wlan_hdd_nan.c index 7e1e8c6131..9fe3aee14d 100644 --- a/core/hdd/src/wlan_hdd_nan.c +++ b/core/hdd/src/wlan_hdd_nan.c @@ -58,7 +58,7 @@ static int __wlan_hdd_cfg80211_nan_request(struct wiphy *wiphy, int data_len) { tNanRequestReq nan_req; - CDF_STATUS status; + QDF_STATUS status; int ret_val; hdd_context_t *hdd_ctx = wiphy_priv(wiphy); @@ -82,7 +82,7 @@ static int __wlan_hdd_cfg80211_nan_request(struct wiphy *wiphy, nan_req.request_data = data; status = sme_nan_request(&nan_req); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { ret_val = -EINVAL; } return ret_val; diff --git a/core/hdd/src/wlan_hdd_napi.c b/core/hdd/src/wlan_hdd_napi.c index 4865e30c61..15d372d393 100644 --- a/core/hdd/src/wlan_hdd_napi.c +++ b/core/hdd/src/wlan_hdd_napi.c @@ -121,7 +121,7 @@ int hdd_napi_create(void) * services/calls. * For Rome, there is only one service, hence a single call */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hif_map_service_to_pipe(hif_ctx, HTT_DATA_MSG_SVC, &ul, &dl, &ul_polled, &dl_polled)) { hdd_err("cannot map service to pipe"); diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index f8df3fbfcd..cc8543e0de 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -241,16 +241,16 @@ static int hdd_ocb_validate_config(hdd_adapter_t *adapter, */ static int hdd_ocb_register_sta(hdd_adapter_t *adapter) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; struct ol_txrx_desc_type sta_desc = {0}; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); uint8_t peer_id; - cdf_status = ol_txrx_register_ocb_peer(hdd_ctx->pcds_context, + qdf_status = ol_txrx_register_ocb_peer(hdd_ctx->pcds_context, adapter->macAddressCurrent.bytes, &peer_id); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Error registering OCB Self Peer!")); return -EINVAL; } @@ -260,11 +260,11 @@ static int hdd_ocb_register_sta(hdd_adapter_t *adapter) sta_desc.sta_id = peer_id; sta_desc.is_qos_enabled = 1; - cdf_status = ol_txrx_register_peer(hdd_rx_packet_cbk, + qdf_status = ol_txrx_register_peer(hdd_rx_packet_cbk, &sta_desc); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Failed to register. Status= %d [0x%08X]"), - cdf_status, cdf_status); + qdf_status, qdf_status); return -EINVAL; } @@ -400,7 +400,7 @@ static int hdd_ocb_set_config_req(hdd_adapter_t *adapter, struct sir_ocb_config *config) { int rc; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; struct hdd_ocb_ctxt context = {0}; if (hdd_ocb_validate_config(adapter, config)) { @@ -417,10 +417,10 @@ static int hdd_ocb_set_config_req(hdd_adapter_t *adapter, netif_carrier_off(adapter->dev); /* Call the SME API to set the config */ - cdf_status = sme_ocb_set_config( + qdf_status = sme_ocb_set_config( ((hdd_context_t *)adapter->pHddCtx)->hHal, &context, hdd_ocb_set_config_callback, config); - if (cdf_status != CDF_STATUS_SUCCESS) { + if (qdf_status != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Error calling SME function.")); /* Convert from ecdf_status to errno */ return -EINVAL; @@ -1036,7 +1036,7 @@ static int __wlan_hdd_cfg80211_ocb_set_utc_time(struct wiphy *wiphy, cdf_mem_copy(utc->time_error, nla_data(time_error_attr), SIZE_UTC_TIME_ERROR); - if (sme_ocb_set_utc_time(hdd_ctx->hHal, utc) != CDF_STATUS_SUCCESS) { + if (sme_ocb_set_utc_time(hdd_ctx->hHal, utc) != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Error while setting UTC time")); rc = -EINVAL; } else { @@ -1152,7 +1152,7 @@ __wlan_hdd_cfg80211_ocb_start_timing_advert(struct wiphy *wiphy, } if (sme_ocb_start_timing_advert(hdd_ctx->hHal, timing_advert) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Error while starting timing advert")); rc = -EINVAL; } else { @@ -1254,7 +1254,7 @@ __wlan_hdd_cfg80211_ocb_stop_timing_advert(struct wiphy *wiphy, tb[QCA_WLAN_VENDOR_ATTR_OCB_STOP_TIMING_ADVERT_CHANNEL_FREQ]); if (sme_ocb_stop_timing_advert(hdd_ctx->hHal, timing_advert) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Error while stopping timing advert")); rc = -EINVAL; } else { @@ -1586,7 +1586,7 @@ static int __wlan_hdd_cfg80211_dcc_get_stats(struct wiphy *wiphy, &request); if (rc) { hddLog(LOGE, FL("Error calling SME function")); - /* Need to convert from cdf_status to errno. */ + /* Need to convert from qdf_status to errno. */ return -EINVAL; } @@ -1733,7 +1733,7 @@ static int __wlan_hdd_cfg80211_dcc_clear_stats(struct wiphy *wiphy, if (sme_dcc_clear_stats(hdd_ctx->hHal, adapter->sessionId, nla_get_u32( tb[QCA_WLAN_VENDOR_ATTR_DCC_CLEAR_STATS_BITMAP])) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Error calling SME function.")); return -EINVAL; } @@ -1882,7 +1882,7 @@ static int __wlan_hdd_cfg80211_dcc_update_ndl(struct wiphy *wiphy, &request); if (rc) { hddLog(LOGE, FL("Error calling SME function.")); - /* Convert from cdf_status to errno */ + /* Convert from qdf_status to errno */ return -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c index 52c74fefcc..187cdc45b9 100644 --- a/core/hdd/src/wlan_hdd_oemdata.c +++ b/core/hdd/src/wlan_hdd_oemdata.c @@ -58,7 +58,7 @@ static struct hdd_context_s *p_hdd_ctx; static int populate_oem_data_cap(hdd_adapter_t *adapter, t_iw_oem_data_cap *data_cap) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; struct hdd_config *config; uint32_t num_chan; uint8_t *chan_list; @@ -97,7 +97,7 @@ static int populate_oem_data_cap(hdd_adapter_t *adapter, num_chan = WNI_CFG_VALID_CHANNEL_LIST_LEN; status = sme_get_cfg_valid_channels(hdd_ctx->hHal, &chan_list[0], &num_chan); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hdd_err("failed to get valid channel list, status: %d", status); cdf_mem_free(chan_list); return -EINVAL; @@ -179,7 +179,7 @@ static void send_oem_reg_rsp_nlink_msg(void) hdd_adapter_list_node_t *pAdapterNode = NULL; hdd_adapter_list_node_t *pNext = NULL; hdd_adapter_t *pAdapter = NULL; - CDF_STATUS status = 0; + QDF_STATUS status = 0; /* OEM message is always to a specific process and cannot be a broadcast */ if (p_hdd_ctx->oem_pid == 0) { @@ -215,7 +215,7 @@ static void send_oem_reg_rsp_nlink_msg(void) /* Iterate through each of the adapters and fill device mode and vdev id */ status = hdd_get_front_adapter(p_hdd_ctx, &pAdapterNode); - while ((CDF_STATUS_SUCCESS == status) && pAdapterNode) { + while ((QDF_STATUS_SUCCESS == status) && pAdapterNode) { pAdapter = pAdapterNode->pAdapter; if (pAdapter) { deviceMode = buf++; @@ -364,27 +364,27 @@ void hdd_send_oem_data_rsp_msg(int length, uint8_t *oemDataRsp) * * This function sends oem message to SME * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData) +static QDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData) { hdd_adapter_t *pAdapter = NULL; tOemDataReqConfig oemDataReqConfig; uint32_t oemDataReqID = 0; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* for now, STA interface only */ pAdapter = hdd_get_adapter(p_hdd_ctx, WLAN_HDD_INFRA_STATION); if (!pAdapter) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: No adapter for STA mode", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!oemData) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: oemData is null", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_zero(&oemDataReqConfig, sizeof(tOemDataReqConfig)); @@ -392,7 +392,7 @@ static CDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData) oemDataReqConfig.data = cdf_mem_malloc(oemDataLen); if (!oemDataReqConfig.data) { hddLog(LOGE, FL("malloc failed for data req buffer")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } oemDataReqConfig.data_len = oemDataLen; @@ -431,7 +431,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) uint8_t chanId; uint32_t reg_info_1; uint32_t reg_info_2; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; int i; uint8_t *buf; @@ -479,7 +479,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) chanId = chanList[i]; status = sme_get_reg_info(p_hdd_ctx->hHal, chanId, ®_info_1, ®_info_2); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* copy into hdd chan info struct */ hddChanInfo.chan_id = chanId; hddChanInfo.reserved0 = 0; @@ -538,7 +538,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) static int oem_process_set_cap_req_msg(int oem_cap_len, char *oem_cap, int32_t app_pid) { - CDF_STATUS status; + QDF_STATUS status; int error_code; struct sk_buff *skb; struct nlmsghdr *nlh; @@ -552,7 +552,7 @@ static int oem_process_set_cap_req_msg(int oem_cap_len, status = sme_oem_update_capability(p_hdd_ctx->hHal, (struct sme_oem_capability *)oem_cap); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) hdd_err("error updating rm capability, status: %d", status); error_code = cdf_status_to_os_return(status); diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c index 27064e10e9..fb48f5f273 100644 --- a/core/hdd/src/wlan_hdd_p2p.c +++ b/core/hdd/src/wlan_hdd_p2p.c @@ -160,8 +160,8 @@ static bool hdd_p2p_is_action_type_rsp(const u8 *buf) } static -CDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx, - CDF_STATUS status, uint32_t scan_id) +QDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx, + QDF_STATUS status, uint32_t scan_id) { hdd_adapter_t *pAdapter = (hdd_adapter_t *) pCtx; hdd_cfg80211_state_t *cfgState = WLAN_HDD_GET_CFG_STATE_PTR(pAdapter); @@ -170,7 +170,7 @@ CDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx, if (!hdd_ctx) { hdd_err("Invalid HDD context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mutex_lock(&cfgState->remain_on_chan_ctx_lock); @@ -181,7 +181,7 @@ CDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx, hddLog(LOGW, "%s: No Rem on channel pending for which Rsp is received", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } hddLog(LOG1, "Received remain on channel rsp"); @@ -266,9 +266,9 @@ CDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx, } cdf_mem_free(pRemainChanCtx); complete(&pAdapter->cancel_rem_on_chan_var); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) complete(&pAdapter->rem_on_chan_ready_event); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void wlan_hdd_cancel_existing_remain_on_channel(hdd_adapter_t *pAdapter) @@ -542,11 +542,11 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, hdd_remain_on_chan_ctx_t *pRemainChanCtx) { hdd_cfg80211_state_t *cfgState = WLAN_HDD_GET_CFG_STATE_PTR(pAdapter); - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; hdd_adapter_t *pAdapter_temp; - CDF_STATUS status; + QDF_STATUS status; bool isGoPresent = false; unsigned int duration; @@ -565,11 +565,11 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, mutex_unlock(&cfgState->remain_on_chan_ctx_lock); /* Initialize Remain on chan timer */ - cdf_status = + qdf_status = cdf_mc_timer_init(&pRemainChanCtx->hdd_remain_on_chan_timer, CDF_TIMER_TYPE_SW, wlan_hdd_remain_on_chan_timeout, pAdapter); - if (cdf_status != CDF_STATUS_SUCCESS) { + if (qdf_status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Not able to initialize remain_on_chan timer")); mutex_lock(&cfgState->remain_on_chan_ctx_lock); @@ -581,7 +581,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, } status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter_temp = pAdapterNode->pAdapter; if (pAdapter_temp->device_mode == WLAN_HDD_P2P_GO) { isGoPresent = true; @@ -608,7 +608,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, uint8_t sessionId = pAdapter->sessionId; /* call sme API to start remain on channel. */ - if (CDF_STATUS_SUCCESS != sme_remain_on_channel( + if (QDF_STATUS_SUCCESS != sme_remain_on_channel( WLAN_HDD_GET_HAL_CTX(pAdapter), sessionId, pRemainChanCtx->chan.hw_value, duration, @@ -631,7 +631,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, if (REMAIN_ON_CHANNEL_REQUEST == pRemainChanCtx->rem_on_chan_request) { - if (CDF_STATUS_SUCCESS != sme_register_mgmt_frame( + if (QDF_STATUS_SUCCESS != sme_register_mgmt_frame( WLAN_HDD_GET_HAL_CTX(pAdapter), sessionId, (SIR_MAC_MGMT_FRAME << 2) | @@ -644,7 +644,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, } else if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) || (WLAN_HDD_P2P_GO == pAdapter->device_mode)) { /* call sme API to start remain on channel. */ - if (CDF_STATUS_SUCCESS != wlansap_remain_on_channel( + if (QDF_STATUS_SUCCESS != wlansap_remain_on_channel( #ifdef WLAN_FEATURE_MBSSID WLAN_HDD_GET_SAP_CTX_PTR(pAdapter), #else @@ -665,7 +665,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, return -EINVAL; } - if (CDF_STATUS_SUCCESS != wlansap_register_mgmt_frame( + if (QDF_STATUS_SUCCESS != wlansap_register_mgmt_frame( #ifdef WLAN_FEATURE_MBSSID WLAN_HDD_GET_SAP_CTX_PTR(pAdapter), #else @@ -987,7 +987,7 @@ void hdd_remain_chan_ready_handler(hdd_adapter_t *pAdapter, { hdd_cfg80211_state_t *cfgState = NULL; hdd_remain_on_chan_ctx_t *pRemainChanCtx = NULL; - CDF_STATUS status; + QDF_STATUS status; if (NULL == pAdapter) { hddLog(LOGE, FL("pAdapter is NULL")); @@ -1017,7 +1017,7 @@ void hdd_remain_chan_ready_handler(hdd_adapter_t *pAdapter, hdd_remain_on_chan_timer, (pRemainChanCtx->duration + COMPLETE_EVENT_PROPOGATE_TIME)); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(LOGE, "%s: Remain on Channel timer start failed", __func__); } @@ -1430,7 +1430,7 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, remain_on_chan_ctx-> hdd_remain_on_chan_timer, wait); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(LOGE, "%s: Remain on Channel timer start failed", __func__); @@ -1572,7 +1572,7 @@ send_frame: } } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_send_action(WLAN_HDD_GET_HAL_CTX(pAdapter), sessionId, buf, len, extendedWait, noack, current_freq)) { @@ -1582,7 +1582,7 @@ send_frame: } } else if (WLAN_HDD_SOFTAP == pAdapter->device_mode || WLAN_HDD_P2P_GO == pAdapter->device_mode) { - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != #ifdef WLAN_FEATURE_MBSSID wlansap_send_action(WLAN_HDD_GET_SAP_CTX_PTR(pAdapter), #else @@ -1896,7 +1896,7 @@ int hdd_set_p2p_ps(struct net_device *dev, void *msgData) { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tP2pPsConfig NoA; p2p_app_setP2pPs_t *pappNoA = (p2p_app_setP2pPs_t *) msgData; @@ -2096,7 +2096,7 @@ void __hdd_indicate_mgmt_frame(hdd_adapter_t *pAdapter, uint8_t subType = 0; tActionFrmType actionFrmType; hdd_cfg80211_state_t *cfgState = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_remain_on_chan_ctx_t *pRemainChanCtx = NULL; hdd_context_t *pHddCtx; @@ -2270,7 +2270,7 @@ void __hdd_indicate_mgmt_frame(hdd_adapter_t *pAdapter, hdd_remain_on_chan_timer, extend_time); if (status != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog (LOGE, "%s: Remain on Channel timer start failed", diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 6e99ced9bc..68e69c9f55 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -103,7 +103,7 @@ static bool ssr_timer_started; #ifdef WLAN_FEATURE_GTK_OFFLOAD static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) { - CDF_STATUS ret; + QDF_STATUS ret; tSirGtkOffloadParams hddGtkOffloadReqParams; hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); @@ -119,7 +119,7 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) ret = sme_set_gtk_offload(WLAN_HDD_GET_HAL_CTX(pAdapter), &hddGtkOffloadReqParams, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != ret) { + if (QDF_STATUS_SUCCESS != ret) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_set_gtk_offload failed, returned %d", @@ -145,7 +145,7 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) (WLAN_HDD_GET_HAL_CTX(pAdapter), wlan_hdd_cfg80211_update_replay_counter_callback, pAdapter, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != ret) { + if (QDF_STATUS_SUCCESS != ret) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_get_gtk_offload failed, returned %d", @@ -168,7 +168,7 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) (pAdapter), &hddGtkOffloadReqParams, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != ret) { + if (QDF_STATUS_SUCCESS != ret) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to dissable GTK offload, returned %d", @@ -280,7 +280,7 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable) hdd_context_t *pHddCtx; int i = 0; - CDF_STATUS returnStatus; + QDF_STATUS returnStatus; uint32_t count = 0, scope; ENTER(); @@ -394,7 +394,7 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable) /* Configure the Firmware with this */ returnStatus = sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &offLoadRequest); - if (CDF_STATUS_SUCCESS != returnStatus) { + if (QDF_STATUS_SUCCESS != returnStatus) { hdd_err("Failed to enable HostOffload feature with status: %d", returnStatus); } @@ -408,7 +408,7 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable) offLoadRequest.enableOrDisable = SIR_OFFLOAD_DISABLE; offLoadRequest.offloadType = SIR_IPV6_NS_OFFLOAD; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &offLoadRequest)) hdd_err("Failed to disable NS Offload"); @@ -679,10 +679,10 @@ int wlan_hdd_ipv4_changed(struct notifier_block *nb, * @fenable: true : enable ARP offload false : disable arp offload * * Return: - * CDF_STATUS_SUCCESS - on successful operation, - * CDF_STATUS_E_FAILURE - on failure of operation + * QDF_STATUS_SUCCESS - on successful operation, + * QDF_STATUS_E_FAILURE - on failure of operation */ -CDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable) +QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable) { struct in_ifaddr **ifap = NULL; struct in_ifaddr *ifa = NULL; @@ -701,7 +701,7 @@ CDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable) !pHddCtx->ap_arpns_support) { hddLog(LOG1, FL("ARP Offload is not supported in SAP/P2PGO mode")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (fenable) { @@ -749,36 +749,36 @@ CDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable) offLoadRequest.params.hostIpv4Addr[2], offLoadRequest.params.hostIpv4Addr[3]); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &offLoadRequest)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Failed to enable HostOffload feature", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { hddLog(CDF_TRACE_LEVEL_INFO, FL("IP Address is not assigned")); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else { cdf_mem_zero((void *)&offLoadRequest, sizeof(tSirHostOffloadReq)); offLoadRequest.enableOrDisable = SIR_OFFLOAD_DISABLE; offLoadRequest.offloadType = SIR_IPV4_ARP_REPLY_OFFLOAD; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &offLoadRequest)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Failure to disable host " "offload feature", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } @@ -832,7 +832,7 @@ static void hdd_mcbc_filter_modification(hdd_context_t *pHddCtx, */ void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; tpSirWlanSetRxpFilters wlanRxpFilterParam = cdf_mem_malloc(sizeof(tSirWlanSetRxpFilters)); if (NULL == wlanRxpFilterParam) { @@ -857,17 +857,17 @@ void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter) cdf_ret_status = sme_configure_rxp_filter(pHddCtx->hHal, wlanRxpFilterParam); - if (setfilter && (CDF_STATUS_SUCCESS == cdf_ret_status)) + if (setfilter && (QDF_STATUS_SUCCESS == cdf_ret_status)) pHddCtx->hdd_mcastbcast_filter_set = true; hddLog(LOG1, FL("%s to post set/reset filter to lower mac with status %d configuredMcstBcstFilterSetting = %d setMcstBcstFilter = %d"), - (CDF_STATUS_SUCCESS != cdf_ret_status) ? "Failed" : "Success", + (QDF_STATUS_SUCCESS != cdf_ret_status) ? "Failed" : "Success", cdf_ret_status, wlanRxpFilterParam->configuredMcstBcstFilterSetting, wlanRxpFilterParam->setMcstBcstFilter); - if (CDF_STATUS_SUCCESS != cdf_ret_status) + if (QDF_STATUS_SUCCESS != cdf_ret_status) cdf_mem_free(wlanRxpFilterParam); } @@ -1001,7 +1001,7 @@ static void hdd_send_suspend_ind(hdd_context_t *pHddCtx, bool suspended), void *callbackContext) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; hdd_info("%s: send wlan suspend indication", __func__); @@ -1009,7 +1009,7 @@ static void hdd_send_suspend_ind(hdd_context_t *pHddCtx, sme_configure_suspend_ind(pHddCtx->hHal, conn_state_mask, callback, callbackContext); - if (CDF_STATUS_SUCCESS == cdf_ret_status) { + if (QDF_STATUS_SUCCESS == cdf_ret_status) { pHddCtx->hdd_mcastbcast_filter_set = true; } else { hddLog(CDF_TRACE_LEVEL_ERROR, @@ -1027,11 +1027,11 @@ static void hdd_send_suspend_ind(hdd_context_t *pHddCtx, static void hdd_conf_resume_ind(hdd_adapter_t *pAdapter) { hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; cdf_ret_status = sme_configure_resume_req(pHddCtx->hHal, NULL); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: sme_configure_resume_req return failure %d", __func__, cdf_ret_status); @@ -1090,7 +1090,7 @@ hdd_suspend_wlan(void (*callback)(void *callbackContext, bool suspended), { hdd_context_t *pHddCtx; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *pAdapter = NULL; hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; uint32_t conn_state_mask = 0; @@ -1113,7 +1113,7 @@ hdd_suspend_wlan(void (*callback)(void *callbackContext, bool suspended), hdd_update_mcastbcast_filter(pHddCtx); status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; /* stop all TX queues before suspend */ @@ -1149,7 +1149,7 @@ static void hdd_resume_wlan(void) hdd_context_t *pHddCtx; hdd_adapter_t *pAdapter = NULL; hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hddLog(CDF_TRACE_LEVEL_INFO, "%s: WLAN being resumed by OS", __func__); @@ -1172,7 +1172,7 @@ static void hdd_resume_wlan(void) /*loop through all adapters. Concurrency */ status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; /* wake the tx queues */ @@ -1258,12 +1258,12 @@ static void hdd_ssr_timer_start(int msec) * * This function is called by the HIF to shutdown the driver during SSR. * - * Return: CDF_STATUS_SUCCESS if the driver was shut down, + * Return: QDF_STATUS_SUCCESS if the driver was shut down, * or an error status otherwise */ -CDF_STATUS hdd_wlan_shutdown(void) +QDF_STATUS hdd_wlan_shutdown(void) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; v_CONTEXT_t p_cds_context = NULL; hdd_context_t *pHddCtx; p_cds_sched_context cds_sched_context = NULL; @@ -1284,7 +1284,7 @@ CDF_STATUS hdd_wlan_shutdown(void) if (!p_cds_context) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Global CDS context is Null", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Get the HDD context. */ @@ -1292,7 +1292,7 @@ CDF_STATUS hdd_wlan_shutdown(void) if (!pHddCtx) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cds_set_recovery_in_progress(true); @@ -1343,12 +1343,12 @@ CDF_STATUS hdd_wlan_shutdown(void) #endif hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Doing WMA STOP", __func__); - cdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL); + qdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to stop WMA", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); wma_setneedshutdown(p_cds_context); } @@ -1356,19 +1356,19 @@ CDF_STATUS hdd_wlan_shutdown(void) /* Stop SME - Cannot invoke cds_disable as cds_disable relies * on threads being running to process the SYS Stop */ - cdf_status = sme_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = sme_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: Failed to stop sme %d", __func__, cdf_status); + "%s: Failed to stop sme %d", __func__, qdf_status); CDF_ASSERT(0); } hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Doing MAC STOP", __func__); /* Stop MAC (PE and HAL) */ - cdf_status = mac_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = mac_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: Failed to stop mac %d", __func__, cdf_status); + "%s: Failed to stop mac %d", __func__, qdf_status); CDF_ASSERT(0); } @@ -1389,7 +1389,7 @@ CDF_STATUS hdd_wlan_shutdown(void) hddLog(CDF_TRACE_LEVEL_FATAL, "%s: WLAN driver shutdown complete", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1397,15 +1397,15 @@ CDF_STATUS hdd_wlan_shutdown(void) * * This function is called by the HIF to re-initialize the driver after SSR. * - * Return: CDF_STATUS_SUCCESS if the driver was re-initialized, + * Return: QDF_STATUS_SUCCESS if the driver was re-initialized, * or an error status otherwise */ -CDF_STATUS hdd_wlan_re_init(void *hif_sc) +QDF_STATUS hdd_wlan_re_init(void *hif_sc) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; v_CONTEXT_t p_cds_context = NULL; hdd_context_t *pHddCtx = NULL; - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; hdd_adapter_t *pAdapter; int i; @@ -1438,8 +1438,8 @@ CDF_STATUS hdd_wlan_re_init(void *hif_sc) hdd_set_conparam(0); /* Re-open CDS, it is a re-open b'se control transport was never closed. */ - cdf_status = cds_open(); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_open(); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_open failed", __func__); goto err_re_init; } @@ -1452,8 +1452,8 @@ CDF_STATUS hdd_wlan_re_init(void *hif_sc) goto err_cds_close; } - cdf_status = cds_pre_enable(pHddCtx->pcds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_pre_enable(pHddCtx->pcds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hdd_alert("cds_pre_enable failed"); goto err_cds_close; } @@ -1464,16 +1464,16 @@ CDF_STATUS hdd_wlan_re_init(void *hif_sc) * since the SME config operation must access the cfg database. * Set the SME configuration parameters. */ - cdf_status = hdd_set_sme_config(pHddCtx); - if (CDF_STATUS_SUCCESS != cdf_status) { + qdf_status = hdd_set_sme_config(pHddCtx); + if (QDF_STATUS_SUCCESS != qdf_status) { hdd_alert("Failed hdd_set_sme_config"); goto err_cds_close; } ol_txrx_register_pause_cb(wlan_hdd_txrx_pause_cb); - cdf_status = hdd_set_sme_chan_list(pHddCtx); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = hdd_set_sme_chan_list(pHddCtx); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Failed to init channel list", __func__); goto err_cds_close; @@ -1492,7 +1492,7 @@ CDF_STATUS hdd_wlan_re_init(void *hif_sc) (uint8_t *) &pHddCtx->config-> intfMacAddr[0], sizeof(pHddCtx->config->intfMacAddr[0])); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Failed to set MAC Address. " "HALStatus is %08d [x%08x]", __func__, cdf_ret_status, cdf_ret_status); @@ -1501,14 +1501,14 @@ CDF_STATUS hdd_wlan_re_init(void *hif_sc) /* Start CDS which starts up the SME/MAC/HAL modules and everything else Note: Firmware image will be read and downloaded inside cds_enable API */ - cdf_status = cds_enable(p_cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_enable(p_cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_enable failed", __func__); goto err_cds_close; } - cdf_status = hdd_post_cds_enable_config(pHddCtx); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = hdd_post_cds_enable_config(pHddCtx); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: hdd_post_cds_enable_config failed", __func__); goto err_cds_disable; @@ -1628,7 +1628,7 @@ err_cds_close: wiphy_unregister(pHddCtx->wiphy); wiphy_free(pHddCtx->wiphy); - if (!CDF_IS_STATUS_SUCCESS(cds_deinit_policy_mgr())) { + if (!QDF_IS_STATUS_SUCCESS(cds_deinit_policy_mgr())) { hdd_err("Failed to deinit policy manager"); /* Proceed and complete the clean up */ } @@ -1641,7 +1641,7 @@ err_re_init: return -EPERM; success: - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1720,7 +1720,7 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy) hdd_context_t *pHddCtx = wiphy_priv(wiphy); hdd_adapter_t *pAdapter; hdd_adapter_list_node_t *pAdapterNode, *pNext; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; int result; p_cds_sched_context cds_sched_context = get_cds_sched_ctxt(); @@ -1768,7 +1768,7 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy) status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; if ((NULL != pAdapter) && (WLAN_HDD_INFRA_STATION == pAdapter->device_mode)) { @@ -1857,7 +1857,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; hdd_adapter_t *pAdapter; hdd_scaninfo_t *pScanInfo; - CDF_STATUS status; + QDF_STATUS status; int rc; ENTER(); @@ -1876,7 +1876,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, * until CAC is done for a SoftAP which is in started state. */ status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; if (WLAN_HDD_SOFTAP == pAdapter->device_mode) { if (BSS_START == @@ -1911,7 +1911,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, /* Stop ongoing scan on each interface */ status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; pScanInfo = &pAdapter->scan_info; @@ -2077,7 +2077,7 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy, { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; int status; ENTER(); @@ -2105,11 +2105,11 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy, hddLog(LOG1, FL("offload: in cfg80211_set_power_mgmt, calling arp offload")); - cdf_status = hdd_conf_arp_offload(pAdapter, true); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = hdd_conf_arp_offload(pAdapter, true); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOG1, FL("Failed to enable ARPOFFLOAD Feature %d"), - cdf_status); + qdf_status); } } @@ -2204,7 +2204,7 @@ static int __wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy, /* Fall through */ case NL80211_TX_POWER_LIMITED: /* Limit TX power by the mBm parameter */ if (sme_set_max_tx_power(hHal, bssid, selfMac, dbm) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Setting maximum tx power failed")); return -EIO; } diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 5e76a7e001..48ba11ed2c 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -560,9 +560,9 @@ static int wlan_hdd_scan_request_enqueue(hdd_adapter_t *adapter, * @source : returns source of the scan request * @timestamp: scan request timestamp * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS wlan_hdd_scan_request_dequeue(hdd_context_t *hdd_ctx, +QDF_STATUS wlan_hdd_scan_request_dequeue(hdd_context_t *hdd_ctx, uint32_t scan_id, struct cfg80211_scan_request **req, uint8_t *source, uint32_t *timestamp) { @@ -633,7 +633,7 @@ CDF_STATUS wlan_hdd_scan_request_dequeue(hdd_context_t *hdd_ctx, * Return: 0 for success, non zero for failure */ -static CDF_STATUS +static QDF_STATUS hdd_scan_request_callback(tHalHandle halHandle, void *pContext, uint8_t sessionId, uint32_t scanId, eCsrScanStatus status) @@ -663,7 +663,7 @@ hdd_scan_request_callback(tHalHandle halHandle, void *pContext, if (pAdapter->dev != dev) { hddLog(LOGW, "%s: device mismatch %p vs %p", __func__, pAdapter->dev, dev); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } wlan_hdd_scan_request_dequeue(hddctx, scanId, &req, &source, @@ -687,7 +687,7 @@ hdd_scan_request_callback(tHalHandle halHandle, void *pContext, wireless_send_event(dev, we_event, &wrqu, msg); EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -710,7 +710,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); hdd_wext_state_t *pwextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); tCsrScanRequest scanRequest; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct iw_scan_req *scanReq = (struct iw_scan_req *)extra; hdd_adapter_t *con_sap_adapter; uint16_t con_dfs_ch; @@ -832,7 +832,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, status = sme_scan_request((WLAN_HDD_GET_CTX(pAdapter))->hHal, pAdapter->sessionId, &scanRequest, &hdd_scan_request_callback, dev); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s:sme_scan_request fail %d!!!", __func__, status); goto error; @@ -891,7 +891,7 @@ static int __iw_get_scan(struct net_device *dev, hdd_context_t *hdd_ctx; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); tCsrScanResultInfo *pScanResult; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_scan_info_t scanInfo; tScanResultHandle pResult; int i = 0; @@ -1089,7 +1089,7 @@ nla_put_failure: * * Return: CDF status */ -static CDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle, +static QDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle, void *pContext, uint8_t sessionId, uint32_t scanId, @@ -1108,7 +1108,7 @@ static CDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle, ret = wlan_hdd_validate_context(hddctx); if (0 != ret) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; hddLog(CDF_TRACE_LEVEL_INFO, "%s called with hal = %p, pContext = %p, ID = %d, status = %d", @@ -1121,7 +1121,7 @@ static CDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle, goto allow_suspend; } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_scan_request_dequeue(hddctx, scanId, &req, &source, &scan_time)) { hdd_err("Dequeue of scan request failed ID: %d", scanId); @@ -1554,9 +1554,9 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, pAdapter->sessionId, &scan_req, &hdd_cfg80211_scan_done_callback, dev); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("sme_scan_request returned error %d"), status); - if (CDF_STATUS_E_RESOURCES == status) { + if (QDF_STATUS_E_RESOURCES == status) { hddLog(LOGE, FL("HO is in progress.So defer the scan by informing busy")); status = -EBUSY; @@ -1985,7 +1985,7 @@ hdd_sched_scan_callback(void *callbackContext, * * Return: Success if PNO is allowed, Failure otherwise. */ -static CDF_STATUS wlan_hdd_is_pno_allowed(hdd_adapter_t *adapter) +static QDF_STATUS wlan_hdd_is_pno_allowed(hdd_adapter_t *adapter) { hddLog(LOG1, FL("dev_mode=%d, conn_state=%d, session ID=%d"), @@ -1995,9 +1995,9 @@ static CDF_STATUS wlan_hdd_is_pno_allowed(hdd_adapter_t *adapter) if ((adapter->device_mode == WLAN_HDD_INFRA_STATION) && (eConnectionState_NotConnected == adapter->sessionCtx.station.conn_info.connState)) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; else - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } @@ -2023,7 +2023,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, u8 valid_ch[WNI_CFG_VALID_CHANNEL_LIST_LEN] = { 0 }; u8 channels_allowed[WNI_CFG_VALID_CHANNEL_LIST_LEN] = { 0 }; uint32_t num_channels_allowed = WNI_CFG_VALID_CHANNEL_LIST_LEN; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; int ret = 0; hdd_scaninfo_t *pScanInfo = &pAdapter->scan_info; struct hdd_config *config = NULL; @@ -2079,7 +2079,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, } } - if (CDF_STATUS_E_FAILURE == wlan_hdd_is_pno_allowed(pAdapter)) { + if (QDF_STATUS_E_FAILURE == wlan_hdd_is_pno_allowed(pAdapter)) { hddLog(LOGE, FL("pno is not allowed")); return -ENOTSUPP; } @@ -2251,7 +2251,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, pAdapter->sessionId, hdd_sched_scan_callback, pAdapter); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("Failed to enable PNO")); ret = -EINVAL; goto error; @@ -2297,7 +2297,7 @@ int wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, static int __wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx; tHalHandle hHal; @@ -2361,7 +2361,7 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy, status = sme_set_preferred_network_list(hHal, pPnoRequest, pAdapter->sessionId, NULL, pAdapter); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("Failed to disabled PNO")); ret = -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index 8abb284db8..1dddcd699c 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -208,7 +208,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) */ STAId = pHddApCtx->uBCStaId; } else { - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_softap_get_sta_id(pAdapter, pDestMacAddress, &STAId)) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, @@ -391,12 +391,12 @@ void hdd_softap_tx_timeout(struct net_device *dev) * @hdd_softap_init_tx_rx() - Initialize Tx/RX module * @pAdapter: pointer to adapter context * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_softap_init_tx_rx(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_softap_init_tx_rx(hdd_adapter_t *pAdapter) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t STAId = 0; @@ -416,12 +416,12 @@ CDF_STATUS hdd_softap_init_tx_rx(hdd_adapter_t *pAdapter) * @hdd_softap_deinit_tx_rx() - Deinitialize Tx/RX module * @pAdapter: pointer to adapter context * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_softap_deinit_tx_rx(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_softap_deinit_tx_rx(hdd_adapter_t *pAdapter) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; return status; } @@ -432,10 +432,10 @@ CDF_STATUS hdd_softap_deinit_tx_rx(hdd_adapter_t *pAdapter) * @STAId: Station ID to initialize * @pmacAddrSTA: pointer to the MAC address of the station * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, +QDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, struct cdf_mac_addr *pmacAddrSTA) { spin_lock_bh(&pAdapter->staInfo_lock); @@ -443,7 +443,7 @@ CDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Reinit station %d", __func__, STAId); spin_unlock_bh(&pAdapter->staInfo_lock); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_zero(&pAdapter->aStaInfo[STAId], sizeof(hdd_station_info_t)); @@ -453,7 +453,7 @@ CDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, cdf_copy_macaddr(&pAdapter->aStaInfo[STAId].macAddrSTA, pmacAddrSTA); spin_unlock_bh(&pAdapter->staInfo_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -461,12 +461,12 @@ CDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, * @pAdapter: pointer to adapter context * @STAId: Station ID to deinitialize * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId) +QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_hostapd_state_t *pHostapdState; pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pAdapter); @@ -477,7 +477,7 @@ CDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId) spin_unlock_bh(&pAdapter->staInfo_lock); CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Deinit station not inited %d", __func__, STAId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pAdapter->aStaInfo[STAId].isUsed = false; @@ -497,10 +497,10 @@ CDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId) * the HDD when one or more packets were received for a registered * STA. * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, +QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) { hdd_adapter_t *pAdapter = NULL; @@ -516,14 +516,14 @@ CDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, if ((NULL == cds_context) || (NULL == rxBuf)) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); if (NULL == pHddCtx) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: HDD context is Null", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pAdapter = pHddCtx->sta_to_adapter[staId]; @@ -531,7 +531,7 @@ CDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, hddLog(LOGE, FL("invalid adapter %p or adapter has invalid magic"), pAdapter); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* walk the chain until all are processed */ @@ -545,7 +545,7 @@ CDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: ERROR!!Invalid netdevice", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cpu_index = wlan_hdd_get_cpu(); ++pAdapter->hdd_stats.hddTxRxStats.rxPackets[cpu_index]; @@ -592,7 +592,7 @@ CDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, pAdapter->dev->last_rx = jiffies; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -600,23 +600,23 @@ CDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, * @pAdapter: pointer to adapter context * @staId: Station ID to deregister * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) +QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; hdd_context_t *pHddCtx; if (NULL == pAdapter) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pAdapter magic", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } pHddCtx = (hdd_context_t *) (pAdapter->pHddCtx); @@ -624,11 +624,11 @@ CDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) * structures. This helps to block RX frames from other * station to this station. */ - cdf_status = ol_txrx_clear_peer(staId); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = ol_txrx_clear_peer(staId); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "ol_txrx_clear_peer() failed to for staID %d. " - "Status= %d [0x%08X]", staId, cdf_status, cdf_status); + "Status= %d [0x%08X]", staId, qdf_status, qdf_status); } if (pAdapter->aStaInfo[staId].isUsed) { @@ -639,7 +639,7 @@ CDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) } pHddCtx->sta_to_adapter[staId] = NULL; - return cdf_status; + return qdf_status; } /** @@ -653,9 +653,9 @@ CDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) * @pPeerMacAddress: station MAC address * @fWmmEnabled: is WMM enabled for this STA? * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, bool fAuthRequired, bool fPrivacyBit, uint8_t staId, @@ -664,7 +664,7 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, struct cdf_mac_addr *pPeerMacAddress, bool fWmmEnabled) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; struct ol_txrx_desc_type staDesc = { 0 }; hdd_context_t *pHddCtx = pAdapter->pHddCtx; @@ -683,7 +683,7 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, /*Save the pAdapter Pointer for this staId */ pHddCtx->sta_to_adapter[staId] = pAdapter; - cdf_status = + qdf_status = hdd_softap_init_tx_rx_sta(pAdapter, staId, pPeerMacAddress); @@ -693,14 +693,14 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, staDesc.is_qos_enabled); - cdf_status = + qdf_status = ol_txrx_register_peer(hdd_softap_rx_packet_cbk, &staDesc); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "SOFTAP ol_txrx_register_peer() failed to register. Status= %d [0x%08X]", - cdf_status, cdf_status); - return cdf_status; + qdf_status, qdf_status); + return qdf_status; } /* if ( WPA ), tell TL to go to 'connected' and after keys come to the @@ -720,7 +720,7 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, /* Connections that do not need Upper layer auth, * transition TL directly to 'Authenticated' state. */ - cdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, + qdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, ol_txrx_peer_state_auth, false); pAdapter->aStaInfo[staId].tlSTAState = ol_txrx_peer_state_auth; @@ -731,7 +731,7 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, "ULA auth StaId= %d. Changing TL state to CONNECTED at Join time", pAdapter->aStaInfo[staId].ucSTAId); - cdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, + qdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, ol_txrx_peer_state_conn, false); pAdapter->aStaInfo[staId].tlSTAState = ol_txrx_peer_state_conn; @@ -745,7 +745,7 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, WLAN_START_ALL_NETIF_QUEUE_N_CARRIER, WLAN_CONTROL_PATH); - return cdf_status; + return qdf_status; } /** @@ -753,12 +753,12 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, * @pAdapter: pointer to adapter context * @fPrivacyBit: should 802.11 privacy bit be set? * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter, bool fPrivacyBit) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); struct cdf_mac_addr broadcastMacAddr = CDF_MAC_ADDR_BROADCAST_INITIALIZER; @@ -772,21 +772,21 @@ CDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter, #else pHddCtx->sta_to_adapter[WLAN_RX_SAP_SELF_STA_ID] = pAdapter; #endif - cdf_status = + qdf_status = hdd_softap_register_sta(pAdapter, false, fPrivacyBit, (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))-> uBCStaId, 0, 1, &broadcastMacAddr, 0); - return cdf_status; + return qdf_status; } /** * hdd_softap_deregister_bc_sta() - Deregister the SoftAP broadcast STA * @pAdapter: pointer to adapter context * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter) { return hdd_softap_deregister_sta(pAdapter, (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))-> @@ -797,11 +797,11 @@ CDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter) * hdd_softap_stop_bss() - Stop the BSS * @pAdapter: pointer to adapter context * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; uint8_t staId = 0; hdd_context_t *pHddCtx; pHddCtx = WLAN_HDD_GET_CTX(pAdapter); @@ -813,12 +813,12 @@ CDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Loading_unloading in Progress, state: 0x%x. Ignore!!!", __func__, cds_get_driver_state()); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } - cdf_status = hdd_softap_deregister_bc_sta(pAdapter); + qdf_status = hdd_softap_deregister_bc_sta(pAdapter); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Failed to deregister BC sta Id %d", __func__, (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->uBCStaId); @@ -827,8 +827,8 @@ CDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) for (staId = 0; staId < WLAN_MAX_STA_COUNT; staId++) { /* This excludes BC sta as it is already deregistered */ if (pAdapter->aStaInfo[staId].isUsed) { - cdf_status = hdd_softap_deregister_sta(pAdapter, staId); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = hdd_softap_deregister_sta(pAdapter, staId); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Failed to deregister sta Id %d", @@ -836,7 +836,7 @@ CDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) } } } - return cdf_status; + return qdf_status; } /** @@ -845,24 +845,24 @@ CDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) * @pDestMacAddress: MAC address of the station * @state: new state of the station * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, struct cdf_mac_addr *pDestMacAddress, enum ol_txrx_peer_state state) { uint8_t ucSTAId = WLAN_MAX_STA_COUNT; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "%s: enter", __func__); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_softap_get_sta_id(pAdapter, pDestMacAddress, &ucSTAId)) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Failed to find right station", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (false == @@ -871,15 +871,15 @@ CDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Station MAC address does not matching", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - cdf_status = + qdf_status = hdd_change_peer_state(pAdapter, ucSTAId, state, false); CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "%s: change station to state %d succeed", __func__, state); - if (CDF_STATUS_SUCCESS == cdf_status) { + if (QDF_STATUS_SUCCESS == qdf_status) { pAdapter->aStaInfo[ucSTAId].tlSTAState = ol_txrx_peer_state_auth; } @@ -887,7 +887,7 @@ CDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "%s exit", __func__); - return cdf_status; + return qdf_status; } /* @@ -896,11 +896,11 @@ CDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, * @pDestMacAddress: MAC address of the destination * @staId: Station ID associated with the MAC address * - * Return: CDF_STATUS_SUCCESS if a match was found, in which case - * staId is populated, CDF_STATUS_E_FAILURE if a match is + * Return: QDF_STATUS_SUCCESS if a match was found, in which case + * staId is populated, QDF_STATUS_E_FAILURE if a match is * not found */ -CDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, struct cdf_mac_addr *pMacAddress, uint8_t *staId) { @@ -911,9 +911,9 @@ CDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, (&pAdapter->aStaInfo[i].macAddrSTA, pMacAddress, CDF_MAC_ADDR_SIZE) && pAdapter->aStaInfo[i].isUsed) { *staId = i; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index 2f9a15f8cf..af723a434a 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -1193,7 +1193,7 @@ __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy, LinkLayerStatsSetReq.mpduSizeThreshold, LinkLayerStatsSetReq.aggressiveStatisticsGathering); - if (CDF_STATUS_SUCCESS != sme_ll_stats_set_req(pHddCtx->hHal, + if (QDF_STATUS_SUCCESS != sme_ll_stats_set_req(pHddCtx->hHal, &LinkLayerStatsSetReq)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s:" "sme_ll_stats_set_req Failed", __func__); @@ -1323,7 +1323,7 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy, INIT_COMPLETION(context->response_event); spin_unlock(&context->context_lock); - if (CDF_STATUS_SUCCESS != sme_ll_stats_get_req(pHddCtx->hHal, + if (QDF_STATUS_SUCCESS != sme_ll_stats_get_req(pHddCtx->hHal, &LinkLayerStatsGetReq)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s:" "sme_ll_stats_get_req Failed", __func__); @@ -1454,7 +1454,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy, LinkLayerStatsClearReq.statsClearReqMask, LinkLayerStatsClearReq.stopReq); - if (CDF_STATUS_SUCCESS == sme_ll_stats_clear_req(pHddCtx->hHal, + if (QDF_STATUS_SUCCESS == sme_ll_stats_clear_req(pHddCtx->hHal, &LinkLayerStatsClearReq)) { temp_skbuff = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, 2 * @@ -1537,7 +1537,7 @@ static int __wlan_hdd_cfg80211_stats_ext_request(struct wiphy *wiphy, struct net_device *dev = wdev->netdev; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); int ret_val; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx = wiphy_priv(wiphy); ENTER(); @@ -1556,7 +1556,7 @@ static int __wlan_hdd_cfg80211_stats_ext_request(struct wiphy *wiphy, status = sme_stats_ext_request(pAdapter->sessionId, &stats_ext_req); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) ret_val = -EINVAL; return ret_val; diff --git a/core/hdd/src/wlan_hdd_subnet_detect.c b/core/hdd/src/wlan_hdd_subnet_detect.c index 44d69b5c24..96d0377a5a 100644 --- a/core/hdd/src/wlan_hdd_subnet_detect.c +++ b/core/hdd/src/wlan_hdd_subnet_detect.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -78,7 +78,7 @@ static int __wlan_hdd_cfg80211_set_gateway_params(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_GW_PARAM_CONFIG_MAX + 1]; struct gateway_param_update_req req = { 0 }; int ret; - CDF_STATUS status; + QDF_STATUS status; ENTER(); @@ -156,7 +156,7 @@ static int __wlan_hdd_cfg80211_set_gateway_params(struct wiphy *wiphy, hdd_info("ipv6 addr: %pI6c", req.ipv6_addr); status = sme_gateway_param_update(hdd_ctx->hHal, &req); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_err("sme_gateway_param_update failed(err=%d)", status); ret = -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index 8e48da640e..cd6d9f7e7e 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -234,11 +234,11 @@ static uint32_t wlan_hdd_tdls_discovery_sent_cnt(hdd_context_t *pHddCtx) hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; hdd_adapter_t *pAdapter = NULL; tdlsCtx_t *pHddTdlsCtx = NULL; - CDF_STATUS status = 0; + QDF_STATUS status = 0; uint32_t count = 0; status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter); @@ -535,7 +535,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) int i; uint8_t staIdx; tdlsInfo_t *tInfo; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; if (NULL == pHddCtx) return -EINVAL; @@ -723,7 +723,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) dump_tdls_state_param_setting(tInfo); cdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tInfo, true); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { cdf_mem_free(tInfo); cdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); cdf_mem_free(pHddTdlsCtx); @@ -744,7 +744,7 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter) tdlsCtx_t *pHddTdlsCtx; hdd_context_t *pHddCtx; tdlsInfo_t *tInfo; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if (!pHddCtx) { @@ -826,7 +826,7 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter) cdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tInfo, false); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { cdf_mem_free(tInfo); } } else { @@ -1530,7 +1530,7 @@ void wlan_hdd_tdls_set_mode(hdd_context_t *pHddCtx, eTDLSSupportMode tdls_mode, bool bUpdateLast) { hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *pAdapter; tdlsCtx_t *pHddTdlsCtx; @@ -1551,7 +1551,7 @@ void wlan_hdd_tdls_set_mode(hdd_context_t *pHddCtx, status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter); if (NULL != pHddTdlsCtx) { @@ -1591,7 +1591,7 @@ int wlan_hdd_tdls_set_params(struct net_device *dev, tdlsCtx_t *pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter); eTDLSSupportMode req_tdls_mode; tdlsInfo_t *tdlsParams; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; if (NULL == pHddTdlsCtx) { hddLog(LOGE, FL("TDLS not enabled!")); @@ -1666,7 +1666,7 @@ int wlan_hdd_tdls_set_params(struct net_device *dev, dump_tdls_state_param_setting(tdlsParams); cdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tdlsParams, true); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { cdf_mem_free(tdlsParams); return -EINVAL; } @@ -1697,7 +1697,7 @@ void wlan_hdd_update_tdls_info(hdd_adapter_t *adapter, bool tdls_prohibited, hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); tdlsCtx_t *hdd_tdls_ctx = WLAN_HDD_GET_TDLS_CTX_PTR(adapter); tdlsInfo_t *tdls_param; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; if (!hdd_tdls_ctx) { /* may be TDLS is not applicable for this adapter */ @@ -1777,7 +1777,7 @@ void wlan_hdd_update_tdls_info(hdd_adapter_t *adapter, bool tdls_prohibited, cdf_ret_status = sme_update_fw_tdls_state(hdd_ctx->hHal, tdls_param, true); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { cdf_mem_free(tdls_param); return; } @@ -1855,7 +1855,7 @@ int wlan_hdd_tdls_update_peer_mac(hdd_adapter_t *adapter, const uint8_t *mac, uint32_t peer_state) { tSmeTdlsPeerStateParams sme_tdls_peer_state_params = {0}; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); sme_tdls_peer_state_params.vdevId = adapter->sessionId; @@ -1864,7 +1864,7 @@ int wlan_hdd_tdls_update_peer_mac(hdd_adapter_t *adapter, const uint8_t *mac, sme_tdls_peer_state_params.peerState = peer_state; status = sme_update_tdls_peer_state(hdd_ctx->hHal, &sme_tdls_peer_state_params); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("sme_UpdateTdlsPeerState failed for "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(mac)); return -EPERM; @@ -1971,12 +1971,12 @@ hddTdlsPeer_t *wlan_hdd_tdls_find_all_peer(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter = NULL; tdlsCtx_t *pHddTdlsCtx = NULL; hddTdlsPeer_t *curr_peer = NULL; - CDF_STATUS status = 0; + QDF_STATUS status = 0; mutex_lock(&pHddCtx->tdls_lock); status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter); @@ -2366,12 +2366,12 @@ hddTdlsPeer_t *wlan_hdd_tdls_is_progress(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter = NULL; tdlsCtx_t *pHddTdlsCtx = NULL; hddTdlsPeer_t *curr_peer = NULL; - CDF_STATUS status = 0; + QDF_STATUS status = 0; mutex_lock(&pHddCtx->tdls_lock); status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter); @@ -3055,7 +3055,7 @@ __wlan_hdd_cfg80211_exttdls_get_status(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TDLS_GET_STATUS_MAX + 1]; - CDF_STATUS ret; + QDF_STATUS ret; uint32_t state; int32_t reason; uint32_t global_operating_class = 0; @@ -3237,7 +3237,7 @@ __wlan_hdd_cfg80211_exttdls_enable(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAX + 1]; - CDF_STATUS status; + QDF_STATUS status; tdls_req_params_t pReqMsg = { 0 }; int ret; @@ -3360,7 +3360,7 @@ static int __wlan_hdd_cfg80211_exttdls_disable(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TDLS_DISABLE_MAX + 1]; - CDF_STATUS status; + QDF_STATUS status; if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3429,7 +3429,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = wiphy_priv(wiphy); - CDF_STATUS status; + QDF_STATUS status; hddTdlsPeer_t *pTdlsPeer; uint16_t numCurrTdlsPeers; unsigned long rc; @@ -3588,7 +3588,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, return -EPERM; } - if (CDF_STATUS_SUCCESS != pAdapter->tdlsAddStaStatus) { + if (QDF_STATUS_SUCCESS != pAdapter->tdlsAddStaStatus) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Add Station is unsuccessful", __func__); return -EPERM; @@ -3671,7 +3671,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, hdd_context_t *pHddCtx = wiphy_priv(wiphy); hdd_station_ctx_t *hdd_sta_ctx; u8 peerMac[CDF_MAC_ADDR_SIZE]; - CDF_STATUS status; + QDF_STATUS status; int max_sta_failed = 0; int responder; unsigned long rc; @@ -3859,7 +3859,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, peer_capability, (uint8_t *) buf, len, !responder); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_send_tdls_mgmt_frame failed!", __func__); pAdapter->mgmtTxCompletionStatus = false; @@ -4157,7 +4157,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, hdd_context_t *pHddCtx = wiphy_priv(wiphy); int status; tSmeTdlsPeerStateParams smeTdlsPeerStateParams; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; hddTdlsPeer_t *pTdlsPeer; ENTER(); @@ -4194,7 +4194,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, switch (oper) { case NL80211_TDLS_ENABLE_LINK: { - CDF_STATUS status; + QDF_STATUS status; unsigned long rc; tCsrTdlsLinkEstablishParams tdlsLinkEstablishParams; @@ -4269,7 +4269,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, pTdlsPeer->staId, pTdlsPeer-> signature); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { uint8_t i; cdf_mem_zero(&smeTdlsPeerStateParams, @@ -4388,7 +4388,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, sme_update_tdls_peer_state(pHddCtx-> hHal, &smeTdlsPeerStateParams); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cdf_ret_status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, @@ -4741,7 +4741,7 @@ int hdd_set_tdls_offchannelmode(hdd_adapter_t *adapter, int offchanmode) hdd_station_ctx_t *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); sme_tdls_chan_switch_params chan_switch_params; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (offchanmode < ENABLE_CHANSWITCH || offchanmode > DISABLE_CHANSWITCH) { @@ -4834,7 +4834,7 @@ int hdd_set_tdls_offchannelmode(hdd_adapter_t *adapter, int offchanmode) status = sme_send_tdls_chan_switch_req(WLAN_HDD_GET_HAL_CTX(adapter), &chan_switch_params); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hdd_log(LOG1, FL("Failed to send channel switch request to sme")); return -EINVAL; diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 65e6204eba..1aec90ab67 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -292,7 +292,7 @@ static bool wlan_hdd_is_eapol_or_wai(struct sk_buff *skb) */ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { - CDF_STATUS status; + QDF_STATUS status; sme_ac_enum_type ac; sme_QosWmmUpType up; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); @@ -325,7 +325,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) struct cdf_mac_addr *pDestMacAddress = (struct cdf_mac_addr *) skb->data; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_ibss_get_sta_id(&pAdapter->sessionCtx.station, pDestMacAddress, &STAId)) STAId = HDD_WLAN_INVALID_STA_ID; @@ -522,10 +522,10 @@ drop_pkt: * @pMacAddress: pointer to Peer Mac address * @staID: pointer to returned Station Index * - * Return: CDF_STATUS_SUCCESS/CDF_STATUS_E_FAILURE + * Return: QDF_STATUS_SUCCESS/QDF_STATUS_E_FAILURE */ -CDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, +QDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, struct cdf_mac_addr *pMacAddress, uint8_t *staId) { uint8_t idx; @@ -534,11 +534,11 @@ CDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, if (cdf_mem_compare(&pHddStaCtx->conn_info.peerMacAddress[idx], pMacAddress, CDF_MAC_ADDR_SIZE)) { *staId = pHddStaCtx->conn_info.staId[idx]; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -601,18 +601,18 @@ void hdd_tx_timeout(struct net_device *dev) * @hdd_init_tx_rx() - Initialize Tx/RX module * @pAdapter: pointer to adapter context * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pAdapter) { CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, FL("pAdapter is NULL")); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } return status; @@ -622,18 +622,18 @@ CDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter) * @hdd_deinit_tx_rx() - Deinitialize Tx/RX module * @pAdapter: pointer to adapter context * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pAdapter) { CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, FL("pAdapter is NULL")); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } return status; @@ -649,10 +649,10 @@ CDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter) * the HDD when one or more packets were received for a registered * STA. * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) +QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) { hdd_adapter_t *pAdapter = NULL; hdd_context_t *pHddCtx = NULL; @@ -668,14 +668,14 @@ CDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) if ((NULL == cds_context) || (NULL == rxBuf)) { CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); if (NULL == pHddCtx) { CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, "%s: HDD context is Null", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pAdapter = pHddCtx->sta_to_adapter[staId]; @@ -683,7 +683,7 @@ CDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) hddLog(LOGE, FL("invalid adapter %p or adapter has invalid magic"), pAdapter); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cpu_index = wlan_hdd_get_cpu(); @@ -693,7 +693,7 @@ CDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL, "Magic cookie(%x) for adapter sanity verification is invalid", pAdapter->magic); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); @@ -707,7 +707,7 @@ CDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) * it to stack */ cdf_nbuf_free(skb); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } wlan_hdd_log_eapol(skb, WIFI_EVENT_DRIVER_EAPOL_FRAME_RECEIVED); @@ -764,7 +764,7 @@ CDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) pAdapter->dev->last_rx = jiffies; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_WLAN_DIAG_SUPPORT diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 24e33289ff..ecb1fcfaf5 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -799,7 +799,7 @@ int hdd_wlan_get_rts_threshold(hdd_adapter_t *pAdapter, union iwreq_data *wrqu) if (0 != ret) return ret; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_cfg_get_int(hHal, WNI_CFG_RTS_THRESHOLD, &threshold)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL @@ -847,7 +847,7 @@ int hdd_wlan_get_frag_threshold(hdd_adapter_t *pAdapter, return status; if (sme_cfg_get_int(hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, &threshold) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_FRAGMENTATION_THRESHOLD")); @@ -1088,27 +1088,27 @@ static void hdd_get_snr_cb(int8_t snr, uint32_t staId, void *pContext) * @pAdapter: adapter upon which the measurement is requested * @rssi_value: pointer to where the RSSI should be returned * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) +QDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) { struct statsContext context; hdd_context_t *pHddCtx; hdd_station_ctx_t *pHddStaCtx; - CDF_STATUS hstatus; + QDF_STATUS hstatus; unsigned long rc; if (NULL == pAdapter) { hddLog(CDF_TRACE_LEVEL_WARN, "%s: Invalid context, pAdapter", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (cds_is_driver_recovering()) { hdd_err("Recovery in Progress. State: 0x%x Ignore!!!", cds_get_driver_state()); /* return a cached value */ *rssi_value = pAdapter->rssi; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } pHddCtx = WLAN_HDD_GET_CTX(pAdapter); @@ -1117,13 +1117,13 @@ CDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) { hdd_err("Not associated!, return last connected AP rssi!"); *rssi_value = pAdapter->rssi; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (pHddStaCtx->hdd_ReassocScenario) { hdd_info("Roaming in progress, return cached RSSI"); *rssi_value = pAdapter->rssi; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } init_completion(&context.completion); @@ -1134,7 +1134,7 @@ CDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) pHddStaCtx->conn_info.staId[0], pHddStaCtx->conn_info.bssId, pAdapter->rssi, &context, pHddCtx->pcds_context); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve RSSI", __func__); /* we'll returned a cached value below */ @@ -1169,7 +1169,7 @@ CDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) *rssi_value = pAdapter->rssi; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1177,14 +1177,14 @@ CDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) * @pAdapter: adapter upon which the measurement is requested * @snr: pointer to where the SNR should be returned * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr) +QDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr) { struct statsContext context; hdd_context_t *pHddCtx; hdd_station_ctx_t *pHddStaCtx; - CDF_STATUS hstatus; + QDF_STATUS hstatus; unsigned long rc; int valid; @@ -1193,14 +1193,14 @@ CDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr) if (NULL == pAdapter) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Invalid context, pAdapter", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pHddCtx = WLAN_HDD_GET_CTX(pAdapter); valid = wlan_hdd_validate_context(pHddCtx); if (0 != valid) - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); @@ -1211,7 +1211,7 @@ CDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr) hstatus = sme_get_snr(pHddCtx->hHal, hdd_get_snr_cb, pHddStaCtx->conn_info.staId[0], pHddStaCtx->conn_info.bssId, &context); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve RSSI", __func__); /* we'll returned a cached value below */ @@ -1246,7 +1246,7 @@ CDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr) *snr = pAdapter->snr; EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1326,25 +1326,25 @@ hdd_get_link_speed_cb(tSirLinkSpeedInfo *pLinkSpeed, void *pContext) * This function will send a query to SME for the linkspeed of the * given peer, and then wait for the callback to be invoked. * - * Return: CDF_STATUS_SUCCESS if linkspeed data is available, + * Return: QDF_STATUS_SUCCESS if linkspeed data is available, * otherwise a CDF_STATUS_E_* error. */ -CDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, +QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, struct cdf_mac_addr macAddress) { - CDF_STATUS status; + QDF_STATUS status; unsigned long rc; struct linkspeedContext context; tSirLinkSpeedInfo *linkspeed_req; if (NULL == pAdapter) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } linkspeed_req = cdf_mem_malloc(sizeof(*linkspeed_req)); if (NULL == linkspeed_req) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } init_completion(&context.completion); context.pAdapter = pAdapter; @@ -1354,7 +1354,7 @@ CDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, status = sme_get_link_speed(WLAN_HDD_GET_HAL_CTX(pAdapter), linkspeed_req, &context, hdd_get_link_speed_cb); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve statistics for link speed", __func__); @@ -1386,7 +1386,7 @@ CDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, spin_lock(&hdd_context_lock); context.magic = 0; spin_unlock(&hdd_context_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1418,13 +1418,13 @@ int wlan_hdd_get_link_speed(hdd_adapter_t *sta_adapter, uint32_t *link_speed) /* we are not connected so we don't have a classAstats */ *link_speed = 0; } else { - CDF_STATUS status; + QDF_STATUS status; struct cdf_mac_addr bssid; cdf_copy_macaddr(&bssid, &hdd_stactx->conn_info.bssId); status = wlan_hdd_get_linkspeed_for_peermac(sta_adapter, bssid); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("Unable to retrieve SME linkspeed")); return -EINVAL; } @@ -1772,14 +1772,14 @@ static int __iw_set_mode(struct net_device *dev, if (hdd_conn_get_connected_bss_type (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter), &connectedBssType) || (eCSR_BSS_TYPE_START_IBSS == LastBSSType)) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; /* need to issue a disconnect to CSR. */ INIT_COMPLETION(pAdapter->disconnect_comp_var); - cdf_status = + qdf_status = sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, eCSR_DISCONNECT_REASON_IBSS_LEAVE); - if (CDF_STATUS_SUCCESS == cdf_status) { + if (QDF_STATUS_SUCCESS == qdf_status) { unsigned long rc; rc = wait_for_completion_timeout(&pAdapter-> disconnect_comp_var, @@ -1961,7 +1961,7 @@ static int __iw_set_freq(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_str(hHal, WNI_CFG_VALID_CHANNEL_LIST, validChan, &numChans) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_VALID_CHANNEL_LIST")); return -EIO; @@ -2050,7 +2050,7 @@ static int __iw_get_freq(struct net_device *dev, struct iw_request_info *info, if (pHddStaCtx->conn_info.connState == eConnectionState_Associated) { if (sme_get_operation_channel(hHal, &channel, pAdapter->sessionId) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("failed to get operating channel %u"), pAdapter->sessionId); @@ -2181,7 +2181,7 @@ static int __iw_set_tx_power(struct net_device *dev, return ret; if (sme_cfg_set_int(hHal, WNI_CFG_CURRENT_TX_POWER_LEVEL, - wrqu->txpower.value) != CDF_STATUS_SUCCESS) { + wrqu->txpower.value) != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_CURRENT_TX_POWER_LEVEL")); return -EIO; @@ -2227,9 +2227,8 @@ static int __iw_get_bitrate(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_wext_state_t *pWextState; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); @@ -2266,7 +2265,7 @@ static int __iw_get_bitrate(struct net_device *dev, pHddStaCtx->conn_info.staId[0], pAdapter, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve statistics", __func__); return status; @@ -2282,7 +2281,7 @@ static int __iw_get_bitrate(struct net_device *dev, hddLog(CDF_TRACE_LEVEL_ERROR, "%s: SME timeout while retrieving statistics", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wrqu->bitrate.value = @@ -2291,7 +2290,7 @@ static int __iw_get_bitrate(struct net_device *dev, EXIT(); - return cdf_status; + return qdf_status; } /** @@ -2360,17 +2359,17 @@ static int __iw_set_bitrate(struct net_device *dev, valid_rate = true; } else if (sme_cfg_get_int(WLAN_HDD_GET_HAL_CTX(pAdapter), WNI_CFG_DOT11_MODE, - &active_phy_mode) == CDF_STATUS_SUCCESS) { + &active_phy_mode) == QDF_STATUS_SUCCESS) { if (active_phy_mode == WNI_CFG_DOT11_MODE_11A || active_phy_mode == WNI_CFG_DOT11_MODE_11G || active_phy_mode == WNI_CFG_DOT11_MODE_11B) { if ((sme_cfg_get_str(WLAN_HDD_GET_HAL_CTX(pAdapter), WNI_CFG_SUPPORTED_RATES_11A, supp_rates, - &a_len) == CDF_STATUS_SUCCESS) + &a_len) == QDF_STATUS_SUCCESS) && (sme_cfg_get_str(WLAN_HDD_GET_HAL_CTX(pAdapter), WNI_CFG_SUPPORTED_RATES_11B, supp_rates, - &b_len) == CDF_STATUS_SUCCESS)) { + &b_len) == QDF_STATUS_SUCCESS)) { for (i = 0; i < (b_len + a_len); ++i) { /* supported rates returned is double * the actual rate so we divide it by 2 @@ -2390,7 +2389,7 @@ static int __iw_set_bitrate(struct net_device *dev, return -EINVAL; } if (sme_cfg_set_int(WLAN_HDD_GET_HAL_CTX(pAdapter), - WNI_CFG_FIXED_RATE, rate) != CDF_STATUS_SUCCESS) { + WNI_CFG_FIXED_RATE, rate) != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_FIXED_RATE")); return -EIO; @@ -2606,7 +2605,7 @@ static int __iw_get_genie(struct net_device *dev, hdd_wext_state_t *pWextState; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - CDF_STATUS status; + QDF_STATUS status; uint32_t length = DOT11F_IE_RSN_MAX_LEN; uint8_t genIeBytes[DOT11F_IE_RSN_MAX_LEN]; hdd_context_t *hdd_ctx; @@ -2825,7 +2824,7 @@ static int __iw_set_rts_threshold(struct net_device *dev, } if (sme_cfg_set_int(hHal, WNI_CFG_RTS_THRESHOLD, wrqu->rts.value) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_RTS_THRESHOLD")); return -EIO; @@ -2955,7 +2954,7 @@ static int __iw_set_frag_threshold(struct net_device *dev, if (sme_cfg_set_int (hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, wrqu->frag.value) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_FRAGMENTATION_THRESHOLD")); return -EIO; @@ -3129,7 +3128,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, /*Get the phy mode */ if (sme_cfg_get_int(hHal, WNI_CFG_DOT11_MODE, - &active_phy_mode) == CDF_STATUS_SUCCESS) { + &active_phy_mode) == QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "active_phy_mode = %d", active_phy_mode); @@ -3140,7 +3139,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_str(hHal, WNI_CFG_SUPPORTED_RATES_11A, supp_rates, - &a_len) == CDF_STATUS_SUCCESS) { + &a_len) == QDF_STATUS_SUCCESS) { if (a_len > WNI_CFG_SUPPORTED_RATES_11A_LEN) { a_len = WNI_CFG_SUPPORTED_RATES_11A_LEN; } @@ -3159,7 +3158,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_str(hHal, WNI_CFG_SUPPORTED_RATES_11B, supp_rates, - &b_len) == CDF_STATUS_SUCCESS) { + &b_len) == QDF_STATUS_SUCCESS) { if (b_len > WNI_CFG_SUPPORTED_RATES_11B_LEN) { b_len = WNI_CFG_SUPPORTED_RATES_11B_LEN; } @@ -3191,7 +3190,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, /*Supported Channels and Frequencies */ if (sme_cfg_get_str ((hHal), WNI_CFG_VALID_CHANNEL_LIST, channels, - &num_channels) != CDF_STATUS_SUCCESS) { + &num_channels) != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_VALID_CHANNEL_LIST")); @@ -3334,23 +3333,23 @@ static void hdd_get_class_a_statistics_cb(void *pStats, void *pContext) * wlan_hdd_get_class_astats() - Get Class A statistics * @pAdapter: adapter for which statistics are desired * - * Return: CDF_STATUS_SUCCESS if adapter's Class A statistics were updated + * Return: QDF_STATUS_SUCCESS if adapter's Class A statistics were updated */ -CDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter) +QDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter) { hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - CDF_STATUS hstatus; + QDF_STATUS hstatus; unsigned long rc; struct statsContext context; if (NULL == pAdapter) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (cds_is_driver_recovering()) { hdd_err("Recovery in Progress. State: 0x%x Ignore!!!", cds_get_driver_state()); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* we are connected so prepare our callback context */ @@ -3365,7 +3364,7 @@ CDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter) false, /* non-cached results */ pHddStaCtx->conn_info.staId[0], &context, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve Class A statistics", __func__); /* we'll returned a cached value below */ @@ -3398,7 +3397,7 @@ CDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter) spin_unlock(&hdd_context_lock); /* either callback updated pAdapter stats or it has cached data */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3474,18 +3473,18 @@ static void hdd_get_station_statistics_cb(void *pStats, void *pContext) * wlan_hdd_get_station_stats() - Get station statistics * @pAdapter: adapter for which statistics are desired * - * Return: CDF_STATUS_SUCCESS if adapter's statistics were updated + * Return: QDF_STATUS_SUCCESS if adapter's statistics were updated */ -CDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter) +QDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter) { hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - CDF_STATUS hstatus; + QDF_STATUS hstatus; unsigned long rc; struct statsContext context; if (NULL == pAdapter) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* we are connected so prepare our callback context */ @@ -3503,7 +3502,7 @@ CDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter) false, /* non-cached results */ pHddStaCtx->conn_info.staId[0], &context, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve statistics", __func__); /* we'll return with cached values */ @@ -3537,7 +3536,7 @@ CDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter) spin_unlock(&hdd_context_lock); /* either callback updated pAdapter stats or it has cached data */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3748,7 +3747,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, eCsrEncryptionType encryptionType = eCSR_ENCRYPT_TYPE_NONE; bool fKeyPresent = 0; int i; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; int ret; ENTER(); @@ -3800,7 +3799,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { unsigned long rc; rc = wait_for_completion_timeout(&pAdapter-> disconnect_comp_var, @@ -4037,7 +4036,7 @@ static int __iw_set_encodeext(struct net_device *dev, hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); hdd_context_t *hdd_ctx; - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile; int ret; struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; @@ -4190,11 +4189,11 @@ static int __iw_set_encodeext(struct net_device *dev, */ cdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &setKey); - if (cdf_ret_status == CDF_STATUS_FT_PREAUTH_KEY_SUCCESS) { + if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) { hddLog(CDF_TRACE_LEVEL_INFO_MED, "%s: Update PreAuth Key success", __func__); return 0; - } else if (cdf_ret_status == CDF_STATUS_FT_PREAUTH_KEY_FAILED) { + } else if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Update PreAuth Key failed", __func__); return -EINVAL; @@ -4206,7 +4205,7 @@ static int __iw_set_encodeext(struct net_device *dev, pAdapter->sessionId, &setKey, &roamId); - if (cdf_ret_status != CDF_STATUS_SUCCESS) { + if (cdf_ret_status != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "[%4d] sme_roam_set_key returned ERROR status= %d", __LINE__, cdf_ret_status); @@ -4277,7 +4276,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, if ((wrqu->retry.flags & IW_RETRY_LONG)) { if (sme_cfg_set_int (hHal, WNI_CFG_LONG_RETRY_LIMIT, wrqu->retry.value) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); @@ -4286,7 +4285,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, } else if ((wrqu->retry.flags & IW_RETRY_SHORT)) { if (sme_cfg_set_int (hHal, WNI_CFG_SHORT_RETRY_LIMIT, wrqu->retry.value) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); @@ -4356,7 +4355,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info, wrqu->retry.flags = IW_RETRY_LIMIT | IW_RETRY_LONG; if (sme_cfg_get_int(hHal, WNI_CFG_LONG_RETRY_LIMIT, &retry) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); @@ -4368,7 +4367,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info, wrqu->retry.flags = IW_RETRY_LIMIT | IW_RETRY_SHORT; if (sme_cfg_get_int(hHal, WNI_CFG_SHORT_RETRY_LIMIT, &retry) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); @@ -4425,7 +4424,7 @@ static int __iw_set_mlme(struct net_device *dev, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct iw_mlme *mlme = (struct iw_mlme *)extra; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_context_t *hdd_ctx; int ret; @@ -4456,7 +4455,7 @@ static int __iw_set_mlme(struct net_device *dev, sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, reason); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { unsigned long rc; rc = wait_for_completion_timeout(&pAdapter-> disconnect_comp_var, @@ -4540,7 +4539,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, { #ifdef QCA_HT_2040_COEX hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(net); - CDF_STATUS halStatus = CDF_STATUS_E_FAILURE; + QDF_STATUS halStatus = QDF_STATUS_E_FAILURE; #endif bool band_24 = false, band_5g = false; bool ch_bond24 = false, ch_bond5g = false; @@ -4765,7 +4764,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, halStatus = sme_set_ht2040_mode(hal, pAdapter->sessionId, eHT_CHAN_HT20, false); - if (halStatus == CDF_STATUS_E_FAILURE) { + if (halStatus == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Failed to disable OBSS")); return -EIO; } @@ -4775,7 +4774,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, halStatus = sme_set_ht2040_mode(hal, pAdapter->sessionId, eHT_CHAN_HT20, true); - if (halStatus == CDF_STATUS_E_FAILURE) { + if (halStatus == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Failed to enable OBSS")); return -EIO; } @@ -4877,7 +4876,7 @@ static void hdd_get_temperature_cb(int temperature, void *pContext) */ int wlan_hdd_get_temperature(hdd_adapter_t *pAdapter, int *temperature) { - CDF_STATUS status; + QDF_STATUS status; struct statsContext tempContext; unsigned long rc; @@ -4891,7 +4890,7 @@ int wlan_hdd_get_temperature(hdd_adapter_t *pAdapter, int *temperature) tempContext.magic = TEMP_CONTEXT_MAGIC; status = sme_get_temperature(WLAN_HDD_GET_HAL_CTX(pAdapter), &tempContext, hdd_get_temperature_cb); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Unable to retrieve temperature")); } else { @@ -4936,7 +4935,7 @@ static int __iw_setint_getnone(struct net_device *dev, int set_value = value[1]; int ret; int enable_pbm, enable_mp; - CDF_STATUS status; + QDF_STATUS status; ENTER(); @@ -5033,7 +5032,7 @@ static int __iw_setint_getnone(struct net_device *dev, ret = -EINVAL; } else if (sme_cfg_set_int(hHal, WNI_CFG_ASSOC_STA_LIMIT, set_value) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_ASSOC_STA_LIMIT")); @@ -5056,7 +5055,7 @@ static int __iw_setint_getnone(struct net_device *dev, (set_value > CFG_DATA_INACTIVITY_TIMEOUT_MAX) || (sme_cfg_set_int((WLAN_HDD_GET_CTX(pAdapter))->hHal, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT, - set_value) == CDF_STATUS_E_FAILURE)) { + set_value) == QDF_STATUS_E_FAILURE)) { hddLog(LOGE, "Failure: Could not pass on " "WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT configuration info " "to CCM"); @@ -5077,7 +5076,7 @@ static int __iw_setint_getnone(struct net_device *dev, if (sme_set_tx_power (hHal, pAdapter->sessionId, bssid, pAdapter->device_mode, - set_value) != CDF_STATUS_SUCCESS) { + set_value) != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Setting tx power failed", __func__); return -EIO; @@ -5096,7 +5095,7 @@ static int __iw_setint_getnone(struct net_device *dev, cdf_copy_macaddr(&selfMac, &pHddStaCtx->conn_info.bssId); if (sme_set_max_tx_power(hHal, bssid, selfMac, set_value) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Setting maximum tx power failed", __func__); @@ -5111,7 +5110,7 @@ static int __iw_setint_getnone(struct net_device *dev, "%s: Setting maximum tx power %d dBm for 2.4 GHz band", __func__, set_value); if (sme_set_max_tx_power_per_band(eCSR_BAND_24, set_value) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Setting maximum tx power failed for 2.4 GHz band", __func__); @@ -5126,7 +5125,7 @@ static int __iw_setint_getnone(struct net_device *dev, "%s: Setting maximum tx power %d dBm for 5.0 GHz band", __func__, set_value); if (sme_set_max_tx_power_per_band(eCSR_BAND_5G, set_value) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Setting maximum tx power failed for 5.0 GHz band", __func__); @@ -5180,7 +5179,7 @@ static int __iw_setint_getnone(struct net_device *dev, hddLog(LOGE, "NSS greater than 2 not supported"); ret = -EINVAL; } else { - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_update_nss(WLAN_HDD_GET_CTX(pAdapter), set_value)) ret = -EINVAL; @@ -5273,7 +5272,7 @@ static int __iw_setint_getnone(struct net_device *dev, hddLog(LOG1, "LDPC val %d", set_value); /* get the HT capability info */ ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value); - if (CDF_STATUS_SUCCESS != ret) { + if (QDF_STATUS_SUCCESS != ret) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", @@ -5311,7 +5310,7 @@ static int __iw_setint_getnone(struct net_device *dev, hddLog(LOG1, "TX_STBC val %d", set_value); /* get the HT capability info */ ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value); - if (CDF_STATUS_SUCCESS != ret) { + if (QDF_STATUS_SUCCESS != ret) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", @@ -5349,7 +5348,7 @@ static int __iw_setint_getnone(struct net_device *dev, set_value); /* get the HT capability info */ ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value); - if (CDF_STATUS_SUCCESS != ret) { + if (QDF_STATUS_SUCCESS != ret) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", @@ -5414,7 +5413,7 @@ static int __iw_setint_getnone(struct net_device *dev, if (!ret) { if (sme_cfg_set_int (hHal, WNI_CFG_RTS_THRESHOLD, value) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(LOGE, "FAILED TO SET RTSCTS"); return -EIO; } @@ -6120,7 +6119,7 @@ static int __iw_setint_getnone(struct net_device *dev, status = sme_ext_change_channel(hHal, set_value, pAdapter->sessionId); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Error in change channel status %d"), status); @@ -6174,7 +6173,7 @@ static int __iw_setchar_getnone(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - CDF_STATUS vstatus; + QDF_STATUS vstatus; int sub_cmd; int ret; char *pBuffer = NULL; @@ -6277,7 +6276,7 @@ static int __iw_setchar_getnone(struct net_device *dev, break; case WE_SET_CONFIG: vstatus = hdd_execute_global_config_command(hdd_ctx, pBuffer); - if (CDF_STATUS_SUCCESS != vstatus) { + if (QDF_STATUS_SUCCESS != vstatus) { ret = -EINVAL; } break; @@ -6362,7 +6361,7 @@ static int __iw_setnone_getint(struct net_device *dev, { if (sme_cfg_get_int (hHal, WNI_CFG_ASSOC_STA_LIMIT, - (uint32_t *) value) != CDF_STATUS_SUCCESS) { + (uint32_t *) value) != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_ASSOC_STA_LIMIT")); @@ -6638,7 +6637,7 @@ static int __iw_setnone_getint(struct net_device *dev, *value = wma_cli_get_command(pAdapter->sessionId, WMI_PDEV_PARAM_TXPOWER_LIMIT2G, PDEV_CMD); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_cfg_get_int(hHal, WNI_CFG_CURRENT_TX_POWER_LEVEL, &txpow2g)) { return -EIO; @@ -6655,7 +6654,7 @@ static int __iw_setnone_getint(struct net_device *dev, *value = wma_cli_get_command(pAdapter->sessionId, WMI_PDEV_PARAM_TXPOWER_LIMIT5G, PDEV_CMD); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_cfg_get_int(hHal, WNI_CFG_CURRENT_TX_POWER_LEVEL, &txpow5g)) { return -EIO; @@ -6852,9 +6851,9 @@ static int __iw_set_three_ints_getnone(struct net_device *dev, */ case WE_SET_SAP_CHANNELS: if (wlan_hdd_validate_operation_channel(pAdapter, value[1]) != - CDF_STATUS_SUCCESS || + QDF_STATUS_SUCCESS || wlan_hdd_validate_operation_channel(pAdapter, - value[2]) != CDF_STATUS_SUCCESS) { + value[2]) != QDF_STATUS_SUCCESS) { ret = -EINVAL; } else { hdd_ctx->config->force_sap_acs_st_ch = value[1]; @@ -7189,7 +7188,7 @@ static int __iw_get_char_setnone(struct net_device *dev, } case WE_GET_CHANNEL_LIST: { - CDF_STATUS status; + QDF_STATUS status; uint8_t i, len; char *buf; uint8_t ubuf[WNI_CFG_COUNTRY_CODE_LEN]; @@ -7202,7 +7201,7 @@ static int __iw_get_char_setnone(struct net_device *dev, status = iw_softap_get_channel_list(dev, info, wrqu, (char *)&channel_list); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("GetChannelList Failed!!!")); return -EINVAL; } @@ -7221,7 +7220,7 @@ static int __iw_get_char_setnone(struct net_device *dev, } len = scnprintf(buf, WE_MAX_STR_LEN, "%u ", channel_list.num_channels); - if (CDF_STATUS_SUCCESS == sme_get_country_code(hdd_ctx->hHal, + if (QDF_STATUS_SUCCESS == sme_get_country_code(hdd_ctx->hHal, ubuf, &ubuf_len)) { /* Printing Country code in getChannelList */ for (i = 0; i < (ubuf_len - 1); i++) @@ -7292,7 +7291,7 @@ static int __iw_get_char_setnone(struct net_device *dev, ch_bond5g = true; phymode = sme_get_phy_mode(hal); - if ((CDF_STATUS_SUCCESS != + if ((QDF_STATUS_SUCCESS != sme_get_freq_band(hal, &currBand))) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, @@ -7919,7 +7918,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, msg.type = SIR_HAL_UNIT_TEST_CMD; msg.reserved = 0; msg.bodyptr = unitTestArgs; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { cdf_mem_free(unitTestArgs); CDF_TRACE(CDF_MODULE_ID_HDD, @@ -8491,7 +8490,7 @@ static int __iw_set_host_offload(struct net_device *dev, * copied individually. */ memcpy(&offloadRequest, pRequest, wrqu->data.length); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &offloadRequest)) { hddLog(CDF_TRACE_LEVEL_ERROR, @@ -8579,7 +8578,7 @@ static int __iw_set_keepalive_params(struct net_device *dev, hdd_info("Keep alive period %d", request->timePeriod); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_keep_alive(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, request)) { hdd_err("Failure to execute Keep Alive"); @@ -8694,7 +8693,7 @@ static int wlan_hdd_set_filter(hdd_context_t *hdd_ctx, request->params_data[i].data_mask[5]); } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_receive_filter_set_filter(hdd_ctx->hHal, &packetFilterSetReq, sessionId)) { @@ -8709,7 +8708,7 @@ static int wlan_hdd_set_filter(hdd_context_t *hdd_ctx, hdd_info("Clear Packet Filter Request for Id: %d", request->filter_id); packetFilterClrReq.filterId = request->filter_id; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_receive_filter_clear_filter(hdd_ctx->hHal, &packetFilterClrReq, sessionId)) { @@ -8814,7 +8813,7 @@ static int __iw_get_statistics(struct net_device *dev, { QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_wext_state_t *pWextState; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); @@ -8848,7 +8847,7 @@ static int __iw_get_statistics(struct net_device *dev, (pAdapter))->conn_info.staId[0], pAdapter, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve SME statistics", __func__); @@ -9259,7 +9258,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); eCsrBand band; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *pHddCtx; hdd_adapter_list_node_t *pAdapterNode, *pNext; eCsrBand currBand = eCSR_BAND_MAX; @@ -9308,7 +9307,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) band = pHddCtx->config->nBandCapability; } - if (CDF_STATUS_SUCCESS != sme_get_freq_band(hHal, &currBand)) { + if (QDF_STATUS_SUCCESS != sme_get_freq_band(hHal, &currBand)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Failed to get current band config", __func__); return -EIO; @@ -9324,7 +9323,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) __func__, currBand, band); status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); hdd_abort_mac_scan(pHddCtx, pAdapter->sessionId, @@ -9341,7 +9340,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) (hdd_conn_is_connected (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))) && (connectedBand != band)) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; long lrc; /* STA already connected on current band, So issue disconnect @@ -9359,7 +9358,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) pAdapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s csr_roam_disconnect failure, returned %d", __func__, (int)status); @@ -9387,7 +9386,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) pAdapterNode = pNext; } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_freq_band(hHal, pAdapter->sessionId, band)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, FL("Failed to set the band value to %u"), @@ -10744,7 +10743,7 @@ int hdd_set_wext(hdd_adapter_t *pAdapter) hdd_clear_roam_profile_ie(pAdapter); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -10768,19 +10767,19 @@ int hdd_register_wext(struct net_device *dev) CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: hdd_set_wext failed!!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->hdd_cdf_event))) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: HDD cdf event init failed!!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->scanevent))) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: HDD scan event init failed!!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Register as a wireless device */ dev->wireless_handlers = (struct iw_handler_def *)&we_handler_def; diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c index 582b2dfd57..3cbff02210 100644 --- a/core/hdd/src/wlan_hdd_wmm.c +++ b/core/hdd/src/wlan_hdd_wmm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -158,7 +158,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) sme_ac_enum_type acType = pQosContext->acType; hdd_wmm_ac_status_t *pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - CDF_STATUS status; + QDF_STATUS status; uint32_t service_interval; uint32_t suspension_interval; sme_QosWmmDirType direction; @@ -209,7 +209,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) direction, psb, pAdapter->sessionId, pHddCtx->config->DelayedTriggerFrmInt); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Failed to enable U-APSD for AC=%d", __func__, acType); @@ -243,7 +243,7 @@ static void hdd_wmm_disable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) hdd_adapter_t *pAdapter = pQosContext->pAdapter; sme_ac_enum_type acType = pQosContext->acType; hdd_wmm_ac_status_t *pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; - CDF_STATUS status; + QDF_STATUS status; /* have we previously enabled UAPSD? */ if (pAc->wmmAcUapsdInfoValid == true) { @@ -254,7 +254,7 @@ static void hdd_wmm_disable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) (pAdapter))->conn_info.staId[0], acType, pAdapter->sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Failed to disable U-APSD for AC=%d", __func__, acType); @@ -376,7 +376,7 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) hdd_adapter_t *pAdapter; hdd_wmm_ac_status_t *pAc; hdd_wlan_wmm_status_e status; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint32_t currentTrafficCnt = 0; sme_ac_enum_type acType = pQosContext->acType; @@ -405,10 +405,10 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) pAc->wmmPrevTrafficCnt = currentTrafficCnt; if (pAc->wmmInactivityTimer.state == CDF_TIMER_STATE_STOPPED) { /* Restart the timer */ - cdf_status = + qdf_status = cdf_mc_timer_start(&pAc->wmmInactivityTimer, pAc->wmmInactivityTime); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL( @@ -437,13 +437,13 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) * time specified in the AddTS parameters is non-zero, this function * is invoked to start a traffic inactivity timer for the given AC. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS +static QDF_STATUS hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, uint32_t inactivityTime) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; hdd_adapter_t *pAdapter = pQosContext->pAdapter; sme_ac_enum_type acType = pQosContext->acType; hdd_wmm_ac_status_t *pAc; @@ -451,28 +451,28 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, pAdapter = pQosContext->pAdapter; pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; - cdf_status = cdf_mc_timer_init(&pAc->wmmInactivityTimer, + qdf_status = cdf_mc_timer_init(&pAc->wmmInactivityTimer, CDF_TIMER_TYPE_SW, hdd_wmm_inactivity_timer_cb, pQosContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("Initializing inactivity timer failed on AC %d"), acType); - return cdf_status; + return qdf_status; } /* Start the inactivity timer */ - cdf_status = cdf_mc_timer_start(&pAc->wmmInactivityTimer, + qdf_status = cdf_mc_timer_start(&pAc->wmmInactivityTimer, inactivityTime); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("Starting inactivity timer failed on AC %d"), acType); - cdf_status = cdf_mc_timer_destroy(&pAc->wmmInactivityTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cdf_mc_timer_destroy(&pAc->wmmInactivityTimer); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hdd_err("Failed to destroy inactivity timer"); } - return cdf_status; + return qdf_status; } pAc->wmmInactivityTime = inactivityTime; /* Initialize the current tx traffic count on this AC */ @@ -480,7 +480,7 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[pQosContext-> acType]; pQosContext->is_inactivity_timer_running = true; - return cdf_status; + return qdf_status; } /** @@ -492,15 +492,15 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, * This function is invoked to disable the traffic inactivity timer * for the given AC. This is normally done when the TS is deleted. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS +static QDF_STATUS hdd_wmm_disable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext) { hdd_adapter_t *pAdapter = pQosContext->pAdapter; sme_ac_enum_type acType = pQosContext->acType; hdd_wmm_ac_status_t *pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; /* Clear the timer and the counter */ pAc->wmmInactivityTime = 0; @@ -508,17 +508,17 @@ hdd_wmm_disable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext) if (pQosContext->is_inactivity_timer_running == true) { pQosContext->is_inactivity_timer_running = false; - cdf_status = cdf_mc_timer_stop(&pAc->wmmInactivityTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cdf_mc_timer_stop(&pAc->wmmInactivityTimer); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hdd_err("Failed to stop inactivity timer"); - return cdf_status; + return qdf_status; } - cdf_status = cdf_mc_timer_destroy(&pAc->wmmInactivityTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + qdf_status = cdf_mc_timer_destroy(&pAc->wmmInactivityTimer); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hdd_err("Failed to destroy inactivity timer:Timer started"); } - return cdf_status; + return qdf_status; } #endif /* FEATURE_WLAN_ESE */ @@ -536,9 +536,9 @@ hdd_wmm_disable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext) * gets called externally through some function pointer magic (so * there is a need for rigorous parameter checking). * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, +static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, void *hddCtx, sme_QosWmmTspecInfo *pCurrentQosInfo, sme_QosStatusType smeStatus, @@ -556,7 +556,7 @@ static CDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, (HDD_WMM_CTX_MAGIC != pQosContext->magic))) { CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invalid QoS Context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pAdapter = pQosContext->pAdapter; @@ -1059,7 +1059,7 @@ static CDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, "%s: complete, access for TL AC %d is%sallowed", __func__, acType, pAc->wmmAcAccessAllowed ? " " : " not "); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -1371,9 +1371,9 @@ static void hdd_wmm_do_implicit_qos(struct work_struct *work) * adapter to an initial state. The configuration can later be * overwritten via application APIs or via QoS Map sent OTA. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter) { sme_QosWmmUpType *hddWmmDscpToUpMap = pAdapter->hddWmmDscpToUpMap; uint8_t dscp; @@ -1391,7 +1391,7 @@ CDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter) /* Special case for Expedited Forwarding (DSCP 46) */ hddWmmDscpToUpMap[46] = SME_QOS_WMM_UP_VO; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1402,9 +1402,9 @@ CDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter) * adapter to an initial state. The configuration can later be * overwritten via application APIs * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter) { hdd_wmm_ac_status_t *pAcStatus; sme_ac_enum_type acType; @@ -1432,7 +1432,7 @@ CDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter) */ pAdapter->configuredPsb = HDD_PSB_CFG_INVALID; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1441,9 +1441,9 @@ CDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter) * * @pAdapter: [in] pointer to Adapter context * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter) { hdd_wmm_ac_status_t *pAcStatus; sme_ac_enum_type acType; @@ -1460,7 +1460,7 @@ CDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter) pAcStatus->wmmAcTspecValid = false; pAcStatus->wmmAcUapsdInfoValid = false; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1470,9 +1470,9 @@ CDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter) * Function which will perform any necessary work to to clean up the * WMM functionality prior to the kernel module unload. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter) { hdd_wmm_qos_context_t *pQosContext; @@ -1494,7 +1494,7 @@ CDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter) hdd_wmm_free_context(pQosContext); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1792,9 +1792,9 @@ void hdd_wmm_acquire_access_required(hdd_adapter_t *pAdapter, * @pGranted: [out] pointer to bool flag when indicates if access * has been granted or not * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, sme_ac_enum_type acType, bool *pGranted) { hdd_wmm_qos_context_t *pQosContext; @@ -1815,7 +1815,7 @@ CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, pAdapter->hddWmmStatus.wmmAcStatus[acType]. wmmAcAccessAllowed; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* do we already have an implicit QoS request pending for this AC? */ if ((pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcAccessNeeded) || @@ -1828,7 +1828,7 @@ CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, __func__, acType); *pGranted = false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* did we already fail to establish implicit QoS for this AC? * (if so, access should have been granted when the failure @@ -1853,7 +1853,7 @@ CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, *pGranted = false; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* we need to establish implicit QoS */ CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, @@ -1872,7 +1872,7 @@ CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcAccessAllowed = true; *pGranted = true; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } pQosContext->acType = acType; @@ -1899,7 +1899,7 @@ CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, * TSPEC negotiation completes */ *pGranted = false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1910,13 +1910,13 @@ CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, * @pRoamInfo: [in] pointer to roam information * @eBssType: [in] type of BSS * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, eCsrRoamBssType eBssType) { uint8_t uapsdMask; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); /* when we associate we need to notify TL if it needs to @@ -1939,7 +1939,7 @@ CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Reassoc so no work, Exiting", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* get the negotiated UAPSD Mask */ uapsdMask = @@ -1961,7 +1961,7 @@ CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, pAdapter->sessionId, pHddCtx->config->DelayedTriggerFrmInt); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); } if (uapsdMask & HDD_AC_VI) { @@ -1977,7 +1977,7 @@ CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, pAdapter->sessionId, pHddCtx->config->DelayedTriggerFrmInt); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); } if (uapsdMask & HDD_AC_BK) { @@ -1993,7 +1993,7 @@ CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, pAdapter->sessionId, pHddCtx->config->DelayedTriggerFrmInt); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); } if (uapsdMask & HDD_AC_BE) { @@ -2009,21 +2009,21 @@ CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, pAdapter->sessionId, pHddCtx->config->DelayedTriggerFrmInt); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); } status = sme_update_dsc_pto_up_mapping(pHddCtx->hHal, pAdapter->hddWmmDscpToUpMap, pAdapter->sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_wmm_init(pAdapter); } CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Exiting", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static const uint8_t acm_mask_bit[WLAN_MAX_AC] = { @@ -2041,9 +2041,9 @@ static const uint8_t acm_mask_bit[WLAN_MAX_AC] = { * @pRoamInfo: [in] pointer to roam information * @eBssType : [in] type of BSS * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, eCsrRoamBssType eBssType) { int ac; @@ -2108,7 +2108,7 @@ CDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Exiting", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2118,9 +2118,9 @@ CDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, * @pAdapter : [in] pointer to adapter context * @pUapsdMask: [out] pointer to where the UAPSD Mask is to be stored * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_get_uapsd_mask(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_get_uapsd_mask(hdd_adapter_t *pAdapter, uint8_t *pUapsdMask) { uint8_t uapsdMask; @@ -2157,7 +2157,7 @@ CDF_STATUS hdd_wmm_get_uapsd_mask(hdd_adapter_t *pAdapter, /* return calculated mask */ *pUapsdMask = uapsdMask; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/hdd/src/wlan_hdd_wowl.c b/core/hdd/src/wlan_hdd_wowl.c index 2901e1c2d2..fc1992a506 100644 --- a/core/hdd/src/wlan_hdd_wowl.c +++ b/core/hdd/src/wlan_hdd_wowl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -57,7 +57,7 @@ static inline int find_ptrn_len(const char *ptrn) return len; } -static void hdd_wowl_callback(void *pContext, CDF_STATUS cdf_ret_status) +static void hdd_wowl_callback(void *pContext, QDF_STATUS cdf_ret_status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Return code = (%d)", __func__, cdf_ret_status); @@ -117,7 +117,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) { struct wow_add_pattern localPattern; int i, first_empty_slot, len, offset; - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; const char *temp; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); uint8_t sessionId = pAdapter->sessionId; @@ -256,7 +256,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) cdf_ret_status = sme_wow_add_pattern(hHal, &localPattern, sessionId); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { /* Add failed, so invalidate the local storage */ CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "sme_wowl_add_bcast_pattern failed with error code (%d)", @@ -293,7 +293,7 @@ bool hdd_del_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) unsigned char id; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); bool patternFound = false; - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; uint8_t sessionId = pAdapter->sessionId; hdd_context_t *pHddCtx = pAdapter->pHddCtx; @@ -314,7 +314,7 @@ bool hdd_del_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) cdf_ret_status = sme_wow_delete_pattern(hHal, &delPattern, sessionId); - if (CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { /* Remove from local storage as well */ CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Deleted pattern with id %d [%s]", id, @@ -344,7 +344,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, char *pattern_mask) { struct wow_add_pattern localPattern; - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); uint8_t session_id = pAdapter->sessionId; uint16_t pattern_len, mask_len, i; @@ -432,7 +432,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, cdf_ret_status = sme_wow_add_pattern(hHal, &localPattern, session_id); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_wowl_add_bcast_pattern failed with error code (%d).", __func__, cdf_ret_status); @@ -463,7 +463,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) { struct wow_delete_pattern delPattern; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; uint8_t sessionId = pAdapter->sessionId; if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) { @@ -487,7 +487,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) cdf_ret_status = sme_wow_delete_pattern(hHal, &delPattern, sessionId); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_wowl_del_bcast_pattern failed with error code (%d).", __func__, cdf_ret_status); @@ -513,7 +513,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm) { tSirSmeWowlEnterParams wowParams; - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); cdf_mem_zero(&wowParams, sizeof(tSirSmeWowlEnterParams)); @@ -541,8 +541,8 @@ bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm) #endif /* WLAN_WAKEUP_EVENTS */ &wowParams, pAdapter->sessionId); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { - if (CDF_STATUS_PMC_PENDING != cdf_ret_status) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (QDF_STATUS_PMC_PENDING != cdf_ret_status) { /* We failed to enter WoWL */ CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "sme_enter_wowl failed with error code (%d)", @@ -563,12 +563,12 @@ bool hdd_exit_wowl(hdd_adapter_t *pAdapter) { tSirSmeWowlExitParams wowParams; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; wowParams.sessionId = pAdapter->sessionId; cdf_ret_status = sme_exit_wowl(hHal, &wowParams); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "sme_exit_wowl failed with error code (%d)", cdf_ret_status); diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index d3d8a72837..cb22f9a2a7 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -247,7 +247,7 @@ enum wifi_logging_ring_id { /* ------------------------------------------------------------------- */ /* Change channel generic scheme */ -typedef void (*CHANGE_CHANNEL_CALLBACK)(tpAniSirGlobal pMac, CDF_STATUS status, +typedef void (*CHANGE_CHANNEL_CALLBACK)(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data, tpPESession psessionEntry); @@ -842,7 +842,7 @@ typedef struct sAniSirLim { uint8_t gLimDfsTargetChanNum; uint8_t probeCounter; uint8_t maxProbe; - CDF_STATUS(*add_bssdescr_callback) + QDF_STATUS(*add_bssdescr_callback) (tpAniSirGlobal pMac, tpSirBssDescription buf, uint32_t scan_id, uint32_t flags); uint8_t retry_packet_cnt; diff --git a/core/mac/inc/mac_trace.h b/core/mac/inc/mac_trace.h index dbe01b1f3f..919b0f5bf9 100644 --- a/core/mac/inc/mac_trace.h +++ b/core/mac/inc/mac_trace.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -57,8 +57,8 @@ uint8_t *mac_trace_get_lim_msg_string(uint16_t limMsg); uint8_t *mac_trace_get_wma_msg_string(uint16_t wmaMsg); uint8_t *mac_trace_get_sme_msg_string(uint16_t smeMsg); uint8_t *mac_trace_get_info_log_string(uint16_t infoLog); -CDF_STATUS pe_acquire_global_lock(tAniSirLim *psPe); -CDF_STATUS pe_release_global_lock(tAniSirLim *psPe); +QDF_STATUS pe_acquire_global_lock(tAniSirLim *psPe); +QDF_STATUS pe_release_global_lock(tAniSirLim *psPe); uint8_t *mac_trace_get_neighbour_roam_state(uint16_t neighbourRoamState); uint8_t *mac_trace_getcsr_roam_state(uint16_t csr_roamState); diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 87a829c3f8..878ce5f883 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -2322,7 +2322,7 @@ typedef struct sSirHalWowlEnterParams { /* Status code to be filled by HAL when it sends * SIR_HAL_WOWL_ENTER_RSP to PE. */ - CDF_STATUS status; + QDF_STATUS status; /*BSSID to find the current session */ @@ -2342,7 +2342,7 @@ typedef struct sSirHalWowlExitParams { /* Status code to be filled by HAL when it sends * SIR_HAL_WOWL_EXIT_RSP to PE. */ - CDF_STATUS status; + QDF_STATUS status; /*BSSIDX to find the current session */ diff --git a/core/mac/src/pe/include/lim_api.h b/core/mac/src/pe/include/lim_api.h index e10b3aace8..149a2c0d71 100644 --- a/core/mac/src/pe/include/lim_api.h +++ b/core/mac/src/pe/include/lim_api.h @@ -167,7 +167,7 @@ bool lim_is_deauth_diassoc_for_drop(tpAniSirGlobal mac, uint8_t *rx_pkt_info); bool lim_is_assoc_req_for_drop(tpAniSirGlobal mac, uint8_t *rx_pkt_info); #endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, +QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, struct sSirSmeRoamOffloadSynchInd *roam_sync_ind_ptr, tpSirBssDescription bss_desc_ptr); #endif @@ -229,7 +229,7 @@ void pe_free_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg); \return void --------------------------------------------------------------------------*/ -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_process_abort_scan_ind(tpAniSirGlobal pMac, uint8_t sessionId, uint32_t scan_id, uint32_t scan_requestor_id); diff --git a/core/mac/src/pe/include/lim_ft.h b/core/mac/src/pe/include/lim_ft.h index b27e8e7310..eccc869d95 100644 --- a/core/mac/src/pe/include/lim_ft.h +++ b/core/mac/src/pe/include/lim_ft.h @@ -48,11 +48,11 @@ void lim_ft_open(tpAniSirGlobal pMac, tpPESession psessionEntry); void lim_ft_cleanup(tpAniSirGlobal pMac, tpPESession psessionEntry); void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac, tpPESession psessionEntry); int lim_process_ft_pre_auth_req(tpAniSirGlobal pMac, tpSirMsgQ pMsg); -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); -void limPerformPostFTPreAuth(tpAniSirGlobal pMac, CDF_STATUS status, +void limPerformPostFTPreAuth(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data, tpPESession psessionEntry); -void limFTResumeLinkCb(tpAniSirGlobal pMac, CDF_STATUS status, uint32_t *data); +void limFTResumeLinkCb(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data); void lim_post_ft_pre_auth_rsp(tpAniSirGlobal pMac, tSirRetStatus status, uint8_t *auth_rsp, uint16_t auth_rsp_length, tpPESession psessionEntry); @@ -81,7 +81,7 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, uint8_t updateEntry, tpPESession pftSessionEntry, tpSirBssDescription bssDescription); -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); #endif /* __LIMFT_H__ */ diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h index 3969a17599..8ee02bc3c7 100644 --- a/core/mac/src/pe/include/lim_global.h +++ b/core/mac/src/pe/include/lim_global.h @@ -209,7 +209,7 @@ typedef enum eLimDot11hChanSwStates { /* WLAN_SUSPEND_LINK Related */ typedef void (*SUSPEND_RESUME_LINK_CALLBACK)(tpAniSirGlobal pMac, - CDF_STATUS status, + QDF_STATUS status, uint32_t *data); /* LIM to HAL SCAN Management Message Interface states */ diff --git a/core/mac/src/pe/lim/lim_admit_control.c b/core/mac/src/pe/lim/lim_admit_control.c index 2f13a41164..7dd6fca752 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 @@ void lim_process_hal_add_ts_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg) 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 0fcf3782a9..fc694a5eea 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -766,7 +766,7 @@ tSirRetStatus pe_open(tpAniSirGlobal pMac, tMacOpenParameters *pMacOpenParam) 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 @@ tSirRetStatus pe_close(tpAniSirGlobal pMac) 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 @@ tSirRetStatus pe_process_messages(tpAniSirGlobal pMac, tSirMsgQ *pMsg) * @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 @@ CDF_STATUS pe_handle_mgmt_frame(void *p_cds_gctx, void *cds_buff) /* 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 @@ CDF_STATUS pe_handle_mgmt_frame(void *p_cds_gctx, void *cds_buff) 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 @@ CDF_STATUS pe_handle_mgmt_frame(void *p_cds_gctx, void *cds_buff) 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 @@ void lim_fill_join_rsp_ht_caps(tpPESession session, tpSirSmeJoinRsp join_rsp) #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 @@ CDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, (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 @@ CDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, "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 @@ CDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, "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 @@ CDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, "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 @@ CDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, 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 @@ CDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, * * 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 @@ CDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, 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 @@ CDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, 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 @@ CDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, 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 @@ CDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, 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 @@ tMgmtFrmDropReason lim_is_pkt_candidate_for_drop(tpAniSirGlobal pMac, 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 7625e460c8..e9cdcd7c15 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 @@ tSirRetStatus 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 @@ lim_add_sta(tpAniSirGlobal mac_ctx, 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 @@ lim_del_sta(tpAniSirGlobal pMac, 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 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta, 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_del_bss(tpAniSirGlobal pMac, tpDphHashNode pStaDs, uint16_t bssIdx, 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 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, 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 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update 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 1cda53dc82..8941504ba4 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 @@ int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) 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 @@ int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) * 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 @@ void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, CDF_STATUS status, } } - 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 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, 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 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, } #endif - pAddBssParams->status = CDF_STATUS_SUCCESS; + pAddBssParams->status = QDF_STATUS_SUCCESS; pAddBssParams->respReqd = true; pAddBssParams->staContext.sessionId = pftSessionEntry->peSessionId; @@ -1012,7 +1012,7 @@ tSirRetStatus lim_ft_setup_auth_session(tpAniSirGlobal pMac, /*------------------------------------------------------------------ * 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 @@ void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal pMac, tSirRetStatus status, 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 @@ void lim_process_ft_aggr_qo_s_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg) } 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 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf * * 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 @@ CDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, 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 @@ CDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, 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 @@ void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, * 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 e12252b16e..4d674fd8c5 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 @@ lim_ibss_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEntry) 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 @@ void lim_ibss_del_bss_rsp_when_coalescing(tpAniSirGlobal pMac, void *msg, 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 @@ void lim_ibss_del_bss_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEn 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 5e06023116..3a7dba6e01 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 @@ static CDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac, 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 @@ static CDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac, 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 @@ static CDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac, 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 @@ void lim_process_remain_on_chn_timeout(tpAniSirGlobal mac_ctx) /* 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 @@ void lim_process_remain_on_chn_timeout(tpAniSirGlobal mac_ctx) 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 @@ error: * *------------------------------------------------------------------*/ -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 @@ error: * 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 @@ void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, CDF_STATUS status, uint32_t *dat } /* 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 @@ void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, CDF_STATUS status, uint32_t *dat } /* 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 @@ void lim_send_sme_mgmt_frame_ind(tpAniSirGlobal pMac, uint8_t frameType, 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 @@ CDF_STATUS lim_p2p_action_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess) pMac->lim.mgmtFrameSessionId = 0xff; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -445,7 +445,7 @@ static void lim_tx_action_frame(tpAniSirGlobal mac_ctx, { 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 @@ static void lim_tx_action_frame(tpAniSirGlobal mac_ctx, 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 @@ static void lim_tx_action_frame(tpAniSirGlobal mac_ctx, 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 @@ static void lim_tx_action_frame(tpAniSirGlobal mac_ctx, 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 @@ void lim_send_p2p_action_frame(tpAniSirGlobal mac_ctx, 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 @@ void lim_send_p2p_action_frame(tpAniSirGlobal mac_ctx, 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 @@ void lim_send_p2p_action_frame(tpAniSirGlobal mac_ctx, 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 @@ void lim_send_p2p_action_frame(tpAniSirGlobal mac_ctx, 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 @@ void lim_send_p2p_action_frame(tpAniSirGlobal mac_ctx, 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 5d97eaaf05..19b3889f60 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 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, /* 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 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, 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 2543a3b9c4..1723a7b9d4 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 @@ static void lim_process_auth_shared_system_algo(tpAniSirGlobal mac_ctx, * 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 11bca80775..aa8f16ceab 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 @@ end: ***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 @@ CDF_STATUS lim_send_stop_scan_offload_req(tpAniSirGlobal pMac, 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 @@ CDF_STATUS lim_send_stop_scan_offload_req(tpAniSirGlobal pMac, 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 @@ void lim_message_processor(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) #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 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) 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 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) 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 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) 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 a4ce9e23fd..649402b4ae 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 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx, 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 @@ failure: */ 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 @@ static void lim_process_mlm_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg) 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 @@ static void lim_process_mlm_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg) 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 @@ end: */ 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 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, 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 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, 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 @@ lim_process_mlm_disassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) 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 @@ lim_process_mlm_disassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) */ 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 @@ lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx, 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 @@ lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx, 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 @@ lim_process_mlm_deauth_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) 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 918ed85002..03c3c60123 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 @@ void lim_process_sta_mlm_add_sta_rsp(tpAniSirGlobal mac_ctx, 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 @@ void lim_process_sta_mlm_add_sta_rsp(tpAniSirGlobal mac_ctx, } } - 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 @@ void lim_process_sta_mlm_add_sta_rsp(tpAniSirGlobal mac_ctx, 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 @@ void lim_process_sta_mlm_del_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, 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 @@ void lim_process_bt_amp_ap_mlm_del_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg 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 @@ void lim_process_bt_amp_ap_mlm_del_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg } 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 @@ void lim_process_sta_mlm_del_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, 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 @@ void lim_process_ap_mlm_add_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, 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 @@ static void lim_process_ap_mlm_add_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg } /* 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_process_ibss_mlm_add_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, 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_process_sta_add_bss_rsp_pre_assoc(tpAniSirGlobal mac_ctx, 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 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, 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 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx, "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 @@ void lim_process_mlm_set_bss_key_rsp(tpAniSirGlobal mac_ctx, */ 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 @@ static void lim_process_switch_channel_re_assoc_req(tpAniSirGlobal pMac, 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 @@ end: */ 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 @@ static void lim_process_switch_channel_join_req( * 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 @@ error: 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_process_btamp_add_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, 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 @@ void lim_send_sme_scan_cache_updated_ind(uint8_t sessionId) 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 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) 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 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) 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 581b47dde2..060eea4cae 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 @@ static void lim_process_ext_change_channel(tpAniSirGlobal mac_ctx, * * 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 @@ static CDF_STATUS lim_process_set_hw_mode(tpAniSirGlobal mac, uint32_t *msg) /* 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 @@ static CDF_STATUS lim_process_set_hw_mode(tpAniSirGlobal mac, uint32_t *msg) 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 @@ fail: 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 @@ fail: 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 @@ fail: * * 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 @@ static CDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac, /* 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 @@ static CDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac, 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 @@ fail: 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 @@ void lim_get_random_bssid(tpAniSirGlobal pMac, uint8_t *data) 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 @@ static CDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, 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 @@ static CDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, 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 @@ static CDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, 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 @@ static void __lim_process_sme_scan_req(tpAniSirGlobal mac_ctx, 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 @@ void lim_process_sme_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, } 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 @@ void lim_process_sme_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, 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 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac, 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_nss_update_request(tpAniSirGlobal mac_ctx, 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 @@ static void lim_process_set_ie_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) 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 bbabde1c83..498ab623f0 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 @@ static uint32_t lim_prepare_tdls_frame_header(tpAniSirGlobal pMac, uint8_t *pFra /* * 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 @@ CDF_STATUS lim_mgmt_tx_complete(tpAniSirGlobal pMac, uint32_t txCompleteSuccess) 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 @@ tSirRetStatus lim_send_tdls_dis_req_frame(tpAniSirGlobal pMac, 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 @@ tSirRetStatus lim_send_tdls_dis_req_frame(tpAniSirGlobal pMac, /* 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 @@ tSirRetStatus lim_send_tdls_dis_req_frame(tpAniSirGlobal pMac, 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 @@ tSirRetStatus lim_send_tdls_dis_req_frame(tpAniSirGlobal pMac, 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 @@ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac, 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 @@ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac, 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 @@ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac, * 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 @@ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac, 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 @@ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac, 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 @@ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac, + 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 @@ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac, 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 @@ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac, 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 @@ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, 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 @@ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, #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 @@ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, 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 @@ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, 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 @@ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac, 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 @@ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac, + 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 @@ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac, 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 @@ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac, 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 @@ tSirRetStatus lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal pMac, 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 @@ tSirRetStatus lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal pMac, #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 @@ tSirRetStatus lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal pMac, 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 @@ tSirRetStatus lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal pMac, 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 @@ static tpDphHashNode lim_tdls_del_sta(tpAniSirGlobal pMac, /* * 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 @@ static CDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac, 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 @@ static CDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac, 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 @@ CDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal pMac, void *msg, 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 @@ void lim_send_sme_tdls_link_establish_req_rsp(tpAniSirGlobal pMac, /* * 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 @@ static CDF_STATUS lim_send_sme_tdls_del_sta_rsp(tpAniSirGlobal pMac, 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 @@ static CDF_STATUS lim_send_sme_tdls_del_sta_rsp(tpAniSirGlobal pMac, 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 a26a289531..623a900719 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 @@ lim_collect_bss_description(tpAniSirGlobal pMac, 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 @@ lim_collect_bss_description(tpAniSirGlobal pMac, 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 @@ lim_collect_bss_description(tpAniSirGlobal pMac, * 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 @@ lim_check_and_add_bss_description(tpAniSirGlobal mac_ctx, 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 @@ lim_check_and_add_bss_description(tpAniSirGlobal mac_ctx, #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 @@ lim_check_and_add_bss_description(tpAniSirGlobal mac_ctx, } 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 c622dc2c8a..74fb3b0af9 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_copy_scan_result(tpAniSirGlobal, uint8_t *); 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 9037fb64ac..b04183adb7 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 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, } } - 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 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac, #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 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac, 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 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac, 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 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_delts_req_action_frame(tpAniSirGlobal pMac, 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 @@ lim_send_delts_req_action_frame(tpAniSirGlobal pMac, 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 @@ lim_send_delts_req_action_frame(tpAniSirGlobal pMac, 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 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, #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 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, #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 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, 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_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac) 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 @@ end: lim_post_sme_message(pMac, LIM_MLM_DEAUTH_CNF, (uint32_t *) &mlmDeauthCnf); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3134,10 +3134,10 @@ end: * 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 @@ CDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx) /* 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 @@ end: 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 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, } 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 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, } #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 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac, 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 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac, 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 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac, 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 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac, 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 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac, 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 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac, 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 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac, 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 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac, 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 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac, 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 @@ lim_send_channel_switch_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_channel_switch_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_channel_switch_mgmt_frame(tpAniSirGlobal pMac, 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 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, 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 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, 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 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, 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 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, 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 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, 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 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, 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 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, 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 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, 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 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, 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 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, 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 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, 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 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, 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 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, 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 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, 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 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, 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 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, 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 @@ tSirRetStatus lim_send_sa_query_request_frame(tpAniSirGlobal pMac, uint8_t *tran 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 @@ tSirRetStatus lim_send_sa_query_request_frame(tpAniSirGlobal pMac, uint8_t *tran } 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 @@ tSirRetStatus lim_send_sa_query_request_frame(tpAniSirGlobal pMac, uint8_t *tran } 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 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, 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 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, } 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 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, 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 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, 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 f514619c28..13f86dacf7 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 @@ uint32_t lim_get_max_rate_flags(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds) * 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 @@ lim_send_sme_join_reassoc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, 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 @@ void lim_send_sme_oem_data_rsp(tpAniSirGlobal pMac, uint32_t *pMsgBuf, #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 @@ error: } 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 @@ lim_send_sme_deauth_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, 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 @@ lim_process_beacon_tx_success_ind(tpAniSirGlobal pMac, uint16_t msgType, void *e 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 @@ lim_process_beacon_tx_success_ind(tpAniSirGlobal pMac, uint16_t msgType, void *e 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 7dcde4717d..4885b60066 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -162,8 +162,7 @@ void pe_reset_protection_callback(void *ptr) 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 @@ void pe_reset_protection_callback(void *ptr) 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 @@ tpPESession 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 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, &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 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, 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 @@ tpPESession pe_find_session_by_bssid(tpAniSirGlobal pMac, uint8_t *bssid, 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 @@ tpPESession pe_find_session_by_session_id(tpAniSirGlobal pMac, uint8_t sessionId { 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 514b70cdee..3a3161fcd2 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -469,8 +469,8 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal pMac, #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 @@ void lim_send_sme_mgmt_tx_completion(tpAniSirGlobal pMac, tpPESession psessionEn 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_regd_defd_sme_req_after_noa_start(tpAniSirGlobal pMac); 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 @@ typedef struct sSetLinkCbackParams { 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 98cb55117f..c53efd09af 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -1155,7 +1155,7 @@ uint8_t lim_is_null_ssid(tSirMacSSid *ssid) * 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 @@ lim_util_count_sta_del(tpAniSirGlobal pMac, * @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 @@ lim_handle_11g_protection_for_11bcoexist(tpAniSirGlobal mac_ctx, 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 @@ lim_enable_ht_protection_from11g(tpAniSirGlobal pMac, uint8_t enable, 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 @@ static void lim_handle_ht20coexist_ht20protection(tpAniSirGlobal mac_ctx, 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 @@ tAniBool lim_is_channel_valid_for_channel_switch(tpAniSirGlobal pMac, uint8_t ch \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 @@ __lim_fill_tx_control_params(tpAniSirGlobal pMac, tpTxControlParams pTxCtrlMsg, /* 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 @@ void lim_frame_transmission_control(tpAniSirGlobal pMac, tLimQuietTxMode type, 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 @@ void lim_frame_transmission_control(tpAniSirGlobal pMac, tLimQuietTxMode type, 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 @@ void lim_set_stads_rtt_cap(tpDphHashNode sta_ds, struct s_ext_cap *ext_cap, * 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 @@ CDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, 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 @@ CDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, 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 @@ CDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, 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 ae5cd6a387..9200313042 100644 --- a/core/mac/src/pe/lim/lim_utils.h +++ b/core/mac/src/pe/lim/lim_utils.h @@ -244,7 +244,7 @@ tSirRetStatus lim_restore_pre_quiet_state(tpAniSirGlobal pMac, 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_set_stads_rtt_cap(tpDphHashNode sta_ds, struct s_ext_cap *ext_cap, 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, diff --git a/core/mac/src/pe/sch/sch_api.c b/core/mac/src/pe/sch/sch_api.c index 1a11104162..344ac544c3 100644 --- a/core/mac/src/pe/sch/sch_api.c +++ b/core/mac/src/pe/sch/sch_api.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. * @@ -201,7 +201,8 @@ void sch_send_start_scan_rsp(tpAniSirGlobal pMac) PELOG1(sch_log(pMac, LOG1, FL("Sending LIM message to go into scan"));) msgQ.type = SIR_SCH_START_SCAN_RSP; - if ((retCode = lim_post_msg_api(pMac, &msgQ)) != eSIR_SUCCESS) + retCode = lim_post_msg_api(pMac, &msgQ); + if (retCode != eSIR_SUCCESS) sch_log(pMac, LOGE, FL("Posting START_SCAN_RSP to LIM failed, reason=%X"), retCode); @@ -230,7 +231,7 @@ void sch_send_start_scan_rsp(tpAniSirGlobal pMac) * * @param size - Length of the beacon * - * @return CDF_STATUS + * @return QDF_STATUS */ tSirRetStatus sch_send_beacon_req(tpAniSirGlobal pMac, uint8_t *beaconPayload, uint16_t size, tpPESession psessionEntry) @@ -300,7 +301,8 @@ tSirRetStatus sch_send_beacon_req(tpAniSirGlobal pMac, uint8_t *beaconPayload, } MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msgQ.type)); - if (eSIR_SUCCESS != (retCode = wma_post_ctrl_msg(pMac, &msgQ))) { + retCode = wma_post_ctrl_msg(pMac, &msgQ); + if (eSIR_SUCCESS != retCode) { sch_log(pMac, LOGE, FL("Posting SEND_BEACON_REQ to HAL failed, reason=%X"), retCode); @@ -310,12 +312,12 @@ tSirRetStatus sch_send_beacon_req(tpAniSirGlobal pMac, uint8_t *beaconPayload, if (LIM_IS_AP_ROLE(psessionEntry) && (pMac->sch.schObject.fBeaconChanged)) { - if (eSIR_SUCCESS != - (retCode = - lim_send_probe_rsp_template_to_hal(pMac, psessionEntry, - &psessionEntry-> - DefProbeRspIeBitmap - [0]))) { + retCode = lim_send_probe_rsp_template_to_hal(pMac, + psessionEntry, + &psessionEntry-> + DefProbeRspIeBitmap + [0]); + if (eSIR_SUCCESS != retCode) { /* check whether we have to free any memory */ sch_log(pMac, LOGE, FL @@ -335,7 +337,7 @@ uint32_t lim_remove_p2p_ie_from_add_ie(tpAniSirGlobal pMac, { uint32_t left = psessionEntry->addIeParams.probeRespDataLen; uint8_t *ptr = psessionEntry->addIeParams.probeRespData_buff; - uint8_t elem_id,elem_len; + uint8_t elem_id, elem_len; uint32_t offset = 0; uint8_t eid = 0xDD; @@ -347,7 +349,7 @@ uint32_t lim_remove_p2p_ie_from_add_ie(tpAniSirGlobal pMac, elem_id = ptr[0]; elem_len = ptr[1]; left -= 2; - if(elem_len > left) { + if (elem_len > left) { sch_log(pMac, LOGE, FL("Invalid IEs")); return eSIR_FAILURE; } @@ -516,7 +518,8 @@ uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal pMac, msgQ.bodyptr = pprobeRespParams; msgQ.bodyval = 0; - if (eSIR_SUCCESS != (retCode = wma_post_ctrl_msg(pMac, &msgQ))) { + retCode = wma_post_ctrl_msg(pMac, &msgQ); + if (eSIR_SUCCESS != retCode) { /* free the allocated Memory */ sch_log(pMac, LOGE, FL diff --git a/core/mac/src/sys/common/inc/wlan_qct_sys.h b/core/mac/src/sys/common/inc/wlan_qct_sys.h index ef0c89d6a2..d4521b8fe3 100644 --- a/core/mac/src/sys/common/inc/wlan_qct_sys.h +++ b/core/mac/src/sys/common/inc/wlan_qct_sys.h @@ -42,7 +42,6 @@ Include files -------------------------------------------------------------------------*/ #include -#include #include #include @@ -112,7 +111,7 @@ typedef enum { \sa --------------------------------------------------------------------------*/ -CDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg); +QDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg); /*---------------------------------------------------------------------------- @@ -129,7 +128,7 @@ CDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg); \param pUserData - pointer to some user data entity that is passed to the callback function as a parameter when invoked. - \return CDF_STATUS_SUCCESS - + \return QDF_STATUS_SUCCESS - \todo: We have not 'status' on the callback. How do we notify the callback that there is a failure ? @@ -137,7 +136,7 @@ CDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg); \sa --------------------------------------------------------------------------*/ -CDF_STATUS sysMcStart(v_CONTEXT_t p_cds_context, sysResponseCback userCallback, +QDF_STATUS sysMcStart(v_CONTEXT_t p_cds_context, sysResponseCback userCallback, void *pUserData); /*---------------------------------------------------------------------------- @@ -150,14 +149,14 @@ CDF_STATUS sysMcStart(v_CONTEXT_t p_cds_context, sysResponseCback userCallback, \param p_cds_context - pointer to the CDS Context - \return CDF_STATUS_SUCCESS - the SYS module is stopped. + \return QDF_STATUS_SUCCESS - the SYS module is stopped. - CDF_STATUS_E_FAILURE - the SYS module open failed to stop. + QDF_STATUS_E_FAILURE - the SYS module open failed to stop. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sys_stop(v_CONTEXT_t p_cds_context); +QDF_STATUS sys_stop(v_CONTEXT_t p_cds_context); /*---------------------------------------------------------------------------- @@ -181,14 +180,14 @@ CDF_STATUS sys_stop(v_CONTEXT_t p_cds_context); \param pMsg - pointer to the message to be processed. - \return - CDF_STATUS_SUCCESS - the message was processed successfully. + \return - QDF_STATUS_SUCCESS - the message was processed successfully. - CDF_STATUS_E_BADMSG - a bad (unknown type) message was received + QDF_STATUS_E_BADMSG - a bad (unknown type) message was received and subsequently not processed. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg); +QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg); void wlan_sys_probe(void); diff --git a/core/mac/src/sys/common/src/wlan_qct_sys.c b/core/mac/src/sys/common/src/wlan_qct_sys.c index 1c1452f010..7c950e115a 100644 --- a/core/mac/src/sys/common/src/wlan_qct_sys.c +++ b/core/mac/src/sys/common/src/wlan_qct_sys.c @@ -54,14 +54,14 @@ static qdf_event_t g_stop_evt; * * This API is used to build the sys message header. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg) +QDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg) { pMsg->type = sysMsgId; pMsg->reserved = SYS_MSG_COOKIE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -87,11 +87,10 @@ void sys_stop_complete_cb(void *pUserData) * * This API is used post a stop message to system module * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sys_stop(v_CONTEXT_t p_cds_context) +QDF_STATUS sys_stop(v_CONTEXT_t p_cds_context) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t sysMsg; @@ -109,9 +108,9 @@ CDF_STATUS sys_stop(v_CONTEXT_t p_cds_context) sysMsg.bodyptr = (void *)&g_stop_evt; /* post the message.. */ - cdf_status = cds_mq_post_message(CDS_MQ_ID_SYS, &sysMsg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_status = CDF_STATUS_E_BADMSG; + qdf_status = cds_mq_post_message(CDS_MQ_ID_SYS, &sysMsg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + qdf_status = QDF_STATUS_E_BADMSG; qdf_status = qdf_wait_single_event(&g_stop_evt, SYS_STOP_TIMEOUT); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); @@ -129,11 +128,11 @@ CDF_STATUS sys_stop(v_CONTEXT_t p_cds_context) * * This API is used to process the message * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) +QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cdf_mc_timer_callback_t timerCB; tpAniSirGlobal mac_ctx; void *hHal; @@ -142,7 +141,7 @@ CDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer to cds_msg_t", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* @@ -177,17 +176,17 @@ CDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal", __func__); } else { - cdf_status = sme_stop(hHal, + qdf_status = sme_stop(hHal, HAL_STOP_TYPE_SYS_DEEP_SLEEP); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); - cdf_status = mac_stop(hHal, + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + qdf_status = mac_stop(hHal, HAL_STOP_TYPE_SYS_DEEP_SLEEP); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); ((sysResponseCback) pMsg->callback)( (void *)pMsg->bodyptr); - cdf_status = CDF_STATUS_SUCCESS; + qdf_status = QDF_STATUS_SUCCESS; } break; @@ -249,12 +248,12 @@ CDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) "Rx SYS unknown MC msgtype= %d [0x%08X]", pMsg->type, pMsg->type); CDF_ASSERT(0); - cdf_status = CDF_STATUS_E_BADMSG; + qdf_status = QDF_STATUS_E_BADMSG; if (pMsg->bodyptr) cdf_mem_free(pMsg->bodyptr); } - return cdf_status; + return qdf_status; } /** @@ -339,7 +338,7 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) /* * Post now the message to the appropriate module for handling */ - if (CDF_STATUS_SUCCESS != cds_mq_post_message(targetMQ, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(targetMQ, (cds_msg_t *) pMsg)) { /* * Caller doesn't allocate memory for the pMsg. diff --git a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c index 47499656cd..10c993efc8 100644 --- a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c +++ b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 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. * @@ -34,7 +34,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. @@ -44,18 +44,18 @@ when who what, where, why -------- --- -------------------------------------------------------- 03/31/09 sho Remove the use of cdf_timerIsActive flag as it is not - thread-safe + thread-safe 02/17/08 sho Fix the timer callback function to work when it is called - after the timer has stopped due to a race condition. + after the timer has stopped due to a race condition. 02/10/08 sho Refactor the TX timer to use VOS timer directly instead - of using VOS utility timer + of using VOS utility timer 12/15/08 sho Resolved errors and warnings from the AMSS compiler when - this is ported from WM + this is ported from WM 11/20/08 sho Renamed this to VosWrapper.c; remove all dependencies on - WM platform and allow this to work on all VOSS enabled - platform + WM platform and allow this to work on all VOSS enabled + platform 06/24/08 tbh Modified the file to remove the dependecy on HDD files as - part of Gen6 bring up process. + part of Gen6 bring up process. 10/29/02 Neelay Das Created file. ===========================================================================*/ @@ -89,7 +89,7 @@ */ uint64_t tx_time_get(void) { - return (cdf_mc_timer_get_system_ticks()); + return cdf_mc_timer_get_system_ticks(); } /* * tx_time_get() */ @@ -111,7 +111,7 @@ uint64_t tx_time_get(void) */ uint32_t tx_timer_activate(TX_TIMER *timer_ptr) { - CDF_STATUS status; + QDF_STATUS status; /* Uncomment the asserts, if the intention is to debug the occurence of the */ /* following anomalous cnditions. */ @@ -141,11 +141,11 @@ uint32_t tx_timer_activate(TX_TIMER *timer_ptr) status = cdf_mc_timer_start(&timer_ptr->cdf_timer, timer_ptr->initScheduleTimeInMsecs); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Timer %s now activated\n", TIMER_NAME); return TX_SUCCESS; - } else if (CDF_STATUS_E_ALREADY == status) { + } else if (QDF_STATUS_E_ALREADY == status) { /* starting timer fails because timer is already started; this is okay */ CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Timer %s is already running\n", TIMER_NAME); @@ -271,12 +271,12 @@ static void tx_main_timer_func(void *functionContext) /* check if this needs to be rescheduled */ if (0 != timer_ptr->rescheduleTimeInMsecs) { - CDF_STATUS status; + QDF_STATUS status; status = cdf_mc_timer_start(&timer_ptr->cdf_timer, timer_ptr->rescheduleTimeInMsecs); timer_ptr->rescheduleTimeInMsecs = 0; - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_WARN, "Unable to reschedule timer %s; status=%d", TIMER_NAME, status); @@ -295,7 +295,7 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal, uint64_t auto_activate, char *fileName, uint32_t lineNum) { - CDF_STATUS status; + QDF_STATUS status; if (NULL == expiration_function) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, @@ -338,7 +338,7 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal, cdf_mc_timer_init_debug(&timer_ptr->cdf_timer, CDF_TIMER_TYPE_SW, tx_main_timer_func, (void *) timer_ptr, fileName, lineNum); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Cannot create timer for %s\n", TIMER_NAME); return TX_TIMER_ERROR; @@ -366,7 +366,7 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr, uint64_t rescheduleTimeInTicks, uint64_t auto_activate) { - CDF_STATUS status; + QDF_STATUS status; if ((NULL == name_ptr) || (NULL == expiration_function)) return TX_TIMER_ERROR; @@ -396,7 +396,7 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr, status = cdf_mc_timer_init(&timer_ptr->cdf_timer, CDF_TIMER_TYPE_SW, tx_main_timer_func, (void *) timer_ptr); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Cannot create timer for %s\n", TIMER_NAME); return TX_TIMER_ERROR; @@ -434,7 +434,7 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr, */ uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr) { - CDF_STATUS vStatus; + QDF_STATUS vStatus; CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "tx_timer_deactivate() called for timer %s\n", TIMER_NAME); @@ -444,7 +444,7 @@ uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr) } /* if the timer is not running then we do not need to do anything here */ vStatus = cdf_mc_timer_stop(&timer_ptr->cdf_timer); - if (CDF_STATUS_SUCCESS != vStatus) { + if (QDF_STATUS_SUCCESS != vStatus) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH, "Unable to stop timer %s; status =%d\n", TIMER_NAME, vStatus); diff --git a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c index 304ab3e8f7..a748f85ddb 100644 --- a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c +++ b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c @@ -107,7 +107,7 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, tpSirMsgQ msg, void *bd_ptr; tMgmtFrmDropReason dropreason; cds_pkt_t *vos_pkt = (cds_pkt_t *) msg->bodyptr; - CDF_STATUS cdf_status = + QDF_STATUS qdf_status = wma_ds_peek_rx_packet_info(vos_pkt, &bd_ptr, false); uint8_t sessionid; tpPESession pe_session; @@ -115,7 +115,7 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, tpSirMsgQ msg, mac_ctx->sys.gSysBbtReceived++; - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) goto fail; sys_log(mac_ctx, LOG3, FL("Rx Mgmt Frame Subtype: %d\n"), subtype); diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index b13fd29718..30ea1a79bd 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -132,7 +132,7 @@ void swap_bit_field32(uint32_t in, uint32_t *out) #endif /* ANI_LITTLE_BIT_ENDIAN */ } -inline static void __print_wmm_params(tpAniSirGlobal pMac, +static inline void __print_wmm_params(tpAniSirGlobal pMac, tDot11fIEWMMParams *pWmm) { lim_log(pMac, LOG1, FL("WMM Parameters Received: \n")); @@ -199,9 +199,9 @@ int find_ie_location(tpAniSirGlobal pMac, tpSirRSNie pRsnIe, uint8_t EID) while (1) { if (EID == pRsnIe->rsnIEdata[idx]) { /* Found it */ - return (idx); + return idx; } else if (EID != pRsnIe->rsnIEdata[idx] && - /* & if no more IE, */ + /* & if no more IE, */ bytesLeft <= (uint16_t) (ieLen)) { dot11f_log(pMac, LOG3, FL("No IE (%d) in find_ie_location.\n"), EID); @@ -705,8 +705,7 @@ populate_dot11f_ht_caps(tpAniSirGlobal pMac, uHTCapabilityInfo.htCapInfo.lsigTXOPProtection; /* All sessionized entries will need the check below */ - if (psessionEntry == NULL) /* Only in case of NO session */ - { + if (psessionEntry == NULL) { /* Only in case of NO session */ pDot11f->supportedChannelWidthSet = uHTCapabilityInfo.htCapInfo.supportedChannelWidthSet; pDot11f->advCodingCap = @@ -1551,7 +1550,8 @@ populate_dot11f_rsn(tpAniSirGlobal pMac, int idx; if (pRsnIe->length) { - if (0 <= (idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_RSN))) { + idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_RSN); + if (0 <= idx) { status = dot11f_unpack_ie_rsn(pMac, pRsnIe->rsnIEdata + idx + 2, /* EID, length */ pRsnIe->rsnIEdata[idx + 1], pDot11f); @@ -1578,7 +1578,8 @@ tSirRetStatus populate_dot11f_rsn_opaque(tpAniSirGlobal pMac, int idx; if (pRsnIe->length) { - if (0 <= (idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_RSN))) { + idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_RSN); + if (0 <= idx) { pDot11f->present = 1; pDot11f->num_data = pRsnIe->rsnIEdata[idx + 1]; cdf_mem_copy(pDot11f->data, pRsnIe->rsnIEdata + idx + 2, /* EID, len */ @@ -1600,7 +1601,8 @@ populate_dot11f_wapi(tpAniSirGlobal pMac, int idx; if (pRsnIe->length) { - if (0 <= (idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WAPI))) { + idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WAPI); + if (0 <= idx) { status = dot11f_unpack_ie_wapi(pMac, pRsnIe->rsnIEdata + idx + 2, /* EID, length */ pRsnIe->rsnIEdata[idx + 1], pDot11f); @@ -1627,7 +1629,8 @@ tSirRetStatus populate_dot11f_wapi_opaque(tpAniSirGlobal pMac, int idx; if (pRsnIe->length) { - if (0 <= (idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WAPI))) { + idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WAPI); + if (0 <= idx) { pDot11f->present = 1; pDot11f->num_data = pRsnIe->rsnIEdata[idx + 1]; cdf_mem_copy(pDot11f->data, pRsnIe->rsnIEdata + idx + 2, /* EID, len */ @@ -1783,21 +1786,20 @@ populate_dot11f_rates_tdls(tpAniSirGlobal p_mac, wlan_cfg_get_int(p_mac, WNI_CFG_DOT11_MODE, &self_dot11mode); /** - * Include 11b rates only when the device configured in + * Include 11b rates only when the device configured in * auto, 11a/b/g or 11b_only - */ + */ if ((self_dot11mode == WNI_CFG_DOT11_MODE_ALL) || (self_dot11mode == WNI_CFG_DOT11_MODE_11A) || (self_dot11mode == WNI_CFG_DOT11_MODE_11AC) || (self_dot11mode == WNI_CFG_DOT11_MODE_11N) || (self_dot11mode == WNI_CFG_DOT11_MODE_11G) || - (self_dot11mode == WNI_CFG_DOT11_MODE_11B) ) { + (self_dot11mode == WNI_CFG_DOT11_MODE_11B)) { val = WNI_CFG_SUPPORTED_RATES_11B_LEN; wlan_cfg_get_str(p_mac, WNI_CFG_SUPPORTED_RATES_11B, (uint8_t *)&temp_rateset.rate, &val); temp_rateset.numRates = (uint8_t) val; - } - else { + } else { temp_rateset.numRates = 0; } @@ -1814,14 +1816,14 @@ populate_dot11f_rates_tdls(tpAniSirGlobal p_mac, if ((temp_rateset.numRates + temp_rateset2.numRates) > SIR_MAC_MAX_NUMBER_OF_RATES) { lim_log(p_mac, LOGP, FL("more than %d rates in CFG"), - SIR_MAC_MAX_NUMBER_OF_RATES); + SIR_MAC_MAX_NUMBER_OF_RATES); return eSIR_FAILURE; } /** - * copy all rates in temp_rateset, - * there are SIR_MAC_MAX_NUMBER_OF_RATES rates max - */ + * copy all rates in temp_rateset, + * there are SIR_MAC_MAX_NUMBER_OF_RATES rates max + */ for (i = 0; i < temp_rateset2.numRates; i++) temp_rateset.rate[i + temp_rateset.numRates] = temp_rateset2.rate[i]; @@ -2092,7 +2094,8 @@ populate_dot11f_wpa(tpAniSirGlobal pMac, int idx; if (pRsnIe->length) { - if (0 <= (idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WPA))) { + idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WPA); + if (0 <= idx) { status = dot11f_unpack_ie_wpa(pMac, pRsnIe->rsnIEdata + idx + 2 + 4, /* EID, length, OUI */ pRsnIe->rsnIEdata[idx + 1] - 4, /* OUI */ pDot11f); @@ -2115,7 +2118,8 @@ tSirRetStatus populate_dot11f_wpa_opaque(tpAniSirGlobal pMac, int idx; if (pRsnIe->length) { - if (0 <= (idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WPA))) { + idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WPA); + if (0 <= idx) { pDot11f->present = 1; pDot11f->num_data = pRsnIe->rsnIEdata[idx + 1] - 4; cdf_mem_copy(pDot11f->data, pRsnIe->rsnIEdata + idx + 2 + 4, /* EID, len, OUI */ @@ -3111,7 +3115,7 @@ sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, uint8_t **outIeBuf, uint32_t *pOutIeLen) { tDot11fBeaconIEs *pBies = NULL; - uint32_t status = CDF_STATUS_SUCCESS; + uint32_t status = QDF_STATUS_SUCCESS; tSirRetStatus retStatus = eSIR_SUCCESS; tSirEseBcnReportMandatoryIe eseBcnReportMandatoryIe; @@ -4060,8 +4064,8 @@ sir_convert_addts_req2_struct(tpAniSirGlobal pMac, uint8_t *pFrame, uint32_t nFrame, tSirAddtsReqInfo *pAddTs) { - tDot11fAddTSRequest addts = { {0}}; - tDot11fWMMAddTSRequest wmmaddts = { {0}}; + tDot11fAddTSRequest addts = { {0} }; + tDot11fWMMAddTSRequest wmmaddts = { {0} }; uint8_t j; uint16_t i; uint32_t status; @@ -4201,8 +4205,8 @@ sir_convert_addts_rsp2_struct(tpAniSirGlobal pMac, uint8_t *pFrame, uint32_t nFrame, tSirAddtsRspInfo *pAddTs) { - tDot11fAddTSResponse addts = { {0}}; - tDot11fWMMAddTSResponse wmmaddts = { {0}}; + tDot11fAddTSResponse addts = { {0} }; + tDot11fWMMAddTSResponse wmmaddts = { {0} }; uint8_t j; uint16_t i; uint32_t status; @@ -4386,8 +4390,8 @@ sir_convert_delts_req2_struct(tpAniSirGlobal pMac, uint8_t *pFrame, uint32_t nFrame, tSirDeltsReqInfo *pDelTs) { - tDot11fDelTS delts = { {0}}; - tDot11fWMMDelTS wmmdelts = { {0}}; + tDot11fDelTS delts = { {0} }; + tDot11fWMMDelTS wmmdelts = { {0} }; uint32_t status; if (SIR_MAC_QOS_DEL_TS_REQ != *(pFrame + 1)) { @@ -4607,7 +4611,7 @@ sir_convert_meas_req_frame2_struct(tpAniSirGlobal pMac, [0]. request << 1) | - (mr.MeasurementRequest[0].report /*<< 0 */ ); + (mr.MeasurementRequest[0].report /*<< 0 */); pMeasReqFrame->measReqIE.measType = mr.MeasurementRequest[0].measurement_type; @@ -4721,8 +4725,9 @@ tSirRetStatus populate_dot11f_ese_cckm_opaque(tpAniSirGlobal pMac, { int idx; if (pCCKMie->length) { - if (0 <= (idx = find_ie_location(pMac, (tpSirRSNie) pCCKMie, - DOT11F_EID_ESECCKMOPAQUE))) { + idx = find_ie_location(pMac, (tpSirRSNie) pCCKMie, + DOT11F_EID_ESECCKMOPAQUE); + if (0 <= idx) { pDot11f->present = 1; /* Dont include OUI */ pDot11f->num_data = pCCKMie->cckmIEdata[idx + 1] - 4; diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index e77d058822..b58fdd9370 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -800,109 +800,109 @@ typedef struct { #endif /* FEATURE_WLAN_CH_AVOID */ void sap_cleanup_channel_list(void *sapContext); void sapCleanupAllChannelList(void); -CDF_STATUS wlansap_set_wps_ie(void *p_cds_gctx, tSap_WPSIE *pWPSIe); -CDF_STATUS wlansap_update_wps_ie(void *p_cds_gctx); -CDF_STATUS wlansap_stop_Wps(void *p_cds_gctx); -CDF_STATUS wlansap_get_wps_state(void *p_cds_gctx, bool *pbWPSState); +QDF_STATUS wlansap_set_wps_ie(void *p_cds_gctx, tSap_WPSIE *pWPSIe); +QDF_STATUS wlansap_update_wps_ie(void *p_cds_gctx); +QDF_STATUS wlansap_stop_Wps(void *p_cds_gctx); +QDF_STATUS wlansap_get_wps_state(void *p_cds_gctx, bool *pbWPSState); void *wlansap_open(void *p_cds_gctx); -CDF_STATUS wlansap_start(void *p_cds_gctx); -CDF_STATUS wlansap_stop(void *p_cds_gctx); -CDF_STATUS wlansap_close(void *p_cds_gctx); -typedef CDF_STATUS (*tpWLAN_SAPEventCB)(tpSap_Event pSapEvent, +QDF_STATUS wlansap_start(void *p_cds_gctx); +QDF_STATUS wlansap_stop(void *p_cds_gctx); +QDF_STATUS wlansap_close(void *p_cds_gctx); +typedef QDF_STATUS (*tpWLAN_SAPEventCB)(tpSap_Event pSapEvent, void *pUsrContext); uint8_t wlansap_get_state(void *p_cds_gctx); -CDF_STATUS wlansap_start_bss(void *p_cds_gctx, +QDF_STATUS wlansap_start_bss(void *p_cds_gctx, tpWLAN_SAPEventCB pSapEventCallback, tsap_Config_t *pConfig, void *pUsrContext); #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH uint16_t wlansap_check_cc_intf(void *Ctx); #endif -CDF_STATUS wlansap_set_mac_acl(void *p_cds_gctx, tsap_Config_t *pConfig); -CDF_STATUS wlansap_stop_bss(void *p_cds_gctx); -CDF_STATUS wlansap_disassoc_sta(void *p_cds_gctx, +QDF_STATUS wlansap_set_mac_acl(void *p_cds_gctx, tsap_Config_t *pConfig); +QDF_STATUS wlansap_stop_bss(void *p_cds_gctx); +QDF_STATUS wlansap_disassoc_sta(void *p_cds_gctx, const uint8_t *pPeerStaMac); -CDF_STATUS wlansap_deauth_sta(void *p_cds_gctx, +QDF_STATUS wlansap_deauth_sta(void *p_cds_gctx, struct tagCsrDelStaParams *pDelStaParams); -CDF_STATUS wlansap_set_channel_change_with_csa(void *p_cds_gctx, +QDF_STATUS wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, phy_ch_width target_bw); -CDF_STATUS wlansap_set_key_sta(void *p_cds_gctx, +QDF_STATUS wlansap_set_key_sta(void *p_cds_gctx, tCsrRoamSetKey *pSetKeyInfo); -CDF_STATUS wlansap_get_assoc_stations(void *p_cds_gctx, +QDF_STATUS wlansap_get_assoc_stations(void *p_cds_gctx, CDF_MODULE_ID module, tpSap_AssocMacAddr pAssocStas); -CDF_STATUS wlansap_remove_wps_session_overlap(void *p_cds_gctx, +QDF_STATUS wlansap_remove_wps_session_overlap(void *p_cds_gctx, struct cdf_mac_addr pRemoveMac); -CDF_STATUS wlansap_get_wps_session_overlap(void *p_cds_gctx); -CDF_STATUS wlansap_set_counter_measure(void *p_cds_gctx, bool bEnable); -CDF_STATUS wlan_sap_getstation_ie_information(void *p_cds_gctx, +QDF_STATUS wlansap_get_wps_session_overlap(void *p_cds_gctx); +QDF_STATUS wlansap_set_counter_measure(void *p_cds_gctx, bool bEnable); +QDF_STATUS wlan_sap_getstation_ie_information(void *p_cds_gctx, uint32_t *pLen, uint8_t *pBuf); -CDF_STATUS wlansap_clear_acl(void *p_cds_gctx); -CDF_STATUS wlansap_get_acl_accept_list(void *p_cds_gctx, +QDF_STATUS wlansap_clear_acl(void *p_cds_gctx); +QDF_STATUS wlansap_get_acl_accept_list(void *p_cds_gctx, struct cdf_mac_addr *pAcceptList, uint8_t *nAcceptList); -CDF_STATUS wlansap_get_acl_deny_list(void *pCtx, +QDF_STATUS wlansap_get_acl_deny_list(void *pCtx, struct cdf_mac_addr *pDenyList, uint8_t *nDenyList); -CDF_STATUS wlansap_set_mode(void *p_cds_gctx, uint32_t mode); -CDF_STATUS wlansap_get_acl_mode(void *p_cds_gctx, eSapMacAddrACL *mode); -CDF_STATUS wlansap_modify_acl(void *p_cds_gctx, +QDF_STATUS wlansap_set_mode(void *p_cds_gctx, uint32_t mode); +QDF_STATUS wlansap_get_acl_mode(void *p_cds_gctx, eSapMacAddrACL *mode); +QDF_STATUS wlansap_modify_acl(void *p_cds_gctx, uint8_t *pPeerStaMac, eSapACLType listType, eSapACLCmdType cmd); -CDF_STATUS wlansap_set_wparsn_ies +QDF_STATUS wlansap_set_wparsn_ies (void *p_cds_gctx, uint8_t *pWPARSNIEs, uint32_t WPARSNIEsLen); -CDF_STATUS wlansap_send_action +QDF_STATUS wlansap_send_action (void *p_cds_gctx, const uint8_t *pBuf, uint32_t len, uint16_t wait, uint16_t channel_freq); -CDF_STATUS wlansap_remain_on_channel +QDF_STATUS wlansap_remain_on_channel (void *p_cds_gctx, uint8_t channel, uint32_t duration, remainOnChanCallback callback, void *pContext, uint32_t *scan_id); -CDF_STATUS wlansap_cancel_remain_on_channel(void *p_cds_gctx, +QDF_STATUS wlansap_cancel_remain_on_channel(void *p_cds_gctx, uint32_t scan_id); -CDF_STATUS wlansap_register_mgmt_frame +QDF_STATUS wlansap_register_mgmt_frame (void *p_cds_gctx, uint16_t frameType, uint8_t *matchData, uint16_t matchLen); -CDF_STATUS wlansap_de_register_mgmt_frame +QDF_STATUS wlansap_de_register_mgmt_frame (void *p_cds_gctx, uint16_t frameType, uint8_t *matchData, uint16_t matchLen); -CDF_STATUS wlansap_channel_change_request(void *p_cds_gctx, +QDF_STATUS wlansap_channel_change_request(void *p_cds_gctx, uint8_t tArgetChannel); -CDF_STATUS wlansap_start_beacon_req(void *pSapCtx); -CDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx); -CDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac); -CDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac); -CDF_STATUS wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, +QDF_STATUS wlansap_start_beacon_req(void *pSapCtx); +QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx); +QDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac); +QDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac); +QDF_STATUS wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_JapanW3); #ifdef FEATURE_AP_MCC_CH_AVOIDANCE -CDF_STATUS +QDF_STATUS wlan_sap_set_channel_avoidance(tHalHandle hal, bool sap_channel_avoidance); #endif -CDF_STATUS wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, +QDF_STATUS wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, uint8_t dfs_Preferred_Channels_location); -CDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, +QDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, uint8_t target_channel); uint32_t wlan_sap_get_vht_ch_width(void *ctx); void wlan_sap_set_vht_ch_width(void *ctx, uint32_t vht_channel_width); -CDF_STATUS wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, +QDF_STATUS wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, const uint8_t * pAdditionIEBuffer, uint16_t additionIELength, eUpdateIEsType updateType); -CDF_STATUS wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, +QDF_STATUS wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateType); void wlansap_extend_to_acs_range(uint8_t *startChannelNum, uint8_t *endChannelNum, uint8_t *bandStartChannel, uint8_t *bandEndChannel); -CDF_STATUS wlansap_get_dfs_nol(void *pSapCtx); -CDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf); +QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx); +QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf); void wlansap_populate_del_sta_params(const uint8_t *mac, uint16_t reason_code, uint8_t subtype, struct tagCsrDelStaParams *pDelStaParams); -CDF_STATUS wlansap_acs_chselect(void *pvos_gctx, +QDF_STATUS wlansap_acs_chselect(void *pvos_gctx, tpWLAN_SAPEventCB pacs_event_callback, tsap_Config_t *pconfig, void *pusr_context); diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index 0474e2120f..32977d9f6b 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -27,7 +27,7 @@ /*=========================================================================== - s a p A p i L i n k C n t l . C + s a p A p i L i n k C n t l . C OVERVIEW: @@ -92,16 +92,16 @@ * * Return: Status */ -CDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, +QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, void *ctx, /* Opaque SAP handle */ uint8_t session_id, uint32_t scan_id, eCsrScanStatus scan_status) { tScanResultHandle result = NULL; - CDF_STATUS get_result_status = CDF_STATUS_E_FAILURE; + QDF_STATUS get_result_status = QDF_STATUS_E_FAILURE; ptSapContext sap_ctx = (ptSapContext) ctx; tWLAN_SAPEvent sapEvent; /* State machine event */ uint8_t operChannel = 0; - CDF_STATUS sap_sm_status; + QDF_STATUS sap_sm_status; #ifdef SOFTAP_CHANNEL_RANGE uint32_t event; @@ -110,12 +110,12 @@ CDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, if (NULL == hal_handle) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (sap_ctx->sapsMachine == eSAP_DISCONNECTED) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "In %s BSS already stopped", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } switch (scan_status) { @@ -135,8 +135,8 @@ CDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, event = eSAP_MAC_SCAN_COMPLETE; - if ((get_result_status != CDF_STATUS_SUCCESS) - && (get_result_status != CDF_STATUS_E_NULL_VALUE)) { + if ((get_result_status != QDF_STATUS_SUCCESS) + && (get_result_status != QDF_STATUS_E_NULL_VALUE)) { /* No scan results */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, Get scan result failed! ret = %d", @@ -269,16 +269,16 @@ void sap_config_acs_result(tHalHandle hal, ptSapContext sap_ctx, * this routine will be registered as callback to sme_close_session, so upon * closure of sap session it notifies the hostapd * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_hdd_signal_event_handler(void *ctx) +static QDF_STATUS sap_hdd_signal_event_handler(void *ctx) { ptSapContext sap_ctx = (struct sSapContext *)ctx; - CDF_STATUS status; + QDF_STATUS status; if (NULL == sap_ctx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sap context is not valid")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = sap_signal_hdd_event(sap_ctx, NULL, sap_ctx->sap_state, @@ -299,18 +299,18 @@ static CDF_STATUS sap_hdd_signal_event_handler(void *ctx) * Api for scan callback. This function is invoked as a result of scan * completion and reports the scan results. * - * Return: The CDF_STATUS code associated with performing the operation + * Return: The QDF_STATUS code associated with performing the operation */ -CDF_STATUS +QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, uint8_t sessionid, uint32_t scanid, eCsrScanStatus scan_status) { tScanResultHandle presult = NULL; - CDF_STATUS scan_get_result_status = CDF_STATUS_E_FAILURE; + QDF_STATUS scan_get_result_status = QDF_STATUS_E_FAILURE; ptSapContext sap_ctx = (ptSapContext)pcontext; uint8_t oper_channel = 0; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (eCSR_SCAN_SUCCESS != scan_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, @@ -339,8 +339,8 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, scan_get_result_status = sme_scan_get_result(hal_handle, sap_ctx->sessionId, NULL, &presult); - if ((scan_get_result_status != CDF_STATUS_SUCCESS) && - (scan_get_result_status != CDF_STATUS_E_NULL_VALUE)) { + if ((scan_get_result_status != QDF_STATUS_SUCCESS) && + (scan_get_result_status != QDF_STATUS_E_NULL_VALUE)) { /* * No scan results So, set the operation channel not selected * to allow the default channel to be set when reporting to HDD @@ -406,7 +406,7 @@ close_session: status = sme_close_session(hal_handle, sap_ctx->sessionId, sap_hdd_signal_event_handler, sap_ctx); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CloseSession failed")); else @@ -430,10 +430,10 @@ static void wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, ptSapContext sap_ctx, tCsrRoamInfo *csr_roam_info, - CDF_STATUS *ret_status) + QDF_STATUS *ret_status) { tWLAN_SAPEvent sap_event; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; /* * Channel change is successful. If the new channel is a DFS channel, * then we will to perform channel availability check for 60 seconds @@ -489,9 +489,9 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, } /* Handle the event */ - cdf_status = sap_fsm(sap_ctx, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - *ret_status = CDF_STATUS_E_FAILURE; + qdf_status = sap_fsm(sap_ctx, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + *ret_status = QDF_STATUS_E_FAILURE; } /** @@ -507,11 +507,11 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, static void wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, ptSapContext sap_ctx, - CDF_STATUS *ret_status) + QDF_STATUS *ret_status) { tWLAN_SAPEvent sap_event; uint8_t intf; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hHal); eCsrPhyMode phy_mode = sap_ctx->csr_roamProfile.phyMode; uint8_t dfs_beacon_start_req = 0; @@ -580,9 +580,9 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: Posting event eWNI_SME_CHANNEL_CHANGE_REQ to sapFSM")); /* Handle event */ - cdf_status = sap_fsm(sap_ctx, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - *ret_status = CDF_STATUS_E_FAILURE; + qdf_status = sap_fsm(sap_ctx, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + *ret_status = QDF_STATUS_E_FAILURE; return; } @@ -599,7 +599,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: sapctx[%p] ready but not concurrent sap"), sap_ctx); - *ret_status = CDF_STATUS_SUCCESS; + *ret_status = QDF_STATUS_SUCCESS; return; } @@ -620,12 +620,12 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, sap_event.u1 = 0; sap_event.u2 = 0; /* Handle event */ - cdf_status = sap_fsm(pSapContext, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = sap_fsm(pSapContext, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("post chnl chng req failed, sap[%p]"), sap_ctx); - *ret_status = CDF_STATUS_E_FAILURE; + *ret_status = QDF_STATUS_E_FAILURE; } else { pSapContext->is_sap_ready_for_chnl_chng = false; } @@ -646,9 +646,9 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, static void wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, ptSapContext sap_ctx, - CDF_STATUS *ret_status) + QDF_STATUS *ret_status) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tWLAN_SAPEvent sap_event; if (eSAP_DFS_CAC_WAIT == sap_ctx->sapsMachine) { if (sap_ctx->csr_roamProfile.disableDFSChSwitch) { @@ -675,10 +675,10 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, * CAC end on this channel is not indicated, the user * space will be in some undefined state (e.g., UI frozen) */ - cdf_status = sap_signal_hdd_event(sap_ctx, NULL, + qdf_status = sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_CAC_INTERRUPTED, (void *) eSAP_STATUS_SUCCESS); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Failed to send CAC end")); /* Want to still proceed and try to switch channel. @@ -691,9 +691,9 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, sap_event.params = 0; sap_event.u1 = 0; sap_event.u2 = 0; - cdf_status = sap_fsm(sap_ctx, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - *ret_status = CDF_STATUS_E_FAILURE; + qdf_status = sap_fsm(sap_ctx, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + *ret_status = QDF_STATUS_E_FAILURE; return; } if (eSAP_STARTED == sap_ctx->sapsMachine) { @@ -709,9 +709,9 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, sap_event.params = 0; sap_event.u1 = 0; sap_event.u2 = 0; - cdf_status = sap_fsm(sap_ctx, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - *ret_status = CDF_STATUS_E_FAILURE; + qdf_status = sap_fsm(sap_ctx, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + *ret_status = QDF_STATUS_E_FAILURE; return; } /* Further actions to be taken here */ @@ -737,9 +737,9 @@ static void wlansap_roam_process_infra_assoc_ind(ptSapContext sap_ctx, eCsrRoamResult roam_result, tCsrRoamInfo *csr_roam_info, - CDF_STATUS *ret_status) + QDF_STATUS *ret_status) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND (%d)\n"), roam_result); @@ -759,26 +759,26 @@ wlansap_roam_process_infra_assoc_ind(ptSapContext sap_ctx, sap_ctx->nStaAddIeLength); sap_ctx->SapQosCfg.WmmIsEnabled = csr_roam_info->wmmEnabledSta; /* MAC filtering */ - cdf_status = sap_is_peer_mac_allowed(sap_ctx, + qdf_status = sap_is_peer_mac_allowed(sap_ctx, (uint8_t *) csr_roam_info->peerMac.bytes); - if (CDF_STATUS_SUCCESS == cdf_status) { - cdf_status = sap_signal_hdd_event(sap_ctx, + if (QDF_STATUS_SUCCESS == qdf_status) { + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_ASSOC_IND, (void *) eSAP_STATUS_SUCCESS); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") fail"), roam_result, MAC_ADDR_ARRAY( csr_roam_info->peerMac.bytes)); - *ret_status = CDF_STATUS_E_FAILURE; + *ret_status = QDF_STATUS_E_FAILURE; } } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") not allowed"), roam_result, MAC_ADDR_ARRAY(csr_roam_info->peerMac.bytes)); - *ret_status = CDF_STATUS_E_FAILURE; + *ret_status = QDF_STATUS_E_FAILURE; } return; } @@ -797,7 +797,7 @@ wlansap_roam_process_infra_assoc_ind(ptSapContext sap_ctx, * * Return: Status of operation */ -CDF_STATUS +QDF_STATUS wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, eRoamCmdStatus roam_status, eCsrRoamResult roam_result) { @@ -805,8 +805,8 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, ptSapContext sap_ctx = (ptSapContext) ctx; /* State machine event */ tWLAN_SAPEvent sap_event; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; tHalHandle hal = CDS_GET_HAL_CB(sap_ctx->p_cds_gctx); tpAniSirGlobal mac_ctx = NULL; uint8_t intf; @@ -814,7 +814,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, if (NULL == hal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); - cdf_ret_status = CDF_STATUS_E_NOMEM; + cdf_ret_status = QDF_STATUS_E_NOMEM; return cdf_ret_status; } @@ -841,9 +841,9 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, sap_event.u1 = roam_status; sap_event.u2 = roam_result; /* Handle event */ - cdf_status = sap_fsm(sap_ctx, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + qdf_status = sap_fsm(sap_ctx, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case eCSR_ROAM_LOSTLINK: @@ -1008,22 +1008,22 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, sap_ctx->SapQosCfg.WmmIsEnabled = csr_roam_info->wmmEnabledSta; /* Fill in the event structure */ - cdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_ASSOC_EVENT, (void *) eSAP_STATUS_SUCCESS); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_DISASSOC_IND: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_DISASSOC_IND (%d)\n"), roam_result); /* Fill in the event structure */ - cdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_DISASSOC_EVENT, (void *) eSAP_STATUS_SUCCESS); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_DEAUTH_IND: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1034,11 +1034,11 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, * we use the same event inorder to inform HDD to disassociate * the station */ - cdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_DISASSOC_EVENT, (void *) eSAP_STATUS_SUCCESS); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_MIC_ERROR_GROUP: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1048,11 +1048,11 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, * Fill in the event structure * TODO: support for group key MIC failure event to be handled */ - cdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_MIC_FAILURE_EVENT, (void *) NULL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_MIC_ERROR_UNICAST: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1062,12 +1062,12 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, * Fill in the event structure * TODO: support for unicast key MIC failure event to be handled */ - cdf_status = + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_MIC_FAILURE_EVENT, (void *) NULL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case eCSR_ROAM_RESULT_AUTHENTICATED: @@ -1078,8 +1078,8 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_SET_KEY_EVENT, (void *) eSAP_STATUS_SUCCESS); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_ASSOCIATED: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1104,9 +1104,9 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, sap_event.params = csr_roam_info; sap_event.u1 = roam_status; sap_event.u2 = roam_result; - cdf_status = sap_fsm(sap_ctx, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + qdf_status = sap_fsm(sap_ctx, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_INFRA_STOPPED: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1118,9 +1118,9 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, sap_event.u1 = roam_status; sap_event.u2 = roam_result; /* Handle event */ - cdf_status = sap_fsm(sap_ctx, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + qdf_status = sap_fsm(sap_ctx, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1130,11 +1130,11 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, * Fill in the event structure * TODO: support for group key MIC failure event to be handled */ - cdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_WPS_PBC_PROBE_REQ_EVENT, (void *) NULL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_FORCED: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1168,11 +1168,11 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, FL("CSR roam_result = eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED (%d)\n"), roam_result); /* Fill in the event structure */ - cdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_MAX_ASSOC_EXCEEDED, NULL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND: @@ -1198,10 +1198,10 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, /* Inform cfg80211 and hostapd that BSS is not alive anymore */ break; case eCSR_ROAM_EXT_CHG_CHNL_UPDATE_IND: - cdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_ECSA_CHANGE_CHAN_IND, NULL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; default: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 377cd08614..621169cdf7 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -27,7 +27,7 @@ /*=========================================================================== - s a p F s m . C + s a p F s m . C OVERVIEW: @@ -732,7 +732,7 @@ tSapChanMatrixInfo ht20_chan[] = { * Static Function Declarations and Definitions * -------------------------------------------------------------------------*/ #ifdef SOFTAP_CHANNEL_RANGE -static CDF_STATUS sap_get_channel_list(ptSapContext sapContext, +static QDF_STATUS sap_get_channel_list(ptSapContext sapContext, uint8_t **channelList, uint8_t *numberOfChannels); #endif @@ -757,7 +757,7 @@ static CDF_STATUS sap_get_channel_list(ptSapContext sapContext, SIDE EFFECTS ============================================================================*/ -static CDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext); +static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext); /*========================================================================== FUNCTION sapStopDfsCacTimer @@ -950,10 +950,10 @@ sap_find_target_channel_in_channel_matrix(ptSapContext sapContext, * (if selected as target channel) will cause leakage in one of * the NOL channels * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS +QDF_STATUS sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, phy_ch_width ch_width, tSapDfsNolInfo *nol, @@ -989,7 +989,7 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Couldn't find target channel matrix!")); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* * following is based on assumption that both temp_ch_lst @@ -1027,7 +1027,7 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, k++; } } /* end of loop that selects each NOL */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* end of WLAN_ENABLE_CHNL_MATRIX_RESTRICTION */ @@ -1382,8 +1382,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) CDF_TRACE_LEVEL_INFO_LOW, FL("index: %d, Channel = %d, avoided due to presence of another AP+AP MCC device in same channel."), i, channelID); - sapContext->SapAllChnlList.channelList[i].valid - = false; + sapContext->SapAllChnlList.channelList[i]. + valid = false; } } #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ @@ -1439,7 +1439,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) FL ("sapdfs: Processing temp channel list against NOL.") ); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sap_mark_channels_leaking_into_nol(sapContext, ch_width, nol, @@ -1954,18 +1954,18 @@ sap_dfs_is_channel_in_nol_list(ptSapContext sap_context, * * Initiates sme scan for ACS to pick a channel. * - * Return: The CDF_STATUS code associated with performing the operation. + * Return: The QDF_STATUS code associated with performing the operation. */ -CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, +QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, ptWLAN_SAPEvent sap_event, bool sap_do_acs_pre_start_bss) { /* Initiate a SCAN request */ - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; /* To be initialised if scan is required */ tCsrScanRequest scan_request; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; #ifdef SOFTAP_CHANNEL_RANGE uint8_t *channel_list = NULL; @@ -1979,7 +1979,7 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, /* we have a serious problem */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, FL("invalid h_hal")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (cds_concurrent_beaconing_sessions_running()) { @@ -1992,7 +1992,7 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, CDS_IS_DFS_CH(sap_context->channel)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("MCC DFS not supported in AP_AP Mode")); - return CDF_STATUS_E_ABORTED; + return QDF_STATUS_E_ABORTED; } #endif #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH @@ -2020,7 +2020,7 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, else if (CDS_IS_DFS_CH(sap_context->channel)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("DFS not supported in STA_AP Mode")); - return CDF_STATUS_E_ABORTED; + return QDF_STATUS_E_ABORTED; } #endif #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH @@ -2127,7 +2127,7 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, &wlansap_scan_callback, sap_context); } - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sme_scan_request fail %d!!!"), cdf_ret_status); @@ -2152,12 +2152,12 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, * return failure so that the calling * fucntion can use the default channel. */ - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else { /* Fill in the event structure */ sap_event_init(sap_event); /* Handle event */ - cdf_status = sap_fsm(sap_context, sap_event); + qdf_status = sap_fsm(sap_context, sap_event); } } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -2189,7 +2189,7 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sap_context->acs_cfg->ch_width = sap_context->ch_width_orig; sap_config_acs_result(h_hal, sap_context, 0); - return CDF_STATUS_E_CANCELED; + return QDF_STATUS_E_CANCELED; } else { /* * Fill in the event structure @@ -2198,7 +2198,7 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, */ sap_event_init(sap_event); /* Handle event */ - cdf_status = sap_fsm(sap_context, sap_event); + qdf_status = sap_fsm(sap_context, sap_event); } } @@ -2213,7 +2213,7 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, FL("before exiting sap_goto_channel_sel channel=%d"), sap_context->channel); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*========================================================================== @@ -2232,17 +2232,17 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sapContext : Sap Context value RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) +QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) { uint32_t type, subType; - CDF_STATUS cdf_ret_status; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (sapContext->csr_roamProfile.csrPersona == CDF_P2P_GO_MODE) @@ -2250,10 +2250,10 @@ CDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) else status = cds_get_vdev_types(CDF_SAP_MODE, &type, &subType); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "failed to get vdev type"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Open SME Session for Softap */ cdf_ret_status = sme_open_session(hHal, @@ -2262,12 +2262,12 @@ CDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) sapContext->self_mac_addr, &sapContext->sessionId, type, subType); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_roam_connect status = %d", __func__, cdf_ret_status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMac->sap.sapCtxList[sapContext->sessionId].sessionID = @@ -2275,7 +2275,7 @@ CDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) pMac->sap.sapCtxList[sapContext->sessionId].pSapContext = sapContext; pMac->sap.sapCtxList[sapContext->sessionId].sapPersona = sapContext->csr_roamProfile.csrPersona; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*========================================================================== @@ -2296,19 +2296,19 @@ CDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) status : Return the SAP status here RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS +QDF_STATUS sap_goto_starting (ptSapContext sapContext, ptWLAN_SAPEvent sapEvent, eCsrRoamBssType bssType) { /* tHalHandle */ tHalHandle hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; /*- - - - - - - - TODO:once configs from hdd available - - - - - - - - -*/ char key_material[32] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, @@ -2324,19 +2324,19 @@ sap_goto_starting /* we have a serious problem */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "In %s, invalid hHal", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sap_open_session(hHal, sapContext); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sap_open_session status = %d", __func__, cdf_ret_status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* sapGotoStarting */ /*========================================================================== @@ -2355,15 +2355,15 @@ sap_goto_starting status : Return the SAP status here RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS sap_goto_disconnecting(ptSapContext sapContext) +QDF_STATUS sap_goto_disconnecting(ptSapContext sapContext) { - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; tHalHandle hHal; hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); @@ -2371,22 +2371,22 @@ CDF_STATUS sap_goto_disconnecting(ptSapContext sapContext) /* we have a serious problem */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, invalid hHal", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sap_free_roam_profile(&sapContext->csr_roamProfile); cdf_ret_status = sme_roam_stop_bss(hHal, sapContext->sessionId); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_roam_stop_bss status = %d", __func__, cdf_ret_status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS sap_roam_session_close_callback(void *pContext) +static QDF_STATUS sap_roam_session_close_callback(void *pContext) { ptSapContext sapContext = (ptSapContext) pContext; return sap_signal_hdd_event(sapContext, NULL, @@ -2411,15 +2411,15 @@ static CDF_STATUS sap_roam_session_close_callback(void *pContext) status : Return the SAP status here RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS sap_goto_disconnected(ptSapContext sapContext) +QDF_STATUS sap_goto_disconnected(ptSapContext sapContext) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; tWLAN_SAPEvent sapEvent; /* Processing has to be coded */ /* Clean up stations from TL etc as AP BSS is shut down then set event */ @@ -2428,9 +2428,9 @@ CDF_STATUS sap_goto_disconnected(ptSapContext sapContext) sapEvent.u1 = 0; sapEvent.u2 = 0; /* Handle event */ - cdf_status = sap_fsm(sapContext, &sapEvent); + qdf_status = sap_fsm(sapContext, &sapEvent); - return cdf_status; + return qdf_status; } /** @@ -2442,13 +2442,13 @@ CDF_STATUS sap_goto_disconnected(ptSapContext sapContext) * * Function for HDD to send the event notification using callback * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, +QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, tCsrRoamInfo *csr_roaminfo, eSapHddEvent sap_hddevent, void *context) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tSap_Event sap_ap_event; /* This now encodes ALL event types */ tHalHandle hal = CDS_GET_HAL_CB(sap_ctx->p_cds_gctx); tpAniSirGlobal mac_ctx; @@ -2464,18 +2464,18 @@ CDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, /* Format the Start BSS Complete event to return... */ if (NULL == sap_ctx->pfnSapEventCallback) { CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (NULL == hal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mac_ctx = PMAC_STRUCT(hal); if (NULL == mac_ctx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid MAC context")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -2763,10 +2763,10 @@ CDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, sap_hddevent); break; } - cdf_status = (*sap_ctx->pfnSapEventCallback) + qdf_status = (*sap_ctx->pfnSapEventCallback) (&sap_ap_event, sap_ctx->pUsrContext); - return cdf_status; + return qdf_status; } @@ -2820,25 +2820,25 @@ ptSapContext sap_find_valid_concurrent_session(tHalHandle hHal) valid : Sap context is valid or no RETURN VALUE - The CDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + The QDF_STATUS code associated with performing the operation + QDF_STATUS_SUCCESS: Success SIDE EFFECTS NA ============================================================================*/ -CDF_STATUS sap_close_session(tHalHandle hHal, +QDF_STATUS sap_close_session(tHalHandle hHal, ptSapContext sapContext, csr_roamSessionCloseCallback callback, bool valid) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (false == valid) { - cdf_status = sme_close_session(hHal, + qdf_status = sme_close_session(hHal, sapContext->sessionId, callback, NULL); } else { - cdf_status = sme_close_session(hHal, + qdf_status = sme_close_session(hHal, sapContext->sessionId, callback, sapContext); } @@ -2869,14 +2869,14 @@ CDF_STATUS sap_close_session(tHalHandle hHal, cdf_mem_zero(&pMac->sap, sizeof(pMac->sap)); } - return cdf_status; + return qdf_status; } /*========================================================================== FUNCTION sap_cac_reset_notify DESCRIPTION Function will be called up on stop bss indication to clean up - DFS global structure. + DFS global structure. DEPENDENCIES PARAMETERS IN hHAL : HAL pointer @@ -2907,20 +2907,20 @@ void sap_cac_reset_notify(tHalHandle hHal) FUNCTION sap_cac_start_notify DESCRIPTION Function will be called to notify eSAP_DFS_CAC_START event - to HDD + to HDD DEPENDENCIES PARAMETERS IN hHAL : HAL pointer - RETURN VALUE : CDF_STATUS. + RETURN VALUE : QDF_STATUS. SIDE EFFECTS ============================================================================*/ -CDF_STATUS sap_cac_start_notify(tHalHandle hHal) +QDF_STATUS sap_cac_start_notify(tHalHandle hHal) { uint8_t intf = 0; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext pSapContext = @@ -2934,41 +2934,41 @@ CDF_STATUS sap_cac_start_notify(tHalHandle hHal) "sapdfs: Signaling eSAP_DFS_CAC_START to HDD for sapctx[%p]", pSapContext); - cdf_status = sap_signal_hdd_event(pSapContext, NULL, + qdf_status = sap_signal_hdd_event(pSapContext, NULL, eSAP_DFS_CAC_START, (void *) eSAP_STATUS_SUCCESS); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, failed setting isCacStartNotified on interface[%d]", __func__, intf); - return cdf_status; + return qdf_status; } pSapContext->isCacStartNotified = true; } } - return cdf_status; + return qdf_status; } /*========================================================================== FUNCTION sap_cac_end_notify DESCRIPTION Function will be called to notify eSAP_DFS_CAC_END event - to HDD + to HDD DEPENDENCIES PARAMETERS IN hHAL : HAL pointer - RETURN VALUE : CDF_STATUS. + RETURN VALUE : QDF_STATUS. SIDE EFFECTS ============================================================================*/ -CDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) +QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) { uint8_t intf; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; /* * eSAP_DFS_CHANNEL_CAC_END: @@ -2985,16 +2985,16 @@ CDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) && pMac->sap.sapCtxList[intf].pSapContext != NULL && (false == pSapContext->isCacEndNotified)) { pSapContext = pMac->sap.sapCtxList[intf].pSapContext; - cdf_status = sap_signal_hdd_event(pSapContext, NULL, + qdf_status = sap_signal_hdd_event(pSapContext, NULL, eSAP_DFS_CAC_END, (void *) eSAP_STATUS_SUCCESS); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, failed setting isCacEndNotified on interface[%d]", __func__, intf); - return cdf_status; + return qdf_status; } pSapContext->isCacEndNotified = true; pMac->sap.SapDfsInfo.sap_radar_found_status = false; @@ -3016,16 +3016,16 @@ CDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) pSapContext->sapsMachine = eSAP_STARTED; /*Action code for transition */ - cdf_status = sap_signal_hdd_event(pSapContext, roamInfo, + qdf_status = sap_signal_hdd_event(pSapContext, roamInfo, eSAP_START_BSS_EVENT, (void *) eSAP_STATUS_SUCCESS); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, failed setting isCacEndNotified on interface[%d]", __func__, intf); - return cdf_status; + return qdf_status; } /* Transition from eSAP_STARTING to eSAP_STARTED @@ -3046,7 +3046,7 @@ CDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) * by checking against eSAP_DFS_SKIP_CAC while starting the timer. */ pMac->sap.SapDfsInfo.cac_state = eSAP_DFS_SKIP_CAC; - return cdf_status; + return qdf_status; } /** @@ -3058,14 +3058,14 @@ CDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) * * This function is called for state transition from "eSAP_DISCONNECTED" * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, +static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event, tpAniSirGlobal mac_ctx, tHalHandle hal) { uint32_t msg = sap_event->event; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; if (msg == eSAP_HDD_START_INFRA_BSS) { /* @@ -3080,7 +3080,7 @@ static CDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, if (sap_ctx->isSapSessionOpen == eSAP_TRUE) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, FL("SME Session is already opened")); - return CDF_STATUS_E_EXISTS; + return QDF_STATUS_E_EXISTS; } sap_ctx->sessionId = 0xff; @@ -3088,13 +3088,13 @@ static CDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, if ((sap_ctx->channel == AUTO_CHANNEL_SELECT) && (sap_ctx->isScanSessionOpen == eSAP_FALSE)) { uint32_t type, subtype; - if (CDF_STATUS_SUCCESS == cds_get_vdev_types( + if (QDF_STATUS_SUCCESS == cds_get_vdev_types( CDF_STA_MODE, &type, &subtype)) { /* Open SME Session for scan */ - cdf_status = sme_open_session(hal, NULL, + qdf_status = sme_open_session(hal, NULL, sap_ctx, sap_ctx->self_mac_addr, &sap_ctx->sessionId, type, subtype); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Error: calling sme_open_session")); @@ -3113,7 +3113,7 @@ static CDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, * Perform sme_ScanRequest. This scan request is post start bss * request so, set the third to false. */ - cdf_status = sap_goto_channel_sel(sap_ctx, sap_event, false); + qdf_status = sap_goto_channel_sel(sap_ctx, sap_event, false); /* * Transition from eSAP_DISCONNECTED to eSAP_CH_SELECT @@ -3138,7 +3138,7 @@ static CDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, sap_start_dfs_cac_timer(sap_ctx); } - cdf_status = sap_cac_start_notify(hal); + qdf_status = sap_cac_start_notify(hal); } else if (msg == eSAP_CHANNEL_SELECTION_RETRY) { /* Set SAP device role */ sap_ctx->sapsMachine = eSAP_CH_SELECT; @@ -3147,14 +3147,14 @@ static CDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, * Perform sme_ScanRequest. This scan request is post start bss * request so, set the third to false. */ - cdf_status = sap_goto_channel_sel(sap_ctx, sap_event, false); + qdf_status = sap_goto_channel_sel(sap_ctx, sap_event, false); } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, event msg %d"), "eSAP_DISCONNECTED", msg); } - return cdf_status; + return qdf_status; } /** @@ -3166,14 +3166,14 @@ static CDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, * * This function is called for state transition from "eSAP_CH_SELECT" * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, +static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event, tpAniSirGlobal mac_ctx, tHalHandle hal) { uint32_t msg = sap_event->event; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; uint32_t cbmode; bool b_leak_chan = false; #ifdef WLAN_ENABLE_CHNL_MATRIX_RESTRICTION @@ -3183,9 +3183,9 @@ static CDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, if (sap_ctx->isScanSessionOpen == eSAP_TRUE) { /* scan completed, so close the session */ - cdf_status = sme_close_session(hal, sap_ctx->sessionId, + qdf_status = sme_close_session(hal, sap_ctx->sessionId, NULL, NULL); - if (CDF_STATUS_SUCCESS != cdf_status) + if (QDF_STATUS_SUCCESS != qdf_status) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CloseSession error event msg %d"), msg); else @@ -3233,7 +3233,7 @@ static CDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_NO_AVAILABLE_CHANNEL, (void *)eSAP_STATUS_SUCCESS); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -3295,7 +3295,7 @@ static CDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, sap_signal_hdd_event(sap_ctx, NULL, eSAP_CHANNEL_CHANGE_EVENT, (void *) eSAP_STATUS_SUCCESS); - cdf_status = sap_goto_starting(sap_ctx, sap_event, + qdf_status = sap_goto_starting(sap_ctx, sap_event, eCSR_BSS_TYPE_INFRA_AP); } else if (msg == eSAP_CHANNEL_SELECTION_FAILED) { sap_ctx->sapsMachine = eSAP_DISCONNECTED; @@ -3313,7 +3313,7 @@ static CDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, "eSAP_CH_SELECT", msg); } - return cdf_status; + return qdf_status; } /** @@ -3325,15 +3325,15 @@ static CDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, * * This function is called for state transition from "eSAP_DFS_CAC_WAIT" * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, +static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event, tpAniSirGlobal mac_ctx, tHalHandle hal) { uint32_t msg = sap_event->event; tCsrRoamInfo *roam_info = (tCsrRoamInfo *) (sap_event->params); - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; if (msg == eSAP_DFS_CHANNEL_CAC_START) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -3341,7 +3341,7 @@ static CDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, "eSAP_CH_SELECT", "eSAP_DFS_CAC_WAIT"); if (mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running != true) sap_start_dfs_cac_timer(sap_ctx); - cdf_status = sap_cac_start_notify(hal); + qdf_status = sap_cac_start_notify(hal); } else if (msg == eSAP_DFS_CHANNEL_CAC_RADAR_FOUND) { uint8_t intf; /* @@ -3386,7 +3386,7 @@ static CDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, } } } else if (msg == eSAP_DFS_CHANNEL_CAC_END) { - cdf_status = sap_cac_end_notify(hal, roam_info); + qdf_status = sap_cac_end_notify(hal, roam_info); } else if (msg == eSAP_HDD_STOP_INFRA_BSS) { /* Transition from eSAP_DFS_CAC_WAIT to eSAP_DISCONNECTING */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -3407,14 +3407,14 @@ static CDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, } sap_ctx->sapsMachine = eSAP_DISCONNECTING; - cdf_status = sap_goto_disconnecting(sap_ctx); + qdf_status = sap_goto_disconnecting(sap_ctx); } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_DFS_CAC_WAIT", msg); } - return cdf_status; + return qdf_status; } /** @@ -3426,16 +3426,16 @@ static CDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, * * This function is called for state transition from "eSAP_STARTING" * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, +static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event, tpAniSirGlobal mac_ctx, tHalHandle hal) { uint32_t msg = sap_event->event; tCsrRoamInfo *roam_info = (tCsrRoamInfo *) (sap_event->params); tSapDfsInfo *sap_dfs_info; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; if (msg == eSAP_MAC_START_BSS_SUCCESS) { /* @@ -3448,7 +3448,7 @@ static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, sap_ctx->sapsMachine = eSAP_STARTED; /* Action code for transition */ - cdf_status = sap_signal_hdd_event(sap_ctx, roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, roam_info, eSAP_START_BSS_EVENT, (void *) eSAP_STATUS_SUCCESS); @@ -3475,7 +3475,7 @@ static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, if (sap_dfs_info->is_dfs_cac_timer_running != true) sap_start_dfs_cac_timer(sap_ctx); - cdf_status = sap_cac_start_notify(hal); + qdf_status = sap_cac_start_notify(hal); } else { wlansap_start_beacon_req(sap_ctx); @@ -3491,10 +3491,10 @@ static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, "eSAP_STARTING", "eSAP_DISCONNECTED"); /*Action code for transition */ - cdf_status = sap_signal_hdd_event(sap_ctx, NULL, + qdf_status = sap_signal_hdd_event(sap_ctx, NULL, eSAP_START_BSS_EVENT, (void *) eSAP_STATUS_FAILURE); - cdf_status = sap_goto_disconnected(sap_ctx); + qdf_status = sap_goto_disconnected(sap_ctx); /* Advance outer statevar */ sap_ctx->sapsMachine = eSAP_DISCONNECTED; } else if (msg == eSAP_HDD_STOP_INFRA_BSS) { @@ -3508,14 +3508,14 @@ static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, /* Advance outer statevar */ sap_ctx->sapsMachine = eSAP_DISCONNECTED; - cdf_status = sap_signal_hdd_event(sap_ctx, NULL, + qdf_status = sap_signal_hdd_event(sap_ctx, NULL, eSAP_START_BSS_EVENT, (void *) eSAP_STATUS_FAILURE); - cdf_status = sap_goto_disconnected(sap_ctx); + qdf_status = sap_goto_disconnected(sap_ctx); /* Close the SME session */ if (eSAP_TRUE == sap_ctx->isSapSessionOpen) { - if (CDF_STATUS_SUCCESS == sap_close_session(hal, + if (QDF_STATUS_SUCCESS == sap_close_session(hal, sap_ctx, NULL, false)) sap_ctx->isSapSessionOpen = eSAP_FALSE; } @@ -3531,7 +3531,7 @@ static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, "eSAP_STARTING", "eSAP_STARTED"); /* Indicate change in the state to upper layers */ - cdf_status = sap_signal_hdd_event(sap_ctx, roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, roam_info, eSAP_START_BSS_EVENT, (void *)eSAP_STATUS_SUCCESS); } else { @@ -3540,7 +3540,7 @@ static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, "eSAP_STARTING", msg); } - return cdf_status; + return qdf_status; } /** @@ -3551,13 +3551,13 @@ static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, * * This function is called for state transition from "eSAP_STARTED" * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, +static QDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event, tpAniSirGlobal mac_ctx) { uint32_t msg = sap_event->event; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; if (msg == eSAP_HDD_STOP_INFRA_BSS) { /* @@ -3568,7 +3568,7 @@ static CDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, FL("from state %s => %s"), "eSAP_STARTED", "eSAP_DISCONNECTING"); sap_ctx->sapsMachine = eSAP_DISCONNECTING; - cdf_status = sap_goto_disconnecting(sap_ctx); + qdf_status = sap_goto_disconnecting(sap_ctx); } else if (eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START == msg) { uint8_t intf; /* @@ -3590,7 +3590,7 @@ static CDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, FL("sapdfs: Sending CSAIE for sapctx[%p]"), temp_sap_ctx); - cdf_status = wlansap_dfs_send_csa_ie_request( + qdf_status = wlansap_dfs_send_csa_ie_request( (void *) temp_sap_ctx); } } @@ -3600,7 +3600,7 @@ static CDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, "eSAP_STARTED", msg); } - return cdf_status; + return qdf_status; } /** @@ -3611,14 +3611,14 @@ static CDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, * * This function is called for state transition from "eSAP_DISCONNECTING" * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, +static QDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event, tpAniSirGlobal mac_ctx, tHalHandle hal) { uint32_t msg = sap_event->event; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; if (msg == eSAP_MAC_READY_FOR_CONNECTIONS) { /* @@ -3633,10 +3633,10 @@ static CDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, /* Close the SME session */ if (eSAP_TRUE == sap_ctx->isSapSessionOpen) { sap_ctx->isSapSessionOpen = eSAP_FALSE; - cdf_status = sap_close_session(hal, sap_ctx, + qdf_status = sap_close_session(hal, sap_ctx, sap_roam_session_close_callback, true); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { - cdf_status = sap_signal_hdd_event(sap_ctx, NULL, + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + qdf_status = sap_signal_hdd_event(sap_ctx, NULL, eSAP_STOP_BSS_EVENT, (void *)eSAP_STATUS_SUCCESS); } @@ -3649,7 +3649,7 @@ static CDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, * Most likely, radar has been detected and SAP wants to * change the channel */ - cdf_status = wlansap_channel_change_request((void *) sap_ctx, + qdf_status = wlansap_channel_change_request((void *) sap_ctx, mac_ctx->sap.SapDfsInfo.target_channel); CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, @@ -3660,7 +3660,7 @@ static CDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, "eSAP_DISCONNECTING", msg); } - return cdf_status; + return qdf_status; } /** @@ -3670,9 +3670,9 @@ static CDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, * * SAP statem machine entry function * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sap_fsm(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event) +QDF_STATUS sap_fsm(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event) { /* * Retrieve the phy link state machine structure @@ -3681,21 +3681,21 @@ CDF_STATUS sap_fsm(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event) */ eSapFsmStates_t state_var = sap_ctx->sapsMachine; uint32_t msg = sap_event->event; /* State machine input event message */ - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; tHalHandle hal = CDS_GET_HAL_CB(sap_ctx->p_cds_gctx); tpAniSirGlobal mac_ctx; if (NULL == hal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mac_ctx = PMAC_STRUCT(hal); if (NULL == mac_ctx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid MAC context")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, @@ -3704,36 +3704,36 @@ CDF_STATUS sap_fsm(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event) switch (state_var) { case eSAP_DISCONNECTED: - cdf_status = sap_fsm_state_disconnected(sap_ctx, sap_event, + qdf_status = sap_fsm_state_disconnected(sap_ctx, sap_event, mac_ctx, hal); break; case eSAP_CH_SELECT: - cdf_status = sap_fsm_state_ch_select(sap_ctx, sap_event, + qdf_status = sap_fsm_state_ch_select(sap_ctx, sap_event, mac_ctx, hal); break; case eSAP_DFS_CAC_WAIT: - cdf_status = sap_fsm_state_dfs_cac_wait(sap_ctx, sap_event, + qdf_status = sap_fsm_state_dfs_cac_wait(sap_ctx, sap_event, mac_ctx, hal); break; case eSAP_STARTING: - cdf_status = sap_fsm_state_starting(sap_ctx, sap_event, + qdf_status = sap_fsm_state_starting(sap_ctx, sap_event, mac_ctx, hal); break; case eSAP_STARTED: - cdf_status = sap_fsm_state_started(sap_ctx, sap_event, + qdf_status = sap_fsm_state_started(sap_ctx, sap_event, mac_ctx); break; case eSAP_DISCONNECTING: - cdf_status = sap_fsm_state_disconnecting(sap_ctx, sap_event, + qdf_status = sap_fsm_state_disconnecting(sap_ctx, sap_event, mac_ctx, hal); break; } - return cdf_status; + return qdf_status; } eSapStatus @@ -4062,25 +4062,25 @@ void sap_print_acl(struct cdf_mac_addr *macList, uint8_t size) return; } -CDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) +QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) { if (eSAP_ALLOW_ALL == sapContext->eSapMacAddrAclMode) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; if (sap_search_mac_list (sapContext->acceptMacList, sapContext->nAcceptMac, peerMac, NULL)) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; if (sap_search_mac_list (sapContext->denyMacList, sapContext->nDenyMac, peerMac, NULL)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Peer " MAC_ADDRESS_STR " in deny list", __func__, MAC_ADDR_ARRAY(peerMac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* A new station CAN associate, unless in deny list. Less stringent mode */ if (eSAP_ACCEPT_UNLESS_DENIED == sapContext->eSapMacAddrAclMode) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; /* A new station CANNOT associate, unless in accept list. More stringent mode */ if (eSAP_DENY_UNLESS_ACCEPTED == sapContext->eSapMacAddrAclMode) { @@ -4088,7 +4088,7 @@ CDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) "In %s, Peer " MAC_ADDRESS_STR " denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED", __func__, MAC_ADDR_ARRAY(peerMac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* The new STA is neither in accept list nor in deny list. In this case, deny the association @@ -4101,9 +4101,9 @@ CDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) "In %s, Peer " MAC_ADDRESS_STR " denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY", __func__, MAC_ADDR_ARRAY(peerMac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef SOFTAP_CHANNEL_RANGE @@ -4115,9 +4115,9 @@ CDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) * * This function populates the list of channels for scanning. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, +static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, uint8_t **ch_list, uint8_t *num_ch) { @@ -4138,7 +4138,7 @@ static CDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, FL("Invalid HAL pointer from p_cds_gctx")); *num_ch = 0; *ch_list = NULL; - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } start_ch_num = sap_ctx->acs_cfg->start_ch; @@ -4176,7 +4176,7 @@ static CDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, FL("Unable to allocate channel list")); *num_ch = 0; *ch_list = NULL; - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /* Search for the Active channels in the given range */ @@ -4273,7 +4273,7 @@ static CDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, FL("channel number: %d"), list[loop_count]); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -4281,14 +4281,14 @@ static CDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, * Function for initializing list of 2.4/5 Ghz [NON-DFS/DFS] * available channels in the current regulatory domain. */ -static CDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) +static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) { uint8_t count = 0; int i; if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid sapContext pointer on sap_get_channel_list"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (sapContext->SapAllChnlList.channelList) { @@ -4302,7 +4302,7 @@ static CDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) if (NULL == sapContext->SapAllChnlList.channelList) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, " Memory Allocation failed sap_get_channel_list"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } for (i = RF_CHAN_36; i <= RF_CHAN_165; i++) { @@ -4326,7 +4326,7 @@ static CDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) "sapContext->SapAllChnlList.numChannel = %d", __func__, __LINE__, count, sapContext->SapAllChnlList.numChannel); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* @@ -4511,7 +4511,7 @@ sap_is_channel_bonding_etsi_weather_channel(ptSapContext sap_context) */ int sap_start_dfs_cac_timer(ptSapContext sapContext) { - CDF_STATUS status; + QDF_STATUS status; uint32_t cacTimeOut; tHalHandle hHal = NULL; tpAniSirGlobal pMac = NULL; @@ -4557,7 +4557,7 @@ int sap_start_dfs_cac_timer(ptSapContext sapContext) status = cdf_mc_timer_start(&pMac->sap.SapDfsInfo.sap_dfs_cac_timer, cacTimeOut); - if (status == CDF_STATUS_SUCCESS) { + if (status == QDF_STATUS_SUCCESS) { pMac->sap.SapDfsInfo.is_dfs_cac_timer_running = true; return 1; } else { @@ -4570,7 +4570,7 @@ int sap_start_dfs_cac_timer(ptSapContext sapContext) * parameters required to track the radar * found DFS channels in the current Reg. Domain . */ -CDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) +QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) { uint8_t count = 0; int i; @@ -4581,19 +4581,19 @@ CDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid sapContext pointer on sap_init_dfs_channel_nol_list"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); /* to indicate hdd to get cnss dfs nol */ - if (CDF_STATUS_SUCCESS == sap_signal_hdd_event(sapContext, NULL, + if (QDF_STATUS_SUCCESS == sap_signal_hdd_event(sapContext, NULL, eSAP_DFS_NOL_GET, (void *) eSAP_STATUS_SUCCESS)) { @@ -4632,7 +4632,7 @@ CDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) __func__, __LINE__, pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h index 1abf9c8e32..86f2781143 100644 --- a/core/sap/src/sap_internal.h +++ b/core/sap/src/sap_internal.h @@ -289,13 +289,13 @@ typedef struct sWLAN_SAPEvent { * Function Declarations and Documentation * -------------------------------------------------------------------------*/ -CDF_STATUS +QDF_STATUS wlansap_scan_callback (tHalHandle halHandle, void *pContext, uint8_t sessionId, uint32_t scanID, eCsrScanStatus scanStatus); -CDF_STATUS +QDF_STATUS wlansap_pre_start_bss_acs_scan_callback( tHalHandle hal_handle, void *pcontext, @@ -304,29 +304,29 @@ wlansap_pre_start_bss_acs_scan_callback( eCsrScanStatus scan_status ); -CDF_STATUS +QDF_STATUS wlansap_roam_callback (void *pContext, tCsrRoamInfo *pCsrRoamInfo, uint32_t roamId, eRoamCmdStatus roamStatus, eCsrRoamResult roamResult); -CDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag); -CDF_STATUS SapFsm(ptSapContext sapContext, ptWLAN_SAPEvent sapEvent, +QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag); +QDF_STATUS SapFsm(ptSapContext sapContext, ptWLAN_SAPEvent sapEvent, uint8_t *status); void -wlansap_pmc_full_pwr_req_cb(void *callbackContext, CDF_STATUS status); +wlansap_pmc_full_pwr_req_cb(void *callbackContext, QDF_STATUS status); uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, tScanResultHandle pScanResult); -CDF_STATUS +QDF_STATUS sap_signal_hdd_event(ptSapContext sapContext, tCsrRoamInfo *pCsrRoamInfo, eSapHddEvent sapHddevent, void *); -CDF_STATUS sap_fsm(ptSapContext sapContext, ptWLAN_SAPEvent sapEvent); +QDF_STATUS sap_fsm(ptSapContext sapContext, ptWLAN_SAPEvent sapEvent); eSapStatus sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, @@ -335,7 +335,7 @@ sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, void sap_free_roam_profile(tCsrRoamProfile *profile); -CDF_STATUS +QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac); void @@ -356,9 +356,9 @@ eSapBool sap_search_mac_list(struct cdf_mac_addr *macList, uint8_t num_mac, uint8_t *peerMac, uint8_t *index); -CDF_STATUS sap_acquire_global_lock(ptSapContext pSapCtx); +QDF_STATUS sap_acquire_global_lock(ptSapContext pSapCtx); -CDF_STATUS sap_release_global_lock(ptSapContext pSapCtx); +QDF_STATUS sap_release_global_lock(ptSapContext pSapCtx); #ifdef FEATURE_WLAN_CH_AVOID void sap_update_unsafe_channel_list(ptSapContext pSapCtx); @@ -368,7 +368,7 @@ uint8_t sap_indicate_radar(ptSapContext sapContext, tSirSmeDfsEventInd *dfs_event); -CDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext); +QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext); bool sap_dfs_is_channel_in_nol_list(ptSapContext sapContext, uint8_t channelNumber, @@ -395,7 +395,7 @@ bool sap_dfs_is_w53_invalid(tHalHandle hHal, uint8_t channelID); bool sap_dfs_is_channel_in_preferred_location(tHalHandle hHal, uint8_t channelID); -CDF_STATUS sap_goto_channel_sel( +QDF_STATUS sap_goto_channel_sel( ptSapContext sapContext, ptWLAN_SAPEvent sapEvent, bool sap_do_acs_pre_start_bss); diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 63b9981bf2..1e23e87492 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -139,11 +139,11 @@ void *wlansap_open(void *p_cds_gctx) * use this call to register with TL as the SAP entity for SAP RSN frames. * * Return: The result code associated with performing the operation - * CDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; + * QDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; * access would cause a page fault. - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_start(void *pCtx) +QDF_STATUS wlansap_start(void *pCtx) { ptSapContext pSapCtx = NULL; @@ -160,7 +160,7 @@ CDF_STATUS wlansap_start(void *pCtx) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /*------------------------------------------------------------------------ @@ -185,13 +185,13 @@ CDF_STATUS wlansap_start(void *pCtx) /* Now configure the auth type in the roaming profile. To open. */ pSapCtx->csr_roamProfile.negotiatedAuthType = eCSR_AUTH_TYPE_OPEN_SYSTEM; /* open is the default */ - if (!CDF_IS_STATUS_SUCCESS(cdf_mutex_init(&pSapCtx->SapGlobalLock))) { + if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init(&pSapCtx->SapGlobalLock))) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "wlansap_start failed init lock"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -205,11 +205,11 @@ CDF_STATUS wlansap_start(void *pCtx) * close request to clean up its resources. * * Return: The result code associated with performing the operation - * CDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; + * QDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; * access would cause a page fault. - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_stop(void *pCtx) +QDF_STATUS wlansap_stop(void *pCtx) { ptSapContext pSapCtx = NULL; @@ -221,18 +221,18 @@ CDF_STATUS wlansap_stop(void *pCtx) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sap_free_roam_profile(&pSapCtx->csr_roamProfile); - if (!CDF_IS_STATUS_SUCCESS(cdf_mutex_destroy(&pSapCtx->SapGlobalLock))) { + if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_destroy(&pSapCtx->SapGlobalLock))) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "wlansap_stop failed destroy lock"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -245,11 +245,11 @@ CDF_STATUS wlansap_stop(void *pCtx) * all the internal resources. * * Return: The result code associated with performing the operation - * CDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; + * QDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; * access would cause a page fault - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_close(void *pCtx) +QDF_STATUS wlansap_close(void *pCtx) { ptSapContext pSapCtx = NULL; @@ -261,7 +261,7 @@ CDF_STATUS wlansap_close(void *pCtx) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* Cleanup SAP control block */ @@ -273,7 +273,7 @@ CDF_STATUS wlansap_close(void *pCtx) cdf_mem_free(pSapCtx); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* wlansap_close */ /*---------------------------------------------------------------------------- @@ -289,11 +289,11 @@ CDF_STATUS wlansap_close(void *pCtx) * Clear out all fields in the SAP context. * * Return: The result code associated with performing the operation - * CDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; + * QDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; * access would cause a page fault - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / *do not empty* /); */ +QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / *do not empty* /); */ ) { /*------------------------------------------------------------------------ Sanity check SAP control block @@ -302,7 +302,7 @@ CDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /*------------------------------------------------------------------------ @@ -324,7 +324,7 @@ CDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / pSapCtx->channel = 0; pSapCtx->isSapSessionOpen = eSAP_FALSE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* wlansap_clean_cb */ /*========================================================================== @@ -347,9 +347,9 @@ CDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / SIDE EFFECTS ============================================================================*/ void -wlansap_pmc_full_pwr_req_cb(void *callbackContext, CDF_STATUS status) +wlansap_pmc_full_pwr_req_cb(void *callbackContext, QDF_STATUS status) { - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* If success what else to be handled??? */ } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, @@ -378,7 +378,7 @@ uint8_t wlansap_get_state(void *pCtx) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } return pSapCtx->sapsMachine; } @@ -430,7 +430,7 @@ uint16_t wlansap_check_cc_intf(void *Ctx) * Return: The result code associated with * performing the operation */ -CDF_STATUS +QDF_STATUS wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig, ptSapContext psap_ctx, void *pusr_context) @@ -440,13 +440,13 @@ wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig, if (NULL == pconfig) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pconfig passed ", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (NULL == psap_ctx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pconfig passed ", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* Channel selection is auto or configured */ @@ -492,7 +492,7 @@ wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig, } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** * wlan_sap_get_vht_ch_width() - Returns SAP VHT channel width. @@ -580,15 +580,15 @@ static inline bool wlan_sap_validate_channel_switch(tHalHandle hal, * starting AP BSS * * Return: The result code associated with performing the operation - * CDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; + * QDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; * access would cause a page fault - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ +QDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ tpWLAN_SAPEventCB pSapEventCallback, tsap_Config_t *pConfig, void *pUsrContext) { tWLAN_SAPEvent sapEvent; /* State machine event */ - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; ptSapContext pSapCtx = NULL; tHalHandle hHal; tpAniSirGlobal pmac = NULL; @@ -608,7 +608,7 @@ CDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pSapCtx->sapsMachine = eSAP_DISCONNECTED; @@ -648,7 +648,7 @@ CDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid MAC context from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } else { /* If concurrent session is running that is already associated * then we just follow that sessions country info (whether @@ -667,7 +667,7 @@ CDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid MAC context from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* * Copy the DFS Test Mode setting to pmac for @@ -694,9 +694,9 @@ CDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ pSapCtx->pfnSapEventCallback = pSapEventCallback; /* Handle event */ - cdf_status = sap_fsm(pSapCtx, &sapEvent); + qdf_status = sap_fsm(pSapCtx, &sapEvent); - return cdf_status; + return qdf_status; } /* wlansap_start_bss */ /** @@ -710,13 +710,13 @@ CDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ * as deny list * * Return: The result code associated with performing the operation - * CDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; + * QDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; * access would cause a page fault - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_set_mac_acl(void *pCtx, /* pwextCtx */ +QDF_STATUS wlansap_set_mac_acl(void *pCtx, /* pwextCtx */ tsap_Config_t *pConfig) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; ptSapContext pSapCtx = NULL; CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -727,7 +727,7 @@ CDF_STATUS wlansap_set_mac_acl(void *pCtx, /* pwextCtx */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* Copy MAC filtering settings to sap context */ pSapCtx->eSapMacAddrAclMode = pConfig->SapMacaddr_acl; @@ -747,7 +747,7 @@ CDF_STATUS wlansap_set_mac_acl(void *pCtx, /* pwextCtx */ sap_sort_mac_list(pSapCtx->denyMacList, pSapCtx->nDenyMac); } - return cdf_status; + return qdf_status; } /* wlansap_set_mac_acl */ /** @@ -760,14 +760,14 @@ CDF_STATUS wlansap_set_mac_acl(void *pCtx, /* pwextCtx */ * stopping AP BSS * * Return: The result code associated with performing the operation - * CDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; + * QDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; * access would cause a page fault - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_stop_bss(void *pCtx) +QDF_STATUS wlansap_stop_bss(void *pCtx) { tWLAN_SAPEvent sapEvent; /* State machine event */ - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; ptSapContext pSapCtx = NULL; /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/ @@ -778,7 +778,7 @@ CDF_STATUS wlansap_stop_bss(void *pCtx) if (NULL == pCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid Global CDS handle", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -786,7 +786,7 @@ CDF_STATUS wlansap_stop_bss(void *pCtx) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* Fill in the event structure for FSM */ @@ -794,9 +794,9 @@ CDF_STATUS wlansap_stop_bss(void *pCtx) sapEvent.params = 0; /* Handle event */ - cdf_status = sap_fsm(pSapCtx, &sapEvent); + qdf_status = sap_fsm(pSapCtx, &sapEvent); - return cdf_status; + return qdf_status; } /** @@ -815,9 +815,9 @@ CDF_STATUS wlansap_stop_bss(void *pCtx) * NOTE: The memory for this list will be allocated by the caller of this API * * Return: The result code associated with performing the operation - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS +QDF_STATUS wlansap_get_assoc_stations (void *pCtx, CDF_MODULE_ID modId, tpSap_AssocMacAddr pAssocStas) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -829,7 +829,7 @@ wlansap_get_assoc_stations if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sme_roam_get_associated_stas(CDS_GET_HAL_CB(pSapCtx->p_cds_gctx), @@ -838,7 +838,7 @@ wlansap_get_assoc_stations (void **) pSapCtx->pfnSapEventCallback, (uint8_t *) pAssocStas); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -851,12 +851,12 @@ wlansap_get_assoc_stations * This api function provides for Ap App/HDD to remove an entry from session * overlap info. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success - * CDF_STATUS_E_FAULT: Session is not dectected. + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success + * QDF_STATUS_E_FAULT: Session is not dectected. * The parameter is function not valid. */ -CDF_STATUS +QDF_STATUS wlansap_remove_wps_session_overlap(void *pCtx, struct cdf_mac_addr pRemoveMac) { @@ -869,7 +869,7 @@ wlansap_remove_wps_session_overlap(void *pCtx, if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sme_roam_get_wps_session_overlap(CDS_GET_HAL_CB(pSapCtx->p_cds_gctx), @@ -877,7 +877,7 @@ wlansap_remove_wps_session_overlap(void *pCtx, (void **) pSapCtx->pfnSapEventCallback, pRemoveMac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -888,10 +888,10 @@ wlansap_remove_wps_session_overlap(void *pCtx, * * This api function provides for Ap App/HDD to get WPS session overlap info. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_get_wps_session_overlap(void *pCtx) +QDF_STATUS wlansap_get_wps_session_overlap(void *pCtx) { struct cdf_mac_addr pRemoveMac = CDF_MAC_ADDR_ZERO_INITIALIZER; @@ -904,7 +904,7 @@ CDF_STATUS wlansap_get_wps_session_overlap(void *pCtx) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sme_roam_get_wps_session_overlap(CDS_GET_HAL_CB(pSapCtx->p_cds_gctx), @@ -912,41 +912,41 @@ CDF_STATUS wlansap_get_wps_session_overlap(void *pCtx) (void **) pSapCtx->pfnSapEventCallback, pRemoveMac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* This routine will set the mode of operation for ACL dynamically*/ -CDF_STATUS wlansap_set_mode(void *pCtx, uint32_t mode) +QDF_STATUS wlansap_set_mode(void *pCtx, uint32_t mode) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pSapCtx->eSapMacAddrAclMode = (eSapMacAddrACL) mode; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* Get ACL Mode */ -CDF_STATUS wlansap_get_acl_mode(void *pCtx, eSapMacAddrACL *mode) +QDF_STATUS wlansap_get_acl_mode(void *pCtx, eSapMacAddrACL *mode) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } *mode = pSapCtx->eSapMacAddrAclMode; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* API to get ACL Accept List */ -CDF_STATUS +QDF_STATUS wlansap_get_acl_accept_list(void *pCtx, struct cdf_mac_addr *pAcceptList, uint8_t *nAcceptList) { @@ -954,17 +954,17 @@ wlansap_get_acl_accept_list(void *pCtx, struct cdf_mac_addr *pAcceptList, if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } memcpy((void *)pAcceptList, (void *)pSapCtx->acceptMacList, (pSapCtx->nAcceptMac * CDF_MAC_ADDR_SIZE)); *nAcceptList = pSapCtx->nAcceptMac; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* API to get Deny List */ -CDF_STATUS +QDF_STATUS wlansap_get_acl_deny_list(void *pCtx, struct cdf_mac_addr *pDenyList, uint8_t *nDenyList) { @@ -972,24 +972,24 @@ wlansap_get_acl_deny_list(void *pCtx, struct cdf_mac_addr *pDenyList, if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } memcpy((void *)pDenyList, (void *)pSapCtx->denyMacList, (pSapCtx->nDenyMac * CDF_MAC_ADDR_SIZE)); *nDenyList = pSapCtx->nDenyMac; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* This routine will clear all the entries in accept list as well as deny list */ -CDF_STATUS wlansap_clear_acl(void *pCtx) +QDF_STATUS wlansap_clear_acl(void *pCtx) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); uint8_t i; if (NULL == pSapCtx) { - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } if (pSapCtx->denyMacList != NULL) { @@ -1012,7 +1012,7 @@ CDF_STATUS wlansap_clear_acl(void *pCtx) sap_print_acl(pSapCtx->acceptMacList, pSapCtx->nAcceptMac); pSapCtx->nAcceptMac = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* @@ -1029,7 +1029,7 @@ CDF_STATUS wlansap_clear_acl(void *pCtx) * Return: Status */ -CDF_STATUS +QDF_STATUS wlansap_modify_acl (void *ctx, uint8_t *peer_sta_mac, eSapACLType list_type, eSapACLCmdType cmd) { @@ -1040,7 +1040,7 @@ wlansap_modify_acl if (NULL == sap_ctx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP Context", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, @@ -1069,7 +1069,7 @@ wlansap_modify_acl " found in white and black lists." "Initial lists passed incorrect. Cannot execute this command.", MAC_ADDR_ARRAY(peer_sta_mac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, @@ -1086,7 +1086,7 @@ wlansap_modify_acl "White list is already maxed out. Cannot accept " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (sta_white_list) { /* Do nothing if already present in white list. Just print a warning */ @@ -1095,7 +1095,7 @@ wlansap_modify_acl "MAC address already present in white list " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (sta_black_list) { /* remove it from black list before adding to the white list */ @@ -1146,12 +1146,12 @@ wlansap_modify_acl "MAC address to be deleted is not present in the white list " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid cmd type passed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } break; @@ -1167,7 +1167,7 @@ wlansap_modify_acl "Black list is already maxed out. Cannot accept " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (sta_black_list) { /* Do nothing if already present in white list */ @@ -1176,7 +1176,7 @@ wlansap_modify_acl "MAC address already present in black list " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (sta_white_list) { /* remove it from white list before adding to the black list */ @@ -1224,12 +1224,12 @@ wlansap_modify_acl "MAC address to be deleted is not present in the black list " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid cmd type passed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } break; @@ -1237,7 +1237,7 @@ wlansap_modify_acl { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid list type passed %d", list_type); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, @@ -1248,7 +1248,7 @@ wlansap_modify_acl CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "*** BLACK LIST ***"); sap_print_acl(sap_ctx->denyMacList, sap_ctx->nDenyMac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1260,10 +1260,10 @@ wlansap_modify_acl * * This api function provides for Ap App/HDD initiated disassociation of station * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_disassoc_sta(void *pCtx, const uint8_t *pPeerStaMac) +QDF_STATUS wlansap_disassoc_sta(void *pCtx, const uint8_t *pPeerStaMac) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -1274,13 +1274,13 @@ CDF_STATUS wlansap_disassoc_sta(void *pCtx, const uint8_t *pPeerStaMac) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sme_roam_disconnect_sta(CDS_GET_HAL_CB(pSapCtx->p_cds_gctx), pSapCtx->sessionId, pPeerStaMac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1294,13 +1294,13 @@ CDF_STATUS wlansap_disassoc_sta(void *pCtx, const uint8_t *pPeerStaMac) * This api function provides for Ap App/HDD initiated deauthentication of * station * - * Return: The CDF_STATUS code associated with performing the operation + * Return: The QDF_STATUS code associated with performing the operation */ -CDF_STATUS wlansap_deauth_sta(void *pCtx, +QDF_STATUS wlansap_deauth_sta(void *pCtx, struct tagCsrDelStaParams *pDelStaParams) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; - CDF_STATUS cdf_status = CDF_STATUS_E_FAULT; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); /*------------------------------------------------------------------------ @@ -1310,17 +1310,17 @@ CDF_STATUS wlansap_deauth_sta(void *pCtx, if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return cdf_status; + return qdf_status; } cdf_ret_status = sme_roam_deauth_sta(CDS_GET_HAL_CB(pSapCtx->p_cds_gctx), pSapCtx->sessionId, pDelStaParams); - if (cdf_ret_status == CDF_STATUS_SUCCESS) { - cdf_status = CDF_STATUS_SUCCESS; + if (cdf_ret_status == QDF_STATUS_SUCCESS) { + qdf_status = QDF_STATUS_SUCCESS; } - return cdf_status; + return qdf_status; } /** @@ -1359,9 +1359,9 @@ static inline void wlansap_update_bw80_cbmode(uint32_t channel, * @sap_context: sap adapter context * @channel: target channel * - * Return: The CDF_STATUS code associated with performing the operation + * Return: The QDF_STATUS code associated with performing the operation */ -static CDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, +static QDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, uint32_t channel) { void *hal; @@ -1372,7 +1372,7 @@ static CDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, if (!hal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hal pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } mac_ctx = PMAC_STRUCT(hal); @@ -1421,7 +1421,7 @@ static CDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1433,9 +1433,9 @@ static CDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, * This api function does a channel change to the target channel specified. * CSA IE is included in the beacons before doing a channel change. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS +QDF_STATUS wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, phy_ch_width target_bw) { @@ -1445,21 +1445,21 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, tpAniSirGlobal pMac = NULL; void *hHal = NULL; bool valid; - CDF_STATUS status; + QDF_STATUS status; sapContext = CDS_GET_SAP_CB(p_cds_gctx); if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); @@ -1483,7 +1483,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Channel switch to %u is not allowed due to concurrent channel interference"), targetChannel); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* * Post a CSA IE request to SAP state machine with @@ -1494,7 +1494,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, if (eSAP_STARTED == sapContext->sapsMachine) { status = wlansap_update_csa_channel_params(sapContext, targetChannel); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) return status; /* @@ -1574,7 +1574,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Failed to request Channel Change, since" "SAP is not in eSAP_STARTED state", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } } else { @@ -1582,7 +1582,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, "%s: Channel = %d is not valid in the current" "regulatory domain", __func__, targetChannel); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1590,7 +1590,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, "successfully to sap_fsm for Channel = %d", __func__, targetChannel); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1612,10 +1612,10 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, * Once the 60 seconds timer expires, Authenticator will disable the counter * meassure at core stack. Now core stack can allow STAs to associate. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_set_counter_measure(void *pCtx, bool bEnable) +QDF_STATUS wlansap_set_counter_measure(void *pCtx, bool bEnable) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -1626,13 +1626,13 @@ CDF_STATUS wlansap_set_counter_measure(void *pCtx, bool bEnable) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sme_roam_tkip_counter_measures(CDS_GET_HAL_CB(pSapCtx->p_cds_gctx), pSapCtx->sessionId, bEnable); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1644,15 +1644,15 @@ CDF_STATUS wlansap_set_counter_measure(void *pCtx, bool bEnable) * * This api function provides for Ap App/HDD to set key for a station. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo) +QDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; uint32_t roamId = 0xFF; pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -1660,25 +1660,25 @@ CDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_roam_set_key(hHal, pSapCtx->sessionId, pSetKeyInfo, &roamId); - if (cdf_ret_status == CDF_STATUS_SUCCESS) - cdf_status = CDF_STATUS_SUCCESS; + if (cdf_ret_status == QDF_STATUS_SUCCESS) + qdf_status = QDF_STATUS_SUCCESS; else - cdf_status = CDF_STATUS_E_FAULT; + qdf_status = QDF_STATUS_E_FAULT; - return cdf_status; + return qdf_status; } /** @@ -1690,13 +1690,13 @@ CDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo) * * Populate RSN IE from CSR to HDD context * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS +QDF_STATUS wlan_sap_getstation_ie_information (void *ctx, uint32_t *len, uint8_t *buf) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; ptSapContext sap_ctx = NULL; uint32_t ie_len = 0; @@ -1704,7 +1704,7 @@ wlan_sap_getstation_ie_information if (NULL == sap_ctx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid SAP pointer from pCtx")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (len) { @@ -1720,10 +1720,10 @@ wlan_sap_getstation_ie_information FL("WPAIE: %02x:%02x:%02x:%02x:%02x:%02x"), buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]); - cdf_status = CDF_STATUS_SUCCESS; + qdf_status = QDF_STATUS_SUCCESS; } } - return cdf_status; + return qdf_status; } /** @@ -1735,10 +1735,10 @@ wlan_sap_getstation_ie_information * * This api function provides API for App/HDD to set WPS IE. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwise. + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwise. */ -CDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) +QDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) { ptSapContext pSapCtx = NULL; void *hHal = NULL; @@ -1751,7 +1751,7 @@ CDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); @@ -1759,10 +1759,10 @@ CDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - if (sap_acquire_global_lock(pSapCtx) == CDF_STATUS_SUCCESS) { + if (sap_acquire_global_lock(pSapCtx) == QDF_STATUS_SUCCESS) { if (pSap_WPSIe->sapWPSIECode == eSAP_WPS_BEACON_IE) { cdf_mem_copy(&pSapCtx->APWPSIEs.SirWPSBeaconIE, &pSap_WPSIe->sapwpsie. @@ -1777,12 +1777,12 @@ CDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) sizeof(tSap_WPSProbeRspIE)); } else { sap_release_global_lock(pSapCtx); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sap_release_global_lock(pSapCtx); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /** @@ -1793,14 +1793,14 @@ CDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) * * This api function provides API for App/HDD to update WPS IE. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwise. + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwise. */ -CDF_STATUS wlansap_update_wps_ie(void *pCtx) +QDF_STATUS wlansap_update_wps_ie(void *pCtx) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAULT; + QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; ptSapContext pSapCtx = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, @@ -1811,7 +1811,7 @@ CDF_STATUS wlansap_update_wps_ie(void *pCtx) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); @@ -1819,19 +1819,19 @@ CDF_STATUS wlansap_update_wps_ie(void *pCtx) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_roam_update_apwpsie(hHal, pSapCtx->sessionId, &pSapCtx->APWPSIEs); - if (cdf_ret_status == CDF_STATUS_SUCCESS) - cdf_status = CDF_STATUS_SUCCESS; + if (cdf_ret_status == QDF_STATUS_SUCCESS) + qdf_status = QDF_STATUS_SUCCESS; else - cdf_status = CDF_STATUS_E_FAULT; + qdf_status = QDF_STATUS_E_FAULT; - return cdf_status; + return qdf_status; } /** @@ -1844,10 +1844,10 @@ CDF_STATUS wlansap_update_wps_ie(void *pCtx) * * This api function provides for Ap App/HDD to check if WPS session in process. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) +QDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) { ptSapContext pSapCtx = NULL; void *hHal = NULL; @@ -1860,7 +1860,7 @@ CDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); @@ -1868,10 +1868,10 @@ CDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - if (sap_acquire_global_lock(pSapCtx) == CDF_STATUS_SUCCESS) { + if (sap_acquire_global_lock(pSapCtx) == QDF_STATUS_SUCCESS) { if (pSapCtx->APWPSIEs.SirWPSProbeRspIE. FieldPresent & SIR_WPS_PROBRSP_SELECTEDREGISTRA_PRESENT) @@ -1881,32 +1881,32 @@ CDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) sap_release_global_lock(pSapCtx); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } -CDF_STATUS sap_acquire_global_lock(ptSapContext pSapCtx) +QDF_STATUS sap_acquire_global_lock(ptSapContext pSapCtx) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAULT; + QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; - if (CDF_IS_STATUS_SUCCESS(cdf_mutex_acquire(&pSapCtx->SapGlobalLock))) { - cdf_status = CDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(cdf_mutex_acquire(&pSapCtx->SapGlobalLock))) { + qdf_status = QDF_STATUS_SUCCESS; } - return cdf_status; + return qdf_status; } -CDF_STATUS sap_release_global_lock(ptSapContext pSapCtx) +QDF_STATUS sap_release_global_lock(ptSapContext pSapCtx) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAULT; + QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; - if (CDF_IS_STATUS_SUCCESS(cdf_mutex_release(&pSapCtx->SapGlobalLock))) { - cdf_status = CDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(cdf_mutex_release(&pSapCtx->SapGlobalLock))) { + qdf_status = QDF_STATUS_SUCCESS; } - return cdf_status; + return qdf_status; } /** @@ -1920,13 +1920,13 @@ CDF_STATUS sap_release_global_lock(ptSapContext pSapCtx) * This api function provides for Ap App/HDD to set AP WPA and RSN IE in its * beacon and probe response. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwise + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwise */ -CDF_STATUS wlansap_set_wparsn_ies +QDF_STATUS wlansap_set_wparsn_ies (void *pCtx, uint8_t *pWPARSNIEs, uint32_t WPARSNIEsLen) { ptSapContext pSapCtx = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -1934,7 +1934,7 @@ CDF_STATUS wlansap_set_wparsn_ies CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); @@ -1942,7 +1942,7 @@ CDF_STATUS wlansap_set_wparsn_ies CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pSapCtx->APWPARSNIEs.length = (uint16_t) WPARSNIEsLen; @@ -1953,12 +1953,12 @@ CDF_STATUS wlansap_set_wparsn_ies sme_roam_update_apwparsni_es(hHal, pSapCtx->sessionId, &pSapCtx->APWPARSNIEs); - if (cdf_ret_status == CDF_STATUS_SUCCESS) - return CDF_STATUS_SUCCESS; + if (cdf_ret_status == QDF_STATUS_SUCCESS) + return QDF_STATUS_SUCCESS; else - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /** @@ -1971,43 +1971,43 @@ CDF_STATUS wlansap_set_wparsn_ies * * This api function provides to send action frame sent by upper layer. * - * Return: The CDF_STATUS code associated with performing the operation -* CDF_STATUS_SUCCESS: Success and error code otherwise + * Return: The QDF_STATUS code associated with performing the operation +* QDF_STATUS_SUCCESS: Success and error code otherwise */ -CDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf, +QDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf, uint32_t len, uint16_t wait, uint16_t channel_freq) { ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_send_action(hHal, pSapCtx->sessionId, pBuf, len, 0, 0, channel_freq); - if (CDF_STATUS_SUCCESS == cdf_ret_status) { - return CDF_STATUS_SUCCESS; + if (QDF_STATUS_SUCCESS == cdf_ret_status) { + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Send Action Frame"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /** @@ -2024,44 +2024,44 @@ CDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf, * This api function provides to set Remain On channel on specified channel * for specified duration. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwise + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwise */ -CDF_STATUS wlansap_remain_on_channel(void *pCtx, +QDF_STATUS wlansap_remain_on_channel(void *pCtx, uint8_t channel, uint32_t duration, remainOnChanCallback callback, void *pContext, uint32_t *scan_id) { ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_remain_on_channel(hHal, pSapCtx->sessionId, channel, duration, callback, pContext, true, scan_id); - if (CDF_STATUS_SUCCESS == cdf_ret_status) { - return CDF_STATUS_SUCCESS; + if (QDF_STATUS_SUCCESS == cdf_ret_status) { + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Set Remain on Channel"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /** @@ -2072,22 +2072,22 @@ CDF_STATUS wlansap_remain_on_channel(void *pCtx, * * This api cancel previous remain on channel request. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwie + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwie */ -CDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, +QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, uint32_t scan_id) { ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || @@ -2095,21 +2095,21 @@ CDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_cancel_remain_on_channel(hHal, pSapCtx->sessionId, scan_id); - if (CDF_STATUS_SUCCESS == cdf_ret_status) { - return CDF_STATUS_SUCCESS; + if (QDF_STATUS_SUCCESS == cdf_ret_status) { + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Cancel Remain on Channel"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /** * wlansap_register_mgmt_frame() - register management frame @@ -2123,43 +2123,43 @@ CDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, * HDD use this API to register specified type of frame with CORE stack. * On receiving such kind of frame CORE stack should pass this frame to HDD * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwise + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwise */ -CDF_STATUS wlansap_register_mgmt_frame +QDF_STATUS wlansap_register_mgmt_frame (void *pCtx, uint16_t frameType, uint8_t *matchData, uint16_t matchLen) { ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_register_mgmt_frame(hHal, pSapCtx->sessionId, frameType, matchData, matchLen); - if (CDF_STATUS_SUCCESS == cdf_ret_status) { - return CDF_STATUS_SUCCESS; + if (QDF_STATUS_SUCCESS == cdf_ret_status) { + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Register MGMT frame"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /** @@ -2173,43 +2173,43 @@ CDF_STATUS wlansap_register_mgmt_frame * * This API is used to deregister previously registered frame. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwise + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwise */ -CDF_STATUS wlansap_de_register_mgmt_frame +QDF_STATUS wlansap_de_register_mgmt_frame (void *pCtx, uint16_t frameType, uint8_t *matchData, uint16_t matchLen) { ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_deregister_mgmt_frame(hHal, pSapCtx->sessionId, frameType, matchData, matchLen); - if (CDF_STATUS_SUCCESS == cdf_ret_status) { - return CDF_STATUS_SUCCESS; + if (QDF_STATUS_SUCCESS == cdf_ret_status) { + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Deregister MGMT frame"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /*========================================================================== @@ -2233,17 +2233,17 @@ CDF_STATUS wlansap_de_register_mgmt_frame pSapCtx: Pointer to cds global context structure RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS +QDF_STATUS wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) { ptSapContext sapContext = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; tpAniSirGlobal mac_ctx = NULL; eCsrPhyMode phy_mode; @@ -2253,14 +2253,14 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } mac_ctx = PMAC_STRUCT(hHal); phy_mode = sapContext->csr_roamProfile.phyMode; @@ -2281,14 +2281,14 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) cdf_ret_status = sme_roam_channel_change_req(hHal, sapContext->bssid, &ch_params, &sapContext->csr_roamProfile); - if (cdf_ret_status == CDF_STATUS_SUCCESS) { + if (cdf_ret_status == QDF_STATUS_SUCCESS) { sap_signal_hdd_event(sapContext, NULL, eSAP_CHANNEL_CHANGE_EVENT, (void *) eSAP_STATUS_SUCCESS); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /*========================================================================== @@ -2312,16 +2312,16 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) pSapCtx: Pointer to cds global context structure RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS wlansap_start_beacon_req(void *pSapCtx) +QDF_STATUS wlansap_start_beacon_req(void *pSapCtx) { ptSapContext sapContext = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; uint8_t dfsCacWaitStatus = 0; tpAniSirGlobal pMac = NULL; @@ -2330,14 +2330,14 @@ CDF_STATUS wlansap_start_beacon_req(void *pSapCtx) if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); @@ -2348,13 +2348,13 @@ CDF_STATUS wlansap_start_beacon_req(void *pSapCtx) cdf_ret_status = sme_roam_start_beacon_req(hHal, sapContext->bssid, dfsCacWaitStatus); - if (cdf_ret_status == CDF_STATUS_SUCCESS) { - return CDF_STATUS_SUCCESS; + if (cdf_ret_status == QDF_STATUS_SUCCESS) { + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /*========================================================================== @@ -2370,16 +2370,16 @@ CDF_STATUS wlansap_start_beacon_req(void *pSapCtx) pSapCtx: Pointer to cds global context structure RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) +QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) { ptSapContext sapContext = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; tpAniSirGlobal pMac = NULL; sapContext = (ptSapContext) pSapCtx; @@ -2387,14 +2387,14 @@ CDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); @@ -2404,11 +2404,11 @@ CDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) pMac->sap.SapDfsInfo.csaIERequired, &pMac->sap.SapDfsInfo.new_ch_params); - if (cdf_ret_status == CDF_STATUS_SUCCESS) { - return CDF_STATUS_SUCCESS; + if (cdf_ret_status == QDF_STATUS_SUCCESS) { + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /*========================================================================== @@ -2426,13 +2426,13 @@ CDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) pIgnore_cac : pointer to ignore_cac variable RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac) +QDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac) { tpAniSirGlobal pMac = NULL; @@ -2441,11 +2441,11 @@ CDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac) } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } *pIgnore_cac = pMac->sap.SapDfsInfo.ignore_cac; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*========================================================================== @@ -2463,13 +2463,13 @@ CDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac) ignore_cac : value to set for ignore_cac variable in DFS global structure. RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac) +QDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac) { tpAniSirGlobal pMac = NULL; @@ -2478,12 +2478,12 @@ CDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac) } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pMac->sap.SapDfsInfo.ignore_cac = (ignore_cac >= true) ? true : false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2493,14 +2493,14 @@ CDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac) * Indicates if Japan W53 is enabled when set to 0 * * This API is used to enable or disable Japan W53 Band - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS +QDF_STATUS wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) { tpAniSirGlobal pMac = NULL; - CDF_STATUS status; + QDF_STATUS status; uint8_t dfs_region; if (NULL != hHal) { @@ -2508,7 +2508,7 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cds_get_dfs_region(&dfs_region); @@ -2524,13 +2524,13 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) FL("sapdfs: SET DFS JAPAN W53 DISABLED = %d"), pMac->sap.SapDfsInfo.is_dfs_w53_disabled); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL ("Regdomain not japan, set disable JP W53 not valid")); - status = CDF_STATUS_E_FAULT; + status = QDF_STATUS_E_FAULT; } return status; @@ -2546,7 +2546,7 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) * * Return: success of failure of operation */ -CDF_STATUS +QDF_STATUS wlan_sap_set_channel_avoidance(tHalHandle hal, bool sap_channel_avoidance) { tpAniSirGlobal mac_ctx = NULL; @@ -2556,10 +2556,10 @@ wlan_sap_set_channel_avoidance(tHalHandle hal, bool sap_channel_avoidance) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("hal or mac_ctx pointer NULL")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } mac_ctx->sap.sap_channel_avoidance = sap_channel_avoidance; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ @@ -2575,16 +2575,16 @@ wlan_sap_set_channel_avoidance(tHalHandle hal, bool sap_channel_avoidance) * to resetrict the DFS random channel selection algorithm * either Indoor/Outdoor channels only. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwise. + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwise. */ -CDF_STATUS +QDF_STATUS wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, uint8_t dfs_Preferred_Channels_location) { tpAniSirGlobal pMac = NULL; - CDF_STATUS status; + QDF_STATUS status; uint8_t dfs_region; if (NULL != hHal) { @@ -2592,7 +2592,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cds_get_dfs_region(&dfs_region); @@ -2612,13 +2612,13 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, pMac->sap.SapDfsInfo. sap_operating_chan_preferred_location); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL ("sapdfs:NOT JAPAN REG, Invalid Set preferred chans location")); - status = CDF_STATUS_E_FAULT; + status = QDF_STATUS_E_FAULT; } return status; @@ -2640,13 +2640,13 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, target_channel : target channel to be set RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, uint8_t target_channel) +QDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, uint8_t target_channel) { tpAniSirGlobal pMac = NULL; @@ -2655,7 +2655,7 @@ CDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, uint8_t target_channel) } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (target_channel > 0) { pMac->sap.SapDfsInfo.user_provided_target_channel = @@ -2664,22 +2664,22 @@ CDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, uint8_t target_channel) pMac->sap.SapDfsInfo.user_provided_target_channel = 0; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, const uint8_t *pAdditionIEBuffer, uint16_t additionIELength, eUpdateIEsType updateType) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t bufferValid = false; uint16_t bufferLength = 0; uint8_t *pBuffer = NULL; if (NULL == pConfig) { - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if ((pAdditionIEBuffer != NULL) && (additionIELength != 0)) { @@ -2691,7 +2691,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Could not allocate the buffer ")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(pBuffer, pAdditionIEBuffer, bufferLength); bufferValid = true; @@ -2749,13 +2749,13 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, return status; } -CDF_STATUS +QDF_STATUS wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateType) { if (NULL == pConfig) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid Config pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } switch (updateType) { @@ -2787,7 +2787,7 @@ wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateTyp FL("Invalid buffer type %d"), updateType); break; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*========================================================================== @@ -2875,13 +2875,13 @@ void wlansap_extend_to_acs_range(uint8_t *startChannelNum, sapContext: Pointer to cds global context structure RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) +QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) { int i = 0; ptSapContext sapContext = (ptSapContext) pSapCtx; @@ -2895,20 +2895,20 @@ CDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); if (!pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: DFS NOL is empty", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } dfs_nol = pMac->sap.SapDfsInfo.sapDfsChannelNolList; @@ -2916,7 +2916,7 @@ CDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) if (!dfs_nol) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: DFS NOL context is null", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } for (i = 0; i < pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels; @@ -2960,7 +2960,7 @@ CDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*========================================================================== @@ -2977,13 +2977,13 @@ CDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) conf: set type RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) +QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) { int i = 0; ptSapContext sapContext = (ptSapContext) pSapCtx; @@ -2993,20 +2993,20 @@ CDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); if (!pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: DFS NOL is empty", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (conf == eSAP_DFS_NOL_CLEAR) { @@ -3082,7 +3082,7 @@ CDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) sap_signal_hdd_event(sapContext, NULL, eSAP_DFS_NOL_SET, (void *) eSAP_STATUS_SUCCESS); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3140,9 +3140,9 @@ void wlansap_populate_del_sta_params(const uint8_t *mac, * This function serves as an api for hdd to initiate acs scan pre * start bss. * - * Return: The CDF_STATUS code associated with performing the operation. + * Return: The QDF_STATUS code associated with performing the operation. */ -CDF_STATUS +QDF_STATUS wlansap_acs_chselect(void *pvos_gctx, tpWLAN_SAPEventCB pacs_event_callback, tsap_Config_t *pconfig, @@ -3150,7 +3150,7 @@ wlansap_acs_chselect(void *pvos_gctx, { ptSapContext sap_context = NULL; tHalHandle h_hal = NULL; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pmac = NULL; sap_context = CDS_GET_SAP_CB(pvos_gctx); @@ -3158,20 +3158,20 @@ wlansap_acs_chselect(void *pvos_gctx, CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pvos_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } h_hal = (tHalHandle)CDS_GET_HAL_CB(sap_context->p_cds_gctx); if (NULL == h_hal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid MAC context from pvosGCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (sap_context->isSapSessionOpen == eSAP_TRUE) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "%s:SME Session is already opened\n", __func__); - return CDF_STATUS_E_EXISTS; + return QDF_STATUS_E_EXISTS; } sap_context->sessionId = 0xff; @@ -3191,12 +3191,12 @@ wlansap_acs_chselect(void *pvos_gctx, wlansap_set_scan_acs_channel_params(pconfig, sap_context, pusr_context); - if (CDF_STATUS_SUCCESS == + if (QDF_STATUS_SUCCESS == cds_get_vdev_types(CDF_STA_MODE, &type, &subType)) { /* * Open SME Session for scan */ - if (CDF_STATUS_SUCCESS != sme_open_session(h_hal, + if (QDF_STATUS_SUCCESS != sme_open_session(h_hal, NULL, sap_context, sap_context->self_mac_addr, &sap_context->sessionId, @@ -3205,7 +3205,7 @@ wlansap_acs_chselect(void *pvos_gctx, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_OpenSession", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else { sap_context->isScanSessionOpen = eSAP_TRUE; } @@ -3234,14 +3234,14 @@ wlansap_acs_chselect(void *pvos_gctx, * different scan callback fucntion to process * the results pre start BSS. */ - cdf_status = sap_goto_channel_sel(sap_context, NULL, true); + qdf_status = sap_goto_channel_sel(sap_context, NULL, true); - if (CDF_STATUS_E_ABORTED == cdf_status) { + if (QDF_STATUS_E_ABORTED == qdf_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s,DFS not supported in the current operating mode", __func__); - return CDF_STATUS_E_FAILURE; - } else if (CDF_STATUS_E_CANCELED == cdf_status) { + return QDF_STATUS_E_FAILURE; + } else if (QDF_STATUS_E_CANCELED == qdf_status) { /* * ERROR is returned when either the SME scan request * failed or ACS is overridden due to other constrainst @@ -3257,11 +3257,11 @@ wlansap_acs_chselect(void *pvos_gctx, tHalHandle h_hal = CDS_GET_HAL_CB( sap_context->p_cds_gctx); if (h_hal == NULL) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (sme_close_session(h_hal, sap_context->sessionId, NULL, NULL) == - CDF_STATUS_SUCCESS) + QDF_STATUS_SUCCESS) sap_context->isScanSessionOpen = eSAP_FALSE; else @@ -3274,12 +3274,12 @@ wlansap_acs_chselect(void *pvos_gctx, return sap_signal_hdd_event(sap_context, NULL, eSAP_ACS_CHANNEL_SELECTED, (void *) eSAP_STATUS_SUCCESS); - } else if (CDF_STATUS_SUCCESS == cdf_status) { + } else if (QDF_STATUS_SUCCESS == qdf_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Successfully Issued a Pre Start Bss Scan Request")); } } - return cdf_status; + return qdf_status; } /** diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 797cc793ba..3493465496 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1526,16 +1526,16 @@ struct tagCsrDelStaParams { * NOTE: p2 is the second context pass in for the caller * NOTE: what if callback is called before requester gets the scanId?? */ -typedef CDF_STATUS (*csr_scan_completeCallback)(tHalHandle, void *p2, +typedef QDF_STATUS (*csr_scan_completeCallback)(tHalHandle, void *p2, uint8_t sessionId, uint32_t scanID, eCsrScanStatus status); -typedef CDF_STATUS (*csr_roam_completeCallback)(void *pContext, +typedef QDF_STATUS (*csr_roam_completeCallback)(void *pContext, tCsrRoamInfo * pParam, uint32_t roamId, eRoamCmdStatus roamStatus, eCsrRoamResult roamResult); -typedef CDF_STATUS (*csr_roamSessionCloseCallback)(void *pContext); +typedef QDF_STATUS (*csr_roamSessionCloseCallback)(void *pContext); #define CSR_IS_START_IBSS(pProfile) (eCSR_BSS_TYPE_START_IBSS == \ (pProfile)->BSSType) @@ -1554,14 +1554,14 @@ typedef CDF_STATUS (*csr_roamSessionCloseCallback)(void *pContext); #define CSR_IS_CLOSE_SESSION_COMMAND(pCommand) \ ((pCommand)->command == eSmeCommandDelStaSession) -CDF_STATUS csr_set_channels(tHalHandle hHal, tCsrConfigParam *pParam); +QDF_STATUS csr_set_channels(tHalHandle hHal, tCsrConfigParam *pParam); -CDF_STATUS csr_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode); +QDF_STATUS csr_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode); /* enum to string conversion for debug output */ const char *get_e_roam_cmd_status_str(eRoamCmdStatus val); const char *get_e_csr_roam_result_str(eCsrRoamResult val); -CDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand, +QDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand, bool *pfRestartNeeded); typedef void (*csr_roamLinkQualityIndCallback) (eCsrRoamLinkQualityInd ind, void *pContext); @@ -1574,16 +1574,16 @@ typedef void (*tCsrTsmStatsCallback)(tAniTrafStrmMetrics tsmMetrics, #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ typedef void (*tCsrSnrCallback)(int8_t snr, uint32_t staId, void *pContext); -CDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, +QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, tpSirBssDescription pBssDescription); -CDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand); +QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand); eCsrBand csr_get_current_band(tHalHandle hHal); typedef void (*csr_readyToSuspendCallback)(void *pContext, bool suspended); #ifdef WLAN_FEATURE_EXTWOW_SUPPORT typedef void (*csr_readyToExtWoWCallback)(void *pContext, bool status); #endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS csr_roam_issue_ft_roam_offload_synch(tHalHandle hHal, +QDF_STATUS csr_roam_issue_ft_roam_offload_synch(tHalHandle hHal, uint32_t sessionId, tSirBssDescription *pBssDescription); #endif typedef void (*tCsrLinkStatusCallback)(uint8_t status, void *pContext); diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index d422b8b027..1ce8679700 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -33,7 +33,6 @@ #ifndef CSRINTERNAL_H__ #define CSRINTERNAL_H__ -#include "cdf_status.h" #include "qdf_status.h" #include "cdf_lock.h" @@ -1187,15 +1186,15 @@ typedef struct tagCsrRoamStruct { #define CSR_GET_SUBNET_STATUS(roam_reason) (0) #endif -CDF_STATUS csr_get_channel_and_power_list(tpAniSirGlobal pMac); -CDF_STATUS csrScanFilter11dResult(tpAniSirGlobal pMac); +QDF_STATUS csr_get_channel_and_power_list(tpAniSirGlobal pMac); +QDF_STATUS csrScanFilter11dResult(tpAniSirGlobal pMac); -CDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac); +QDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac); -CDF_STATUS csr_set_modify_profile_fields(tpAniSirGlobal pMac, +QDF_STATUS csr_set_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamModifyProfileFields * pModifyProfileFields); -CDF_STATUS csr_get_modify_profile_fields(tpAniSirGlobal pMac, +QDF_STATUS csr_get_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamModifyProfileFields * pModifyProfileFields); void csr_set_global_cfgs(tpAniSirGlobal pMac); @@ -1227,41 +1226,41 @@ bool csr_is_valid_mc_concurrent_session(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDesc); bool csr_is_conn_state_connected_infra_ap(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, +QDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requesterId, uint32_t statsMask, tCsrStatsCallback callback, uint32_t periodicity, bool cache, uint8_t staId, void *pContext, uint8_t sessionId); -CDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, tCsrRssiCallback callback, +QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, tCsrRssiCallback callback, uint8_t staId, struct cdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context); -CDF_STATUS csr_get_snr(tpAniSirGlobal pMac, tCsrSnrCallback callback, +QDF_STATUS csr_get_snr(tpAniSirGlobal pMac, tCsrSnrCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, +QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, tCsrTsmStatsCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid); #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ -CDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam); -CDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, +QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam); +QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam); -CDF_STATUS csr_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf); -CDF_STATUS csr_open(tpAniSirGlobal pMac); -CDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2); -CDF_STATUS csr_close(tpAniSirGlobal pMac); -CDF_STATUS csr_start(tpAniSirGlobal pMac); -CDF_STATUS csr_stop(tpAniSirGlobal pMac, tHalStopType stopType); -CDF_STATUS csr_ready(tpAniSirGlobal pMac); +QDF_STATUS csr_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS csr_open(tpAniSirGlobal pMac); +QDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2); +QDF_STATUS csr_close(tpAniSirGlobal pMac); +QDF_STATUS csr_start(tpAniSirGlobal pMac); +QDF_STATUS csr_stop(tpAniSirGlobal pMac, tHalStopType stopType); +QDF_STATUS csr_ready(tpAniSirGlobal pMac); #ifdef FEATURE_WLAN_WAPI -CDF_STATUS csr_scan_get_bkid_candidate_list(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_get_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, tBkidCandidateInfo * pBkidList, uint32_t *pNumItems); -CDF_STATUS csr_roam_get_wapi_req_ie(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_get_wapi_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf); -CDF_STATUS csr_roam_get_wapi_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wapi_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf); uint8_t csr_construct_wapi_ie(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, @@ -1269,9 +1268,9 @@ uint8_t csr_construct_wapi_ie(tpAniSirGlobal pMac, uint32_t sessionId, tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe); #endif /* FEATURE_WLAN_WAPI */ -CDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId, tSirAPWPSIEs * pAPWPSIES); -CDF_STATUS csr_roam_update_wparsni_es(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_update_wparsni_es(tpAniSirGlobal pMac, uint32_t sessionId, tSirRSNie *pAPSirRSNie); void csr_set_cfg_privacy(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, bool fPrivacy); @@ -1286,13 +1285,13 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal pMac, uint16_t sap_ch, eCsrPhyMode sap_phymode, uint8_t cc_switch_mode); #endif -CDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamConnectedProfile *pProfile); bool csr_is_set_key_allowed(tpAniSirGlobal pMac, uint32_t sessionId); void csr_set_opposite_band_channel_info(tpAniSirGlobal pMac); #ifdef FEATURE_WLAN_SCAN_PNO -CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, tSirPrefNetworkFoundInd * pPrefNetworkFoundInd); #endif @@ -1315,31 +1314,31 @@ bool csr_roam_is_fast_roam_enabled(tpAniSirGlobal pMac, uint32_t sessionId); bool csr_roam_is_roam_offload_scan_enabled(tpAniSirGlobal pMac); bool csr_is_channel_present_in_list(uint8_t *pChannelList, int numChannels, uint8_t channel); -CDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList, int numChannels, +QDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList, int numChannels, uint8_t channel); -CDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, tpSirRoamOffloadScanRsp scanOffloadRsp); -CDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, uint8_t sessionId, tCsrHandoffRequest *pHandoffInfo); bool csr_roam_is_sta_mode(tpAniSirGlobal pMac, uint32_t sessionId); /* Post Channel Change Indication */ -CDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, struct cdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile); /* Post Beacon Tx Start Indication */ -CDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, struct cdf_mac_addr bssid, uint8_t dfsCacWaitStatus); -CDF_STATUS +QDF_STATUS csr_roam_send_chan_sw_ie_request(tpAniSirGlobal pMac, struct cdf_mac_addr bssid, uint8_t targetChannel, uint8_t csaIeReqd, chan_params_t *ch_params); -CDF_STATUS +QDF_STATUS csr_roam_modify_add_ies(tpAniSirGlobal pMac, tSirModifyIE *pModifyIE, eUpdateIEsType updateType); -CDF_STATUS +QDF_STATUS csr_roam_update_add_ies(tpAniSirGlobal pMac, tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType); #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR @@ -1353,7 +1352,7 @@ static inline void csr_roaming_report_diag_event(tpAniSirGlobal mac_ctx, {} #endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, roam_offload_synch_ind *roam_synch_ind_ptr, tpSirBssDescription bss_desc_ptr); void csr_process_ho_fail_ind(tpAniSirGlobal pMac, void *pMsgBuf); @@ -1365,14 +1364,14 @@ bool csr_store_joinreq_param(tpAniSirGlobal mac_ctx, uint32_t session_id); bool csr_clear_joinreq_param(tpAniSirGlobal mac_ctx, uint32_t session_id); -CDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx, uint32_t *roam_id, uint32_t session_id); #ifdef FEATURE_WLAN_DIAG_SUPPORT void csr_diag_event_report(tpAniSirGlobal pmac, uint16_t event_type, uint16_t status, uint16_t reasoncode); #endif -CDF_STATUS csr_get_channels_and_power(tpAniSirGlobal pMac); +QDF_STATUS csr_get_channels_and_power(tpAniSirGlobal pMac); /* csr_scan_process_single_bssdescr() - Add a bssdescriptor to scan table * @@ -1392,7 +1391,7 @@ CDF_STATUS csr_get_channels_and_power(tpAniSirGlobal pMac); * Return: 0 or other error codes. */ -CDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDescription, uint32_t scan_id, uint32_t flags); diff --git a/core/sme/inc/csr_link_list.h b/core/sme/inc/csr_link_list.h index 1146246831..8776006535 100644 --- a/core/sme/inc/csr_link_list.h +++ b/core/sme/inc/csr_link_list.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -82,7 +82,7 @@ typedef struct tagDblLinkList { #define csrIsListEmpty(pHead) ((pHead)->next == (pHead)) uint32_t csr_ll_count(tDblLinkList *pList); -CDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList); +QDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList); void csr_ll_close(tDblLinkList *pList); void csr_ll_lock(tDblLinkList *pList); void csr_ll_unlock(tDblLinkList *pList); diff --git a/core/sme/inc/csr_neighbor_roam.h b/core/sme/inc/csr_neighbor_roam.h index 29a82cf156..c65f195633 100644 --- a/core/sme/inc/csr_neighbor_roam.h +++ b/core/sme/inc/csr_neighbor_roam.h @@ -173,57 +173,57 @@ typedef struct sCsrNeighborRoamControlInfo { } tCsrNeighborRoamControlInfo, *tpCsrNeighborRoamControlInfo; /* All the necessary Function declarations are here */ -CDF_STATUS csr_neighbor_roam_indicate_connect(tpAniSirGlobal pMac, - uint8_t sessionId, CDF_STATUS status); -CDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_indicate_connect(tpAniSirGlobal pMac, + uint8_t sessionId, QDF_STATUS status); +QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, uint8_t sessionId); bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal pMac, uint8_t sessionId); void csr_neighbor_roam_request_handoff(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId); +QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId); void csr_neighbor_roam_close(tpAniSirGlobal pMac, uint8_t sessionId); void csr_neighbor_roam_purge_preauth_failed_list(tpAniSirGlobal pMac); -CDF_STATUS csr_neighbor_roam_transit_to_cfg_chan_scan(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_transit_to_cfg_chan_scan(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csrNeighborRoamTransitionToPreauthDone(tpAniSirGlobal pMac); -CDF_STATUS csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, +QDF_STATUS csrNeighborRoamTransitionToPreauthDone(tpAniSirGlobal pMac); +QDF_STATUS csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, tCsrScanResultFilter *pScanFilter, uint8_t sessionId); bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, tpCsrNeighborRoamBSSInfo pHandoffNode, uint8_t sessionId); -CDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal pMac, uint8_t sessionId, tSirRetStatus limStatus); bool csr_neighbor_roam_is11r_assoc(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report( +QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report( tpAniSirGlobal pMac, uint8_t sessionId); void csr_neighbor_roam_tranistion_preauth_done_to_disconnected( tpAniSirGlobal pMac, uint8_t sessionId); bool csr_neighbor_roam_state_preauth_done(tpAniSirGlobal pMac, uint8_t sessionId); bool csr_neighbor_middle_of_roaming(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_neighbor_roam_set_lookup_rssi_threshold(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_set_lookup_rssi_threshold(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t neighborLookupRssiThreshold); -CDF_STATUS csr_neighbor_roam_set_opportunistic_scan_threshold_diff( +QDF_STATUS csr_neighbor_roam_set_opportunistic_scan_threshold_diff( tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nOpportunisticThresholdDiff); -CDF_STATUS csr_neighbor_roam_set_roam_rescan_rssi_diff(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_set_roam_rescan_rssi_diff(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamRescanRssiDiff); -CDF_STATUS csr_neighbor_roam_set_roam_bmiss_first_bcnt(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_set_roam_bmiss_first_bcnt(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamBmissFirstBcnt); -CDF_STATUS csr_neighbor_roam_set_roam_bmiss_final_bcnt(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_set_roam_bmiss_final_bcnt(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamBmissFinalBcnt); -CDF_STATUS csr_neighbor_roam_set_roam_beacon_rssi_weight(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_set_roam_beacon_rssi_weight(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamBeaconRssiWeight); -CDF_STATUS csr_neighbor_roam_update_fast_roaming_enabled(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_update_fast_roaming_enabled(tpAniSirGlobal pMac, uint8_t sessionId, const bool fastRoamEnabled); -CDF_STATUS csr_neighbor_roam_update_ese_mode_enabled(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_update_ese_mode_enabled(tpAniSirGlobal pMac, uint8_t sessionId, const bool eseMode); -CDF_STATUS csr_neighbor_roam_channels_filter_by_current_band( +QDF_STATUS csr_neighbor_roam_channels_filter_by_current_band( tpAniSirGlobal pMac, uint8_t sessionId, uint8_t *pInputChannelList, uint8_t inputNumOfChannels, uint8_t *pOutputChannelList, uint8_t *pMergedOutputNumOfChannels); -CDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, uint8_t *pInputChannelList, uint8_t inputNumOfChannels, uint8_t *pOutputChannelList, @@ -270,26 +270,26 @@ void csr_roam_reset_roam_params(tpAniSirGlobal mac_ptr); #define REASON_ROAM_SCAN_HI_RSSI_DELAY_CHANGED 32 #define REASON_ROAM_SCAN_HI_RSSI_UB_CHANGED 33 -CDF_STATUS csr_roam_offload_scan(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS csr_roam_offload_scan(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t command, uint8_t reason); -CDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, void *pMsg); -CDF_STATUS csr_neighbor_roam_handoff_req_hdlr(tpAniSirGlobal pMac, void *pMsg); -CDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_handoff_req_hdlr(tpAniSirGlobal pMac, void *pMsg); +QDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal pMac, - uint8_t sessionId, CDF_STATUS status); -CDF_STATUS csr_neighbor_roam_start_lfr_scan(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal pMac, + uint8_t sessionId, QDF_STATUS status); +QDF_STATUS csr_neighbor_roam_start_lfr_scan(tpAniSirGlobal pMac, uint8_t sessionId); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS csr_set_cckm_ie(tpAniSirGlobal pMac, const uint8_t sessionId, +QDF_STATUS csr_set_cckm_ie(tpAniSirGlobal pMac, const uint8_t sessionId, const uint8_t *pCckmIe, const uint8_t ccKmIeLen); -CDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, +QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, const uint8_t sessionId); #endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, roam_offload_synch_ind *roam_synch_ind_ptr, uint8_t sessionId); void csr_roam_synch_callback(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index 6fc1fbfff9..d937ba0e80 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -328,20 +328,20 @@ uint16_t csr_rates_find_best_rate(tSirMacRateSet *pSuppRates, tSirMacRateSet *pExtRates, tSirMacPropRateSet *pPropRates); tSirBssType csr_translate_bsstype_to_mac_type(eCsrRoamBssType csrtype); /* Caller allocates memory for pIEStruct */ -CDF_STATUS csr_parse_bss_description_ies(tHalHandle hHal, +QDF_STATUS csr_parse_bss_description_ies(tHalHandle hHal, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIEStruct); /* * This function will allocate memory for the parsed IEs to the caller. * Caller must free the memory. after it is done with the data only if * this function succeeds */ -CDF_STATUS csr_get_parsed_bss_description_ies(tHalHandle hHal, +QDF_STATUS csr_get_parsed_bss_description_ies(tHalHandle hHal, tSirBssDescription *pBssDesc, tDot11fBeaconIEs **ppIEStruct); bool csrValidateCountryString(tHalHandle hHal, uint8_t *pCountryString); tSirScanType csr_get_scan_type(tpAniSirGlobal pMac, uint8_t chnId); uint8_t csr_to_upper(uint8_t ch); -CDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal pMac, +QDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal pMac, tSirBssDescription *pBSSDescription, eCsrPhyMode *pPhyMode, tDot11fBeaconIEs *pIes); /* @@ -351,14 +351,14 @@ CDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal pMac, * the user wants. There may be discrepency in it. UAPSD-bypass logic should * decide if it needs to reassoc */ -CDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamModifyProfileFields *pModProfileFields, uint32_t *pRoamId, bool fForce); -CDF_STATUS csr_isconcurrentsession_valid(tpAniSirGlobal pMac, +QDF_STATUS csr_isconcurrentsession_valid(tpAniSirGlobal pMac, uint32_t cursessionId, enum tCDF_ADAPTER_MODE currBssPersona); /* BeaconInterval validation for MCC support */ -CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, uint8_t channelId, +QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, uint8_t channelId, uint16_t *beaconInterval, uint32_t cursessionId, enum tCDF_ADAPTER_MODE currBssPersona); bool csr_is_profile11r(tCsrRoamProfile *pProfile); diff --git a/core/sme/inc/nan_api.h b/core/sme/inc/nan_api.h index ee275cb3af..0d68a3fe8e 100644 --- a/core/sme/inc/nan_api.h +++ b/core/sme/inc/nan_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -46,6 +46,6 @@ typedef struct sNanRequestReq { typedef void (*NanCallback)(void *, tSirNanEvent *); void sme_nan_register_callback(tHalHandle hHal, NanCallback callback); -CDF_STATUS sme_nan_request(tpNanRequestReq input); +QDF_STATUS sme_nan_request(tpNanRequestReq input); #endif /* __NAN_API_H__ */ diff --git a/core/sme/inc/oem_data_api.h b/core/sme/inc/oem_data_api.h index f60c9a44ed..110f0177a6 100644 --- a/core/sme/inc/oem_data_api.h +++ b/core/sme/inc/oem_data_api.h @@ -66,20 +66,20 @@ typedef enum { eOEM_DATA_REQ_FAILURE, eOEM_DATA_REQ_INVALID_MODE, } eOemDataReqStatus; -CDF_STATUS oem_data_oem_data_req_open(tHalHandle hHal); -CDF_STATUS oem_data_oem_data_req_close(tHalHandle hHal); +QDF_STATUS oem_data_oem_data_req_open(tHalHandle hHal); +QDF_STATUS oem_data_oem_data_req_close(tHalHandle hHal); /* * HDD Callback function for the sme to callback when * the oem data rsp is available */ -typedef CDF_STATUS (*oem_data_oem_data_reqCompleteCallback)(tHalHandle, +typedef QDF_STATUS (*oem_data_oem_data_reqCompleteCallback)(tHalHandle, void *p2, uint32_t oemDataReqID, eOemDataReqStatus status); -CDF_STATUS oem_data_oem_data_req(tHalHandle, uint8_t, tOemDataReqConfig *, +QDF_STATUS oem_data_oem_data_req(tHalHandle, uint8_t, tOemDataReqConfig *, uint32_t *pOemDataReqID); -CDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *); -CDF_STATUS oem_data_is_oem_data_req_allowed(tHalHandle hHal); +QDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *); +QDF_STATUS oem_data_is_oem_data_req_allowed(tHalHandle hHal); typedef void (*sme_send_oem_data_rsp_msg)(int length, uint8_t *oem_data_rsp); #endif /* _OEM_DATA_API_H__ */ diff --git a/core/sme/inc/p2p_api.h b/core/sme/inc/p2p_api.h index 8b16507f88..7519f1a417 100644 --- a/core/sme/inc/p2p_api.h +++ b/core/sme/inc/p2p_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -53,8 +53,8 @@ typedef struct sP2pPsConfig { uint8_t sessionid; } tP2pPsConfig, *tpP2pPsConfig; -typedef CDF_STATUS (*remainOnChanCallback)(tHalHandle, void *context, - CDF_STATUS status, uint32_t scan_id); +typedef QDF_STATUS (*remainOnChanCallback)(tHalHandle, void *context, + QDF_STATUS status, uint32_t scan_id); typedef struct sRemainOnChn { uint8_t chn; @@ -81,33 +81,33 @@ typedef struct sp2pContext { uint32_t probeRspIeLength; } tp2pContext, *tPp2pContext; -CDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t sessionId, uint8_t channel, uint32_t duration, remainOnChanCallback callback, void *pContext, uint8_t isP2PProbeReqAllowed, uint32_t *scan_id); -CDF_STATUS sme_report_probe_req(tHalHandle hHal, uint8_t flag); -CDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, +QDF_STATUS sme_report_probe_req(tHalHandle hHal, uint8_t flag); +QDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength); -CDF_STATUS sme_send_action(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_send_action(tHalHandle hHal, uint8_t sessionId, const uint8_t *pBuf, uint32_t len, uint16_t wait, bool noack, uint16_t channel_freq); -CDF_STATUS sme_cancel_remain_on_channel(tHalHandle hHal, +QDF_STATUS sme_cancel_remain_on_channel(tHalHandle hHal, uint8_t sessionId, uint32_t scan_id); -CDF_STATUS sme_p2p_open(tHalHandle hHal); -CDF_STATUS p2p_stop(tHalHandle hHal); -CDF_STATUS sme_p2p_close(tHalHandle hHal); -CDF_STATUS sme_p2p_set_ps(tHalHandle hHal, tP2pPsConfig *data); -CDF_STATUS p2p_remain_on_channel(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_p2p_open(tHalHandle hHal); +QDF_STATUS p2p_stop(tHalHandle hHal); +QDF_STATUS sme_p2p_close(tHalHandle hHal); +QDF_STATUS sme_p2p_set_ps(tHalHandle hHal, tP2pPsConfig *data); +QDF_STATUS p2p_remain_on_channel(tHalHandle hHal, uint8_t sessionId, uint8_t channel, uint32_t duration, remainOnChanCallback callback, void *pContext, uint8_t isP2PProbeReqAllowed, uint32_t scan_id); -CDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, const uint8_t *pBuf, uint32_t len, uint16_t wait, bool noack, uint16_t channel_freq); -CDF_STATUS p2p_cancel_remain_on_channel(tHalHandle hHal, +QDF_STATUS p2p_cancel_remain_on_channel(tHalHandle hHal, uint8_t sessionId, uint32_t scan_id); -CDF_STATUS p2p_set_ps(tHalHandle hHal, tP2pPsConfig *pNoA); +QDF_STATUS p2p_set_ps(tHalHandle hHal, tP2pPsConfig *pNoA); tSirRFBand get_rf_band(uint8_t channel); #endif /* __P2P_API_H__ */ diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index fd35a0a996..f41d9747e8 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -205,26 +205,26 @@ struct sme_oem_capability { /*------------------------------------------------------------------------- Function declarations and documenation ------------------------------------------------------------------------*/ -CDF_STATUS sme_open(tHalHandle hHal); -CDF_STATUS sme_init_chan_list(tHalHandle hal, uint8_t *alpha2, +QDF_STATUS sme_open(tHalHandle hHal); +QDF_STATUS sme_init_chan_list(tHalHandle hal, uint8_t *alpha2, enum country_src cc_src); -CDF_STATUS sme_close(tHalHandle hHal); -CDF_STATUS sme_start(tHalHandle hHal); -CDF_STATUS sme_stop(tHalHandle hHal, tHalStopType stopType); -CDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, +QDF_STATUS sme_close(tHalHandle hHal); +QDF_STATUS sme_start(tHalHandle hHal); +QDF_STATUS sme_stop(tHalHandle hHal, tHalStopType stopType); +QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, void *pContext, uint8_t *pSelfMacAddr, uint8_t *pbSessionId, uint32_t type, uint32_t subType); void sme_set_curr_device_mode(tHalHandle hHal, enum tCDF_ADAPTER_MODE currDeviceMode); -CDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId, csr_roamSessionCloseCallback callback, void *pContext); -CDF_STATUS sme_update_roam_params(tHalHandle hHal, uint8_t session_id, +QDF_STATUS sme_update_roam_params(tHalHandle hHal, uint8_t session_id, struct roam_ext_params roam_params_src, int update_param); #ifdef FEATURE_WLAN_SCAN_PNO void sme_update_roam_pno_channel_prediction_config( - tHalHandle hal, tCsrConfigParam * csr_config, + tHalHandle hal, tCsrConfigParam *csr_config, uint8_t copy_from_to); #else static inline void sme_update_roam_pno_channel_prediction_config( @@ -232,29 +232,29 @@ static inline void sme_update_roam_pno_channel_prediction_config( uint8_t copy_from_to) {} #endif -CDF_STATUS sme_update_config(tHalHandle hHal, +QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlm); +QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlm); #endif -CDF_STATUS sme_set11dinfo(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams); -CDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal, +QDF_STATUS sme_set11dinfo(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams); +QDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal, v_REGDOMAIN_t *domainIdSoftAp); -CDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode); -CDF_STATUS sme_change_config_params(tHalHandle hHal, +QDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode); +QDF_STATUS sme_change_config_params(tHalHandle hHal, tCsrUpdateConfigParam *pUpdateConfigParam); -CDF_STATUS sme_hdd_ready_ind(tHalHandle hHal); -CDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg); +QDF_STATUS sme_hdd_ready_ind(tHalHandle hHal); +QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg); void sme_free_msg(tHalHandle hHal, cds_msg_t *pMsg); -CDF_STATUS sme_scan_request(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_scan_request(tHalHandle hHal, uint8_t sessionId, tCsrScanRequest *, csr_scan_completeCallback callback, void *pContext); -CDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, tCsrScanResultFilter *pFilter, tScanResultHandle *phResult); -CDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hHal, +QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hHal, tCsrRoamProfile *profile, tScanResultHandle *scan_cache, uint8_t *ap_chnl_id); @@ -265,132 +265,132 @@ bool sme_store_joinreq_param(tHalHandle hal_handle, uint32_t session_id); bool sme_clear_joinreq_param(tHalHandle hal_handle, uint32_t session_id); -CDF_STATUS sme_issue_stored_joinreq(tHalHandle hal_handle, +QDF_STATUS sme_issue_stored_joinreq(tHalHandle hal_handle, uint32_t *roam_id, uint32_t session_id); -CDF_STATUS sme_scan_flush_result(tHalHandle hHal); -CDF_STATUS sme_filter_scan_results(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_scan_flush_p2p_result(tHalHandle hHal, uint8_t sessionId); +QDF_STATUS sme_scan_flush_result(tHalHandle hHal); +QDF_STATUS sme_filter_scan_results(tHalHandle hHal, uint8_t sessionId); +QDF_STATUS sme_scan_flush_p2p_result(tHalHandle hHal, uint8_t sessionId); tCsrScanResultInfo *sme_scan_result_get_first(tHalHandle, tScanResultHandle hScanResult); tCsrScanResultInfo *sme_scan_result_get_next(tHalHandle, tScanResultHandle hScanResult); -CDF_STATUS sme_scan_result_purge(tHalHandle hHal, +QDF_STATUS sme_scan_result_purge(tHalHandle hHal, tScanResultHandle hScanResult); -CDF_STATUS sme_scan_get_pmkid_candidate_list(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_scan_get_pmkid_candidate_list(tHalHandle hHal, uint8_t sessionId, tPmkidCandidateInfo *pPmkidList, uint32_t *pNumItems); -CDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, tCsrRoamProfile *pProfile, uint32_t *pRoamId); -CDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, tCsrRoamProfile *pProfile, tCsrRoamModifyProfileFields modProfileFields, uint32_t *pRoamId, bool fForce); -CDF_STATUS sme_roam_connect_to_last_profile(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_connect_to_last_profile(tHalHandle hHal, uint8_t sessionId); +QDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, eCsrRoamDisconnectReason reason); -CDF_STATUS sme_roam_stop_bss(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_stop_bss(tHalHandle hHal, uint8_t sessionId); +QDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, CDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf); -CDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, const uint8_t *pPeerMacAddr); -CDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, struct tagCsrDelStaParams *pDelStaParams); -CDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, bool bEnable); -CDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, void *pUsrContext, void *pfnSapEventCallback, struct cdf_mac_addr pRemoveMac); -CDF_STATUS sme_roam_get_connect_state(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_connect_state(tHalHandle hHal, uint8_t sessionId, eCsrConnectState *pState); -CDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, tCsrRoamConnectedProfile *pProfile); void sme_roam_free_connect_profile(tCsrRoamConnectedProfile *profile); -CDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId, tPmkidCacheInfo *pPMKIDCache, uint32_t numItems, bool update_entire_cache); #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS sme_roam_set_psk_pmk(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_set_psk_pmk(tHalHandle hHal, uint8_t sessionId, uint8_t *pPSK_PMK, size_t pmk_len); #endif -CDF_STATUS sme_roam_get_security_req_ie(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_security_req_ie(tHalHandle hHal, uint8_t sessionId, uint32_t *pLen, uint8_t *pBuf, eCsrSecurityType secType); -CDF_STATUS sme_roam_get_security_rsp_ie(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_security_rsp_ie(tHalHandle hHal, uint8_t sessionId, uint32_t *pLen, uint8_t *pBuf, eCsrSecurityType secType); uint32_t sme_roam_get_num_pmkid_cache(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_roam_get_pmkid_cache(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_pmkid_cache(tHalHandle hHal, uint8_t sessionId, uint32_t *pNum, tPmkidCacheInfo *pPmkidCache); -CDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam); -CDF_STATUS sme_get_statistics(tHalHandle hHal, +QDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam); +QDF_STATUS sme_get_statistics(tHalHandle hHal, eCsrStatsRequesterType requesterId, uint32_t statsMask, tCsrStatsCallback callback, uint32_t periodicity, bool cache, uint8_t staId, void *pContext, uint8_t sessionId); -CDF_STATUS sme_get_rssi(tHalHandle hHal, +QDF_STATUS sme_get_rssi(tHalHandle hHal, tCsrRssiCallback callback, uint8_t staId, struct cdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context); -CDF_STATUS sme_get_snr(tHalHandle hHal, +QDF_STATUS sme_get_snr(tHalHandle hHal, tCsrSnrCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS sme_get_tsm_stats(tHalHandle hHal, +QDF_STATUS sme_get_tsm_stats(tHalHandle hHal, tCsrTsmStatsCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid); -CDF_STATUS sme_set_cckm_ie(tHalHandle hHal, +QDF_STATUS sme_set_cckm_ie(tHalHandle hHal, uint8_t sessionId, uint8_t *pCckmIe, uint8_t cckmIeLen); -CDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, +QDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, const tCsrEseBeaconReq *pEseBcnReq); #endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ -CDF_STATUS sme_cfg_set_int(tHalHandle hal, uint16_t cfg_id, uint32_t value); -CDF_STATUS sme_cfg_set_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, +QDF_STATUS sme_cfg_set_int(tHalHandle hal, uint16_t cfg_id, uint32_t value); +QDF_STATUS sme_cfg_set_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, uint32_t length); -CDF_STATUS sme_cfg_get_int(tHalHandle hal, uint16_t cfg_id, +QDF_STATUS sme_cfg_get_int(tHalHandle hal, uint16_t cfg_id, uint32_t *cfg_value); -CDF_STATUS sme_cfg_get_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, +QDF_STATUS sme_cfg_get_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, uint32_t *length); -CDF_STATUS sme_get_modify_profile_fields(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_get_modify_profile_fields(tHalHandle hHal, uint8_t sessionId, tCsrRoamModifyProfileFields * pModifyProfileFields); -extern CDF_STATUS sme_set_host_power_save(tHalHandle hHal, bool psMode); +extern QDF_STATUS sme_set_host_power_save(tHalHandle hHal, bool psMode); void sme_set_dhcp_till_power_active_flag(tHalHandle hHal, uint8_t flag); -extern CDF_STATUS sme_register11d_scan_done_callback(tHalHandle hHal, +extern QDF_STATUS sme_register11d_scan_done_callback(tHalHandle hHal, csr_scan_completeCallback); #ifdef FEATURE_OEM_DATA_SUPPORT -extern CDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal, +extern QDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal, sme_send_oem_data_rsp_msg callback); #else -static inline CDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal, +static inline QDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal, sme_send_oem_data_rsp_msg callback) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif -extern CDF_STATUS sme_wow_add_pattern(tHalHandle hHal, +extern QDF_STATUS sme_wow_add_pattern(tHalHandle hHal, struct wow_add_pattern *pattern, uint8_t sessionId); -extern CDF_STATUS sme_wow_delete_pattern(tHalHandle hHal, +extern QDF_STATUS sme_wow_delete_pattern(tHalHandle hHal, struct wow_delete_pattern *pattern, uint8_t sessionId); void sme_register_ftm_msg_processor(tHalHandle hal, hdd_ftm_msg_processor callback); -extern CDF_STATUS sme_enter_wowl(tHalHandle hHal, +extern QDF_STATUS sme_enter_wowl(tHalHandle hHal, void (*enter_wowl_callback_routine)(void *callbackContext, - CDF_STATUS status), + QDF_STATUS status), void *enter_wowl_callback_context, #ifdef WLAN_WAKEUP_EVENTS void (*wake_reason_ind_cb)(void *callbackContext, @@ -401,11 +401,11 @@ extern CDF_STATUS sme_enter_wowl(tHalHandle hHal, tpSirSmeWowlEnterParams wowl_enter_params, uint8_t sessionId); -extern CDF_STATUS sme_exit_wowl(tHalHandle hHal, +extern QDF_STATUS sme_exit_wowl(tHalHandle hHal, tpSirSmeWowlExitParams wowl_exit_params); -CDF_STATUS sme_roam_set_key(tHalHandle, uint8_t sessionId, +QDF_STATUS sme_roam_set_key(tHalHandle, uint8_t sessionId, tCsrRoamSetKey *pSetKey, uint32_t *pRoamId); -CDF_STATUS sme_get_country_code(tHalHandle hHal, uint8_t *pBuf, uint8_t *pbLen); +QDF_STATUS sme_get_country_code(tHalHandle hHal, uint8_t *pBuf, uint8_t *pbLen); void sme_apply_channel_power_info_to_fw(tHalHandle hHal); @@ -416,86 +416,86 @@ bool sme_is11h_supported(tHalHandle hHal); bool sme_is_wmm_supported(tHalHandle hHal); typedef void (*tSmeChangeCountryCallback)(void *pContext); -CDF_STATUS sme_change_country_code(tHalHandle hHal, +QDF_STATUS sme_change_country_code(tHalHandle hHal, tSmeChangeCountryCallback callback, uint8_t *pCountry, void *pContext, void *p_cds_context, tAniBool countryFromUserSpace, tAniBool sendRegHint); -CDF_STATUS sme_generic_change_country_code(tHalHandle hHal, +QDF_STATUS sme_generic_change_country_code(tHalHandle hHal, uint8_t *pCountry); -CDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, +QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, uint8_t device_mode, uint8_t *macAddr, uint8_t sessionId); -CDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, +QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, uint8_t device_mode, uint8_t *macAddr, uint8_t sessionId); void sme_set_cfg_privacy(tHalHandle hHal, tCsrRoamProfile *pProfile, bool fPrivacy); void sme_get_recovery_stats(tHalHandle hHal); #if defined WLAN_FEATURE_VOWIFI -CDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, tpRrmNeighborReq pRrmNeighborReq, tpRrmNeighborRspCallbackInfo callbackInfo); #endif -CDF_STATUS sme_get_wcnss_wlan_compiled_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_wlan_compiled_version(tHalHandle hHal, tSirVersionType * pVersion); -CDF_STATUS sme_get_wcnss_wlan_reported_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_wlan_reported_version(tHalHandle hHal, tSirVersionType *pVersion); -CDF_STATUS sme_get_wcnss_software_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_software_version(tHalHandle hHal, uint8_t *pVersion, uint32_t versionBufferSize); -CDF_STATUS sme_get_wcnss_hardware_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_hardware_version(tHalHandle hHal, uint8_t *pVersion, uint32_t versionBufferSize); #ifdef FEATURE_WLAN_WAPI -CDF_STATUS sme_scan_get_bkid_candidate_list(tHalHandle hHal, uint32_t sessionId, +QDF_STATUS sme_scan_get_bkid_candidate_list(tHalHandle hHal, uint32_t sessionId, tBkidCandidateInfo * pBkidList, uint32_t *pNumItems); #endif /* FEATURE_WLAN_WAPI */ #ifdef FEATURE_OEM_DATA_SUPPORT -CDF_STATUS sme_oem_data_req(tHalHandle hHal, +QDF_STATUS sme_oem_data_req(tHalHandle hHal, uint8_t sessionId, tOemDataReqConfig *, uint32_t *pOemDataReqID); -CDF_STATUS sme_oem_update_capability(tHalHandle hHal, +QDF_STATUS sme_oem_update_capability(tHalHandle hHal, struct sme_oem_capability *cap); -CDF_STATUS sme_oem_get_capability(tHalHandle hHal, +QDF_STATUS sme_oem_get_capability(tHalHandle hHal, struct sme_oem_capability *cap); #endif /*FEATURE_OEM_DATA_SUPPORT */ -CDF_STATUS sme_roam_update_apwpsie(tHalHandle, uint8_t sessionId, +QDF_STATUS sme_roam_update_apwpsie(tHalHandle, uint8_t sessionId, tSirAPWPSIEs * pAPWPSIES); -CDF_STATUS sme_roam_update_apwparsni_es(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_update_apwparsni_es(tHalHandle hHal, uint8_t sessionId, tSirRSNie *pAPSirRSNie); -CDF_STATUS sme_change_mcc_beacon_interval(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_set_host_offload(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_change_mcc_beacon_interval(tHalHandle hHal, uint8_t sessionId); +QDF_STATUS sme_set_host_offload(tHalHandle hHal, uint8_t sessionId, tpSirHostOffloadReq pRequest); -CDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t sessionId, tpSirKeepAliveReq pRequest); -CDF_STATUS sme_get_operation_channel(tHalHandle hHal, uint32_t *pChannel, +QDF_STATUS sme_get_operation_channel(tHalHandle hHal, uint32_t *pChannel, uint8_t sessionId); -CDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, uint16_t frameType, uint8_t *matchData, uint16_t matchLen); -CDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, uint16_t frameType, uint8_t *matchData, uint16_t matchLen); -CDF_STATUS sme_configure_rxp_filter(tHalHandle hHal, +QDF_STATUS sme_configure_rxp_filter(tHalHandle hHal, tpSirWlanSetRxpFilters wlanRxpFilterParam); -CDF_STATUS sme_ConfigureAppsCpuWakeupState(tHalHandle hHal, bool isAppsAwake); -CDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, +QDF_STATUS sme_ConfigureAppsCpuWakeupState(tHalHandle hHal, bool isAppsAwake); +QDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, uint32_t conn_state_mask, csr_readyToSuspendCallback, void *callbackContext); -CDF_STATUS sme_configure_resume_req(tHalHandle hHal, +QDF_STATUS sme_configure_resume_req(tHalHandle hHal, tpSirWlanResumeParam wlanResumeParam); #ifdef WLAN_FEATURE_EXTWOW_SUPPORT -CDF_STATUS sme_configure_ext_wow(tHalHandle hHal, +QDF_STATUS sme_configure_ext_wow(tHalHandle hHal, tpSirExtWoWParams wlanExtParams, csr_readyToSuspendCallback callback, void *callbackContext); -CDF_STATUS sme_configure_app_type1_params(tHalHandle hHal, +QDF_STATUS sme_configure_app_type1_params(tHalHandle hHal, tpSirAppType1Params wlanAppType1Params); -CDF_STATUS sme_configure_app_type2_params(tHalHandle hHal, +QDF_STATUS sme_configure_app_type2_params(tHalHandle hHal, tpSirAppType2Params wlanAppType2Params); #endif int8_t sme_get_infra_session_id(tHalHandle hHal); @@ -506,62 +506,62 @@ uint16_t sme_check_concurrent_channel_overlap(tHalHandle hHal, uint16_t sap_ch, eCsrPhyMode sapPhyMode, uint8_t cc_switch_mode); #endif -CDF_STATUS sme_abort_mac_scan(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_abort_mac_scan(tHalHandle hHal, uint8_t sessionId, eCsrAbortReason reason); -CDF_STATUS sme_get_cfg_valid_channels(tHalHandle hHal, uint8_t *aValidChannels, +QDF_STATUS sme_get_cfg_valid_channels(tHalHandle hHal, uint8_t *aValidChannels, uint32_t *len); #ifdef FEATURE_WLAN_SCAN_PNO -CDF_STATUS sme_set_preferred_network_list(tHalHandle hHal, +QDF_STATUS sme_set_preferred_network_list(tHalHandle hHal, tpSirPNOScanReq pRequest, uint8_t sessionId, preferred_network_found_ind_cb callbackRoutine, void *callbackContext); -CDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg); +QDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg); #endif /* FEATURE_WLAN_SCAN_PNO */ #ifdef WLAN_FEATURE_PACKET_FILTERING -CDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, tpSirRcvFltMcAddrList pMulticastAddrs); -CDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, +QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, tpSirRcvPktFilterCfgType pRcvPktFilterCfg, uint8_t sessionId); -CDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, +QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, tpSirRcvFltPktClearParam pRcvFltPktClearParam, uint8_t sessionId); #endif /* WLAN_FEATURE_PACKET_FILTERING */ bool sme_is_channel_valid(tHalHandle hHal, uint8_t channel); -CDF_STATUS sme_set_freq_band(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_freq_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand); -CDF_STATUS sme_get_freq_band(tHalHandle hHal, eCsrBand *pBand); +QDF_STATUS sme_get_freq_band(tHalHandle hHal, eCsrBand *pBand); #ifdef WLAN_FEATURE_GTK_OFFLOAD -CDF_STATUS sme_set_gtk_offload(tHalHandle hal_ctx, +QDF_STATUS sme_set_gtk_offload(tHalHandle hal_ctx, tpSirGtkOffloadParams request, uint8_t session_id); -CDF_STATUS sme_get_gtk_offload(tHalHandle hal_ctx, +QDF_STATUS sme_get_gtk_offload(tHalHandle hal_ctx, gtk_offload_get_info_callback callback_routine, void *callback_context, uint8_t session_id); #endif /* WLAN_FEATURE_GTK_OFFLOAD */ uint16_t sme_chn_to_freq(uint8_t chanNum); bool sme_is_channel_valid(tHalHandle hHal, uint8_t channel); -CDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, +QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, struct cdf_mac_addr pSelfMacAddress, int8_t dB); -CDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t db); -CDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t db); +QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, struct cdf_mac_addr bssid, enum tCDF_ADAPTER_MODE dev_mode, int power); -CDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr); -CDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr); +QDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden); -CDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, +QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMode); void sme_feature_caps_exchange(tHalHandle hHal); void sme_disable_feature_capablity(uint8_t feature_index); void sme_reset_power_values_for5_g(tHalHandle hHal); -CDF_STATUS sme_update_roam_prefer5_g_hz(tHalHandle hHal, bool nRoamPrefer5GHz); -CDF_STATUS sme_set_roam_intra_band(tHalHandle hHal, const bool nRoamIntraBand); -CDF_STATUS sme_update_roam_scan_n_probes(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_update_roam_prefer5_g_hz(tHalHandle hHal, bool nRoamPrefer5GHz); +QDF_STATUS sme_set_roam_intra_band(tHalHandle hHal, const bool nRoamIntraBand); +QDF_STATUS sme_update_roam_scan_n_probes(tHalHandle hHal, uint8_t sessionId, const uint8_t nProbes); -CDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal, +QDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal, uint8_t sessionId, const uint16_t nRoamScanHomeAwayTime, const bool bSendOffloadCmd); @@ -569,56 +569,56 @@ CDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal, bool sme_get_roam_intra_band(tHalHandle hHal); uint8_t sme_get_roam_scan_n_probes(tHalHandle hHal); uint16_t sme_get_roam_scan_home_away_time(tHalHandle hHal); -CDF_STATUS sme_update_roam_rssi_diff(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_update_roam_rssi_diff(tHalHandle hHal, uint8_t sessionId, uint8_t RoamRssiDiff); -CDF_STATUS sme_update_fast_transition_enabled(tHalHandle hHal, +QDF_STATUS sme_update_fast_transition_enabled(tHalHandle hHal, bool isFastTransitionEnabled); -CDF_STATUS sme_update_wes_mode(tHalHandle hHal, bool isWESModeEnabled, +QDF_STATUS sme_update_wes_mode(tHalHandle hHal, bool isWESModeEnabled, uint8_t sessionId); -CDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, bool roamScanControl); -CDF_STATUS sme_update_is_fast_roam_ini_feature_enabled(tHalHandle hHal, +QDF_STATUS sme_update_is_fast_roam_ini_feature_enabled(tHalHandle hHal, uint8_t sessionId, const bool isFastRoamIniFeatureEnabled); -CDF_STATUS sme_update_is_mawc_ini_feature_enabled(tHalHandle hHal, +QDF_STATUS sme_update_is_mawc_ini_feature_enabled(tHalHandle hHal, const bool MAWCEnabled); -CDF_STATUS sme_stop_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason); -CDF_STATUS sme_start_roaming(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_stop_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason); +QDF_STATUS sme_start_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason); -CDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal, +QDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal, bool bFastRoamInConIniFeatureEnabled); #ifdef FEATURE_WLAN_ESE -CDF_STATUS sme_update_is_ese_feature_enabled(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_update_is_ese_feature_enabled(tHalHandle hHal, uint8_t sessionId, const bool isEseIniFeatureEnabled); #endif /* FEATURE_WLAN_ESE */ -CDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, +QDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, bool fEnableFwRssiMonitoring); -CDF_STATUS sme_set_roam_rescan_rssi_diff(tHalHandle hHal, +QDF_STATUS sme_set_roam_rescan_rssi_diff(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamRescanRssiDiff); uint8_t sme_get_roam_rescan_rssi_diff(tHalHandle hHal); -CDF_STATUS sme_set_roam_opportunistic_scan_threshold_diff(tHalHandle hHal, +QDF_STATUS sme_set_roam_opportunistic_scan_threshold_diff(tHalHandle hHal, uint8_t sessionId, const uint8_t nOpportunisticThresholdDiff); uint8_t sme_get_roam_opportunistic_scan_threshold_diff(tHalHandle hHal); -CDF_STATUS sme_set_neighbor_lookup_rssi_threshold(tHalHandle hHal, +QDF_STATUS sme_set_neighbor_lookup_rssi_threshold(tHalHandle hHal, uint8_t sessionId, uint8_t neighborLookupRssiThreshold); -CDF_STATUS sme_set_delay_before_vdev_stop(tHalHandle hHal, +QDF_STATUS sme_set_delay_before_vdev_stop(tHalHandle hHal, uint8_t sessionId, uint8_t delay_before_vdev_stop); uint8_t sme_get_neighbor_lookup_rssi_threshold(tHalHandle hHal); -CDF_STATUS sme_set_neighbor_scan_refresh_period(tHalHandle hHal, +QDF_STATUS sme_set_neighbor_scan_refresh_period(tHalHandle hHal, uint8_t sessionId, uint16_t neighborScanResultsRefreshPeriod); uint16_t sme_get_neighbor_scan_refresh_period(tHalHandle hHal); uint16_t sme_get_empty_scan_refresh_period(tHalHandle hHal); -CDF_STATUS sme_update_empty_scan_refresh_period(tHalHandle hHal, +QDF_STATUS sme_update_empty_scan_refresh_period(tHalHandle hHal, uint8_t sessionId, uint16_t nEmptyScanRefreshPeriod); -CDF_STATUS sme_set_neighbor_scan_min_chan_time(tHalHandle hHal, +QDF_STATUS sme_set_neighbor_scan_min_chan_time(tHalHandle hHal, const uint16_t nNeighborScanMinChanTime, uint8_t sessionId); -CDF_STATUS sme_set_neighbor_scan_max_chan_time(tHalHandle hHal, +QDF_STATUS sme_set_neighbor_scan_max_chan_time(tHalHandle hHal, uint8_t sessionId, const uint16_t nNeighborScanMaxChanTime); uint16_t sme_get_neighbor_scan_min_chan_time(tHalHandle hHal, uint8_t sessionId); @@ -632,28 +632,28 @@ uint32_t sme_get_lim_sme_session_state(tHalHandle hHal, uint8_t sessionId); uint32_t sme_get_lim_mlm_session_state(tHalHandle hHal, uint8_t sessionId); uint16_t sme_get_neighbor_scan_max_chan_time(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_set_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId, const uint16_t nNeighborScanPeriod); uint16_t sme_get_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_set_roam_bmiss_first_bcnt(tHalHandle hHal, +QDF_STATUS sme_set_roam_bmiss_first_bcnt(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamBmissFirstBcnt); uint8_t sme_get_roam_bmiss_first_bcnt(tHalHandle hHal); -CDF_STATUS sme_set_roam_bmiss_final_bcnt(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_roam_bmiss_final_bcnt(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamBmissFinalBcnt); uint8_t sme_get_roam_bmiss_final_bcnt(tHalHandle hHal); -CDF_STATUS sme_set_roam_beacon_rssi_weight(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_roam_beacon_rssi_weight(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamBeaconRssiWeight); uint8_t sme_get_roam_beacon_rssi_weight(tHalHandle hHal); uint8_t sme_get_roam_rssi_diff(tHalHandle hHal); -CDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, uint8_t *pChannelList, uint8_t numChannels); #ifdef FEATURE_WLAN_ESE_UPLOAD -CDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, +QDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, uint8_t *pChannelList, uint8_t numChannels); #endif -CDF_STATUS sme_get_roam_scan_channel_list(tHalHandle hHal, +QDF_STATUS sme_get_roam_scan_channel_list(tHalHandle hHal, uint8_t *pChannelList, uint8_t *pNumChannels, uint8_t sessionId); bool sme_get_is_ese_feature_enabled(tHalHandle hHal); @@ -661,30 +661,30 @@ bool sme_get_wes_mode(tHalHandle hHal); bool sme_get_roam_scan_control(tHalHandle hHal); bool sme_get_is_lfr_feature_enabled(tHalHandle hHal); bool sme_get_is_ft_feature_enabled(tHalHandle hHal); -CDF_STATUS sme_update_roam_scan_offload_enabled(tHalHandle hHal, +QDF_STATUS sme_update_roam_scan_offload_enabled(tHalHandle hHal, bool nRoamScanOffloadEnabled); uint8_t sme_is_feature_supported_by_fw(uint8_t featEnumValue); #ifdef FEATURE_WLAN_TDLS -CDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, +QDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrTdlsLinkEstablishParams * tdlsLinkEstablishParams); -CDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, uint8_t frame_type, uint8_t dialog, uint16_t status, uint32_t peerCapability, uint8_t *buf, uint8_t len, uint8_t responder); -CDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrStaParams *pstaParams); -CDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac); -CDF_STATUS sme_delete_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_delete_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac); void sme_set_tdls_power_save_prohibited(tHalHandle hHal, uint32_t sessionId, bool val); -CDF_STATUS sme_send_tdls_chan_switch_req( +QDF_STATUS sme_send_tdls_chan_switch_req( tHalHandle hal, sme_tdls_chan_switch_params *ch_switch_params); #endif @@ -693,31 +693,31 @@ CDF_STATUS sme_send_tdls_chan_switch_req( * SME API to enable/disable WLAN driver initiated SSR */ void sme_update_enable_ssr(tHalHandle hHal, bool enableSSR); -CDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode); +QDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode); eCsrPhyMode sme_get_phy_mode(tHalHandle hHal); /* * SME API to determine the channel bonding mode */ -CDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, +QDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, uint8_t channel, uint8_t ht_sec_ch, chan_params_t *ch_params); -CDF_STATUS sme_handoff_request(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_handoff_request(tHalHandle hHal, uint8_t sessionId, tCsrHandoffRequest *pHandoffInfo); -CDF_STATUS sme_is_sta_p2p_client_connected(tHalHandle hHal); +QDF_STATUS sme_is_sta_p2p_client_connected(tHalHandle hHal); #ifdef FEATURE_WLAN_LPHB -CDF_STATUS sme_lphb_config_req(tHalHandle hHal, +QDF_STATUS sme_lphb_config_req(tHalHandle hHal, tSirLPHBReq * lphdReq, void (*pCallbackfn)(void *pHddCtx, tSirLPHBInd * indParam)); #endif /* FEATURE_WLAN_LPHB */ -CDF_STATUS sme_add_periodic_tx_ptrn(tHalHandle hHal, tSirAddPeriodicTxPtrn +QDF_STATUS sme_add_periodic_tx_ptrn(tHalHandle hHal, tSirAddPeriodicTxPtrn *addPeriodicTxPtrnParams); -CDF_STATUS sme_del_periodic_tx_ptrn(tHalHandle hHal, tSirDelPeriodicTxPtrn +QDF_STATUS sme_del_periodic_tx_ptrn(tHalHandle hHal, tSirDelPeriodicTxPtrn *delPeriodicTxPtrnParams); void sme_enable_disable_split_scan(tHalHandle hHal, uint8_t nNumStaChan, uint8_t nNumP2PChan); -CDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, +QDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, tSirRateUpdateInd *rateUpdateParams); -CDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId, const uint8_t *pBSSId, bool flush_cache); void sme_get_command_q_status(tHalHandle hHal); @@ -726,9 +726,9 @@ void sme_get_command_q_status(tHalHandle hHal); * This should be called only if powersave offload * is enabled */ -CDF_STATUS sme_set_idle_powersave_config(void *cds_context, +QDF_STATUS sme_set_idle_powersave_config(void *cds_context, tHalHandle hHal, uint32_t value); -CDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value); +QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value); /*SME API to convert convert the ini value to the ENUM used in csr and MAC*/ ePhyChanBondState sme_get_cb_phy_state_from_cb_ini_value(uint32_t cb_ini_value); @@ -737,66 +737,66 @@ int sme_update_ht_config(tHalHandle hHal, uint8_t sessionId, uint16_t htCapab, int16_t sme_get_ht_config(tHalHandle hHal, uint8_t session_id, uint16_t ht_capab); #ifdef QCA_HT_2040_COEX -CDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, +QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, struct cdf_mac_addr macAddrSTA, uint8_t sessionId, uint8_t channel_type); -CDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, uint8_t channel_type, bool obssEnabled); #endif -CDF_STATUS sme_get_reg_info(tHalHandle hHal, uint8_t chanId, +QDF_STATUS sme_get_reg_info(tHalHandle hHal, uint8_t chanId, uint32_t *regInfo1, uint32_t *regInfo2); #ifdef FEATURE_WLAN_TDLS -CDF_STATUS sme_update_fw_tdls_state(tHalHandle hHal, void *psmeTdlsParams, +QDF_STATUS sme_update_fw_tdls_state(tHalHandle hHal, void *psmeTdlsParams, bool useSmeLock); -CDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, +QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, tSmeTdlsPeerStateParams *pPeerStateParams); #endif /* FEATURE_WLAN_TDLS */ #ifdef FEATURE_WLAN_CH_AVOID -CDF_STATUS sme_add_ch_avoid_callback(tHalHandle hHal, +QDF_STATUS sme_add_ch_avoid_callback(tHalHandle hHal, void (*pCallbackfn)(void *hdd_context, void *indi_param)); -CDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal); +QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal); #else static inline -CDF_STATUS sme_add_ch_avoid_callback(tHalHandle hHal, +QDF_STATUS sme_add_ch_avoid_callback(tHalHandle hHal, void (*pCallbackfn)(void *hdd_context, void *indi_param)) { - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } static inline -CDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) +QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) { - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } #endif /* FEATURE_WLAN_CH_AVOID */ #ifdef FEATURE_WLAN_AUTO_SHUTDOWN -CDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void)); -CDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_value); +QDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void)); +QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_value); #endif -CDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, +QDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, struct cdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile); -CDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, +QDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct cdf_mac_addr bssid, uint8_t dfsCacWaitStatus); -CDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct cdf_mac_addr bssid, +QDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct cdf_mac_addr bssid, uint8_t targetChannel, uint8_t csaIeReqd, chan_params_t *ch_params); -CDF_STATUS sme_init_thermal_info(tHalHandle hHal, +QDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam); -CDF_STATUS sme_set_thermal_level(tHalHandle hHal, uint8_t level); -CDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx); -CDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, +QDF_STATUS sme_set_thermal_level(tHalHandle hHal, uint8_t level); +QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx); +QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, void *plsContext, void (*pCallbackfn)(tSirLinkSpeedInfo *indParam, void *pContext)); -CDF_STATUS sme_modify_add_ie(tHalHandle hHal, +QDF_STATUS sme_modify_add_ie(tHalHandle hHal, tSirModifyIE *pModifyIE, eUpdateIEsType updateType); -CDF_STATUS sme_update_add_ie(tHalHandle hHal, +QDF_STATUS sme_update_add_ie(tHalHandle hHal, tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType); -CDF_STATUS sme_update_connect_debug(tHalHandle hHal, uint32_t set_value); +QDF_STATUS sme_update_connect_debug(tHalHandle hHal, uint32_t set_value); const char *sme_request_type_to_string(const uint8_t request_type); -CDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId, bool disablefwd); uint32_t sme_get_channel_bonding_mode5_g(tHalHandle hHal); uint32_t sme_get_channel_bonding_mode24_g(tHalHandle hHal); @@ -808,98 +808,98 @@ typedef struct sStatsExtRequestReq { typedef void (*StatsExtCallback)(void *, tStatsExtEvent *); void sme_stats_ext_register_callback(tHalHandle hHal, StatsExtCallback callback); -CDF_STATUS sme_stats_ext_request(uint8_t session_id, +QDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input); -CDF_STATUS sme_stats_ext_event(tHalHandle hHal, void *pMsg); +QDF_STATUS sme_stats_ext_event(tHalHandle hHal, void *pMsg); #endif -CDF_STATUS sme_update_dfs_scan_mode(tHalHandle hHal, +QDF_STATUS sme_update_dfs_scan_mode(tHalHandle hHal, uint8_t sessionId, uint8_t allowDFSChannelRoam); uint8_t sme_get_dfs_scan_mode(tHalHandle hHal); bool sme_sta_in_middle_of_roaming(tHalHandle hHal, uint8_t sessionId); #ifdef FEATURE_WLAN_EXTSCAN -CDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, uint8_t wifiBand, +QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, uint8_t wifiBand, uint32_t *aValidChannels, uint8_t *pNumChannels); -CDF_STATUS sme_ext_scan_get_capabilities(tHalHandle hHal, +QDF_STATUS sme_ext_scan_get_capabilities(tHalHandle hHal, tSirGetExtScanCapabilitiesReqParams *pReq); -CDF_STATUS sme_ext_scan_start(tHalHandle hHal, +QDF_STATUS sme_ext_scan_start(tHalHandle hHal, tSirWifiScanCmdReqParams *pStartCmd); -CDF_STATUS sme_ext_scan_stop(tHalHandle hHal, +QDF_STATUS sme_ext_scan_stop(tHalHandle hHal, tSirExtScanStopReqParams *pStopReq); -CDF_STATUS sme_set_bss_hotlist(tHalHandle hHal, +QDF_STATUS sme_set_bss_hotlist(tHalHandle hHal, tSirExtScanSetBssidHotListReqParams * pSetHotListReq); -CDF_STATUS sme_reset_bss_hotlist(tHalHandle hHal, +QDF_STATUS sme_reset_bss_hotlist(tHalHandle hHal, tSirExtScanResetBssidHotlistReqParams * pResetReq); -CDF_STATUS sme_set_significant_change(tHalHandle hHal, +QDF_STATUS sme_set_significant_change(tHalHandle hHal, tSirExtScanSetSigChangeReqParams * pSetSignificantChangeReq); -CDF_STATUS sme_reset_significant_change(tHalHandle hHal, +QDF_STATUS sme_reset_significant_change(tHalHandle hHal, tSirExtScanResetSignificantChangeReqParams *pResetReq); -CDF_STATUS sme_get_cached_results(tHalHandle hHal, +QDF_STATUS sme_get_cached_results(tHalHandle hHal, tSirExtScanGetCachedResultsReqParams * pCachedResultsReq); -CDF_STATUS sme_set_epno_list(tHalHandle hal, +QDF_STATUS sme_set_epno_list(tHalHandle hal, struct wifi_epno_params *req_msg); -CDF_STATUS sme_set_passpoint_list(tHalHandle hal, +QDF_STATUS sme_set_passpoint_list(tHalHandle hal, struct wifi_passpoint_req *req_msg); -CDF_STATUS sme_reset_passpoint_list(tHalHandle hal, +QDF_STATUS sme_reset_passpoint_list(tHalHandle hal, struct wifi_passpoint_req *req_msg); -CDF_STATUS +QDF_STATUS sme_set_ssid_hotlist(tHalHandle hal, struct sir_set_ssid_hotlist_request *request); -CDF_STATUS sme_ext_scan_register_callback(tHalHandle hHal, +QDF_STATUS sme_ext_scan_register_callback(tHalHandle hHal, void (*pExtScanIndCb)(void *, const uint16_t, void *)); #else -static inline CDF_STATUS sme_ext_scan_register_callback(tHalHandle hHal, +static inline QDF_STATUS sme_ext_scan_register_callback(tHalHandle hHal, void (*pExtScanIndCb)(void *, const uint16_t, void *)) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_EXTSCAN */ -CDF_STATUS sme_abort_roam_scan(tHalHandle hHal, uint8_t sessionId); +QDF_STATUS sme_abort_roam_scan(tHalHandle hHal, uint8_t sessionId); #ifdef WLAN_FEATURE_LINK_LAYER_STATS -CDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, +QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, tSirLLStatsClearReq * pclearStatsReq); -CDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, +QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq); -CDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, +QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq); -CDF_STATUS sme_set_link_layer_stats_ind_cb(tHalHandle hHal, +QDF_STATUS sme_set_link_layer_stats_ind_cb(tHalHandle hHal, void (*callbackRoutine)(void *callbackCtx, int indType, void *pRsp)); #endif /* WLAN_FEATURE_LINK_LAYER_STATS */ -CDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req); -CDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hHal, +QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req); +QDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hHal, void (*callback_routine)(void *cb_context, struct fw_dump_rsp *rsp)); -CDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hHal); +QDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hHal); #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS sme_update_roam_offload_enabled(tHalHandle hHal, +QDF_STATUS sme_update_roam_offload_enabled(tHalHandle hHal, bool nRoamOffloadEnabled); -CDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal, +QDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal, uint8_t sessionId, bool nRoamKeyMgmtOffloadEnabled); #endif #ifdef WLAN_FEATURE_NAN -CDF_STATUS sme_nan_event(tHalHandle hHal, void *pMsg); +QDF_STATUS sme_nan_event(tHalHandle hHal, void *pMsg); #endif /* WLAN_FEATURE_NAN */ -CDF_STATUS sme_get_link_status(tHalHandle hHal, +QDF_STATUS sme_get_link_status(tHalHandle hHal, tCsrLinkStatusCallback callback, void *pContext, uint8_t sessionId); -CDF_STATUS sme_get_temperature(tHalHandle hHal, +QDF_STATUS sme_get_temperature(tHalHandle hHal, void *tempContext, void (*pCallbackfn)(int temperature, void *pContext)); -CDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, +QDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, tSirScanMacOui *pScanMacOui); #ifdef IPA_OFFLOAD @@ -911,48 +911,48 @@ CDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, \param pRequest - Pointer to the offload request. \return eHalStatus ---------------------------------------------------------------------------*/ -CDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, +QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, struct sir_ipa_offload_enable_disable *request); #else -static inline CDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, +static inline QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, struct sir_ipa_offload_enable_disable *request) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* IPA_OFFLOAD */ #ifdef DHCP_SERVER_OFFLOAD -CDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, +QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, tSirDhcpSrvOffloadInfo * pDhcpSrvInfo); #endif /* DHCP_SERVER_OFFLOAD */ #ifdef WLAN_FEATURE_GPIO_LED_FLASHING -CDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, +QDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, uint32_t x0, uint32_t x1); #endif -CDF_STATUS sme_handle_dfs_chan_scan(tHalHandle hHal, uint8_t dfs_flag); -CDF_STATUS sme_set_mas(uint32_t val); -CDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type); -CDF_STATUS sme_ext_change_channel(tHalHandle hHal, uint32_t channel, +QDF_STATUS sme_handle_dfs_chan_scan(tHalHandle hHal, uint8_t dfs_flag); +QDF_STATUS sme_set_mas(uint32_t val); +QDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type); +QDF_STATUS sme_ext_change_channel(tHalHandle hHal, uint32_t channel, uint8_t session_id); -CDF_STATUS sme_configure_modulated_dtim(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_configure_modulated_dtim(tHalHandle hal, uint8_t session_id, uint32_t modulated_dtim); -CDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, uint16_t stats_avg_factor); -CDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, uint32_t guard_time); -CDF_STATUS sme_wifi_start_logger(tHalHandle hal, +QDF_STATUS sme_wifi_start_logger(tHalHandle hal, struct sir_wifi_start_log start_log); bool sme_neighbor_middle_of_roaming(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, +QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, sme_ac_enum_type ac, uint8_t tid, uint8_t pri, uint32_t srvc_int, uint32_t sus_int, @@ -960,46 +960,46 @@ CDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, uint8_t psb, uint32_t sessionId, uint32_t delay_interval); -CDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, +QDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, sme_ac_enum_type ac, uint32_t sessionId); -CDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, +QDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, struct rssi_monitor_req *input); -CDF_STATUS sme_set_rssi_threshold_breached_cb(tHalHandle hal, +QDF_STATUS sme_set_rssi_threshold_breached_cb(tHalHandle hal, void (*cb)(void *, struct rssi_breach_event *)); -CDF_STATUS sme_register_mgmt_frame_ind_callback(tHalHandle hal, +QDF_STATUS sme_register_mgmt_frame_ind_callback(tHalHandle hal, sir_mgmt_frame_ind_callback callback); -CDF_STATUS sme_update_nss(tHalHandle h_hal, uint8_t nss); +QDF_STATUS sme_update_nss(tHalHandle h_hal, uint8_t nss); bool sme_is_any_session_in_connected_state(tHalHandle h_hal); -CDF_STATUS sme_soc_set_pcl(tHalHandle hal, +QDF_STATUS sme_soc_set_pcl(tHalHandle hal, struct sir_pcl_list msg); -CDF_STATUS sme_soc_set_hw_mode(tHalHandle hal, +QDF_STATUS sme_soc_set_hw_mode(tHalHandle hal, struct sir_hw_mode msg); void sme_register_hw_mode_trans_cb(tHalHandle hal, hw_mode_transition_cb callback); -CDF_STATUS sme_nss_update_request(tHalHandle hHal, uint32_t vdev_id, +QDF_STATUS sme_nss_update_request(tHalHandle hHal, uint32_t vdev_id, uint8_t new_nss, void *cback, uint8_t next_action, void *hdd_context); typedef void (*sme_peer_authorized_fp) (uint32_t vdev_id); -CDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, +QDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, sme_peer_authorized_fp auth_fp, uint32_t vdev_id); -CDF_STATUS sme_soc_set_dual_mac_config(tHalHandle hal, +QDF_STATUS sme_soc_set_dual_mac_config(tHalHandle hal, struct sir_dual_mac_config msg); void sme_set_scan_disable(tHalHandle h_hal, int value); void sme_setdef_dot11mode(tHalHandle hal); -CDF_STATUS sme_disable_non_fcc_channel(tHalHandle hHal, +QDF_STATUS sme_disable_non_fcc_channel(tHalHandle hHal, bool fcc_constraint); -CDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, +QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, uint8_t session_id, uint32_t notify_id, int32_t val); @@ -1007,38 +1007,38 @@ CDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, void wlan_sap_enable_phy_error_logs(tHalHandle hal, bool enable_log); void sme_set_dot11p_config(tHalHandle hal, bool enable_dot11p); -CDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, +QDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, ocb_callback callback, struct sir_ocb_config *config); -CDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc); +QDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc); -CDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, +QDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, struct sir_ocb_timing_advert *timing_advert); -CDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, +QDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, struct sir_ocb_timing_advert *timing_advert); int sme_ocb_gen_timing_advert_frame(tHalHandle hHal, tSirMacAddr self_addr, uint8_t **buf, uint32_t *timestamp_offset, uint32_t *time_value_offset); -CDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context, +QDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context, ocb_callback callback, struct sir_ocb_get_tsf_timer *request); -CDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, +QDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, ocb_callback callback, struct sir_dcc_get_stats *request); -CDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, +QDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, uint32_t dcc_stats_bitmap); -CDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, +QDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, ocb_callback callback, struct sir_dcc_update_ndl *request); -CDF_STATUS sme_register_for_dcc_stats_event(tHalHandle hHal, void *context, +QDF_STATUS sme_register_for_dcc_stats_event(tHalHandle hHal, void *context, ocb_callback callback); void sme_add_set_thermal_level_callback(tHalHandle hal, sme_set_thermal_level_callback callback); @@ -1060,22 +1060,22 @@ sme_get_opclass(tHalHandle hal, uint8_t channel, uint8_t bw_offset, #endif #ifdef FEATURE_LFR_SUBNET_DETECTION -CDF_STATUS sme_gateway_param_update(tHalHandle hHal, +QDF_STATUS sme_gateway_param_update(tHalHandle hHal, struct gateway_param_update_req *request); #endif #ifdef FEATURE_GREEN_AP -CDF_STATUS sme_send_egap_conf_params(uint32_t enable, +QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, uint32_t wait_time, uint32_t flags); #else -static inline CDF_STATUS sme_send_egap_conf_params(uint32_t enable, +static inline QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, uint32_t wait_time, uint32_t flags) { - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } #endif #endif /* #if !defined( __SME_API_H ) */ diff --git a/core/sme/inc/sme_ft_api.h b/core/sme/inc/sme_ft_api.h index 71c97aa9ac..ba2a1a9838 100644 --- a/core/sme/inc/sme_ft_api.h +++ b/core/sme/inc/sme_ft_api.h @@ -89,7 +89,7 @@ void sme_ft_close(tHalHandle hHal, uint32_t sessionId); void sme_ft_reset(tHalHandle hHal, uint32_t sessionId); void sme_set_ft_ies(tHalHandle hHal, uint32_t sessionId, const uint8_t *ft_ies, uint16_t ft_ies_length); -CDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId, +QDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId, tCsrRoamSetKey *pFTKeyInfo); void sme_get_ft_pre_auth_response(tHalHandle hHal, uint32_t sessionId, uint8_t *ft_ies, uint32_t ft_ies_ip_len, diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index 7974b4ee2c..d1ee264cce 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -37,7 +37,6 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include "cdf_status.h" #include "qdf_status.h" #include "cdf_lock.h" #include "cdf_trace.h" @@ -208,38 +207,38 @@ void purge_sme_session_cmd_list(tpAniSirGlobal pMac, uint32_t sessionId, bool sme_command_pending(tpAniSirGlobal pMac); bool pmc_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); bool qos_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); -CDF_STATUS csr_process_scan_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); -CDF_STATUS csr_roam_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); +QDF_STATUS csr_process_scan_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); +QDF_STATUS csr_roam_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_roam_process_wm_status_change_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_reinit_roam_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_reinit_wm_status_change_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_reinit_set_key_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand); -CDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_release_command_set_key(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_abort_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, bool fStopping); -CDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum); +QDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum); bool csr_roam_is_valid40_mhz_channel(tpAniSirGlobal pmac, uint8_t channel); -CDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme); -CDF_STATUS sme_release_global_lock(tSmeStruct *psSme); +QDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme); +QDF_STATUS sme_release_global_lock(tSmeStruct *psSme); #ifdef FEATURE_OEM_DATA_SUPPORT -CDF_STATUS oem_data_process_oem_data_req_command(tpAniSirGlobal pMac, +QDF_STATUS oem_data_process_oem_data_req_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); #endif -CDF_STATUS csr_process_add_sta_session_command(tpAniSirGlobal pMac, +QDF_STATUS csr_process_add_sta_session_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); -CDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg); -CDF_STATUS csr_process_del_sta_session_command(tpAniSirGlobal pMac, +QDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg); +QDF_STATUS csr_process_del_sta_session_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); -CDF_STATUS csr_process_del_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg); +QDF_STATUS csr_process_del_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg); #ifdef FEATURE_WLAN_SCAN_PNO -CDF_STATUS pmc_set_preferred_network_list(tHalHandle hHal, +QDF_STATUS pmc_set_preferred_network_list(tHalHandle hHal, tpSirPNOScanReq pRequest, uint8_t sessionId, preferred_network_found_ind_cb @@ -247,34 +246,34 @@ CDF_STATUS pmc_set_preferred_network_list(tHalHandle hHal, #endif /* FEATURE_WLAN_SCAN_PNO */ bool csr_roamGetConcurrencyConnectStatusForBmps(tpAniSirGlobal pMac); #ifdef FEATURE_WLAN_TDLS -CDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId, tCsrTdlsSendMgmt * tdlsSendMgmt); -CDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, +QDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrTdlsLinkEstablishParams *tdlsLinkEstablishParams); -CDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac); -CDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrStaParams *pstaParams); -CDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac); -CDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand); -CDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd); -CDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, +QDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand); +QDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd); +QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf); #endif /* FEATURE_WLAN_TDLS */ -CDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, uint8_t sessionId, const uint8_t *pChannelList, const uint8_t numChannels); -CDF_STATUS csr_update_bg_scan_config_ini_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_update_bg_scan_config_ini_channel_list(tpAniSirGlobal pMac, uint8_t sessionId, eCsrBand eBand); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t *pChannelList, uint8_t numChannels, diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h index a86fb9cfa6..88286266d7 100644 --- a/core/sme/inc/sme_internal.h +++ b/core/sme/inc/sme_internal.h @@ -37,7 +37,6 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include "cdf_status.h" #include "qdf_status.h" #include "cdf_lock.h" #include "cdf_trace.h" diff --git a/core/sme/inc/sme_power_save.h b/core/sme/inc/sme_power_save.h index 295f644dbd..7965e6d627 100644 --- a/core/sme/inc/sme_power_save.h +++ b/core/sme/inc/sme_power_save.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -94,7 +94,7 @@ struct ps_params { uint8_t uapsd_per_ac_bit_mask; /* WOWL param */ void (*enter_wowl_callback_routine)(void *callback_context, - CDF_STATUS status); + QDF_STATUS status); void *enter_wowl_callback_context; tSirSmeWowlEnterParams wowl_enter_params; #ifdef WLAN_WAKEUP_EVENTS diff --git a/core/sme/inc/sme_power_save_api.h b/core/sme/inc/sme_power_save_api.h index 95a2db56b0..16df7cf447 100644 --- a/core/sme/inc/sme_power_save_api.h +++ b/core/sme/inc/sme_power_save_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -32,17 +32,17 @@ #include "ani_global.h" #include "sme_inside.h" -CDF_STATUS sme_ps_enable_disable(tHalHandle hal_ctx, uint32_t session_id, +QDF_STATUS sme_ps_enable_disable(tHalHandle hal_ctx, uint32_t session_id, enum sme_ps_cmd command); -CDF_STATUS sme_ps_uapsd_enable(tHalHandle hal_ctx, uint32_t session_id); +QDF_STATUS sme_ps_uapsd_enable(tHalHandle hal_ctx, uint32_t session_id); -CDF_STATUS sme_ps_uapsd_disable(tHalHandle hal_ctx, uint32_t session_id); +QDF_STATUS sme_ps_uapsd_disable(tHalHandle hal_ctx, uint32_t session_id); /* Condition check if driver is ready to enter in PS */ -CDF_STATUS sme_enable_sta_ps_check(tpAniSirGlobal mac_ctx, uint32_t session_id); +QDF_STATUS sme_enable_sta_ps_check(tpAniSirGlobal mac_ctx, uint32_t session_id); -CDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, enum sme_ps_cmd command); @@ -51,17 +51,17 @@ void sme_set_tspec_uapsd_mask_per_session(tpAniSirGlobal mac_ctx, uint8_t session_id); /* Full Power Req Callback */ typedef void (*uapsd_start_indication_cb)(void *callback_context, - uint32_t session_id, CDF_STATUS status); + uint32_t session_id, QDF_STATUS status); -CDF_STATUS sme_ps_start_uapsd(tHalHandle hal_ctx, uint32_t session_id, +QDF_STATUS sme_ps_start_uapsd(tHalHandle hal_ctx, uint32_t session_id, uapsd_start_indication_cb uapsd_start_ind_cb, void *callback_context); -CDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, +QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, tpSirHostOffloadReq request, uint8_t session_id); #ifdef WLAN_NS_OFFLOAD -CDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, +QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, tpSirHostOffloadReq request, uint8_t session_id); @@ -69,23 +69,23 @@ CDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, /* / Post a message to PE module */ tSirRetStatus sme_post_pe_message(tpAniSirGlobal mac_ctx, tpSirMsgQ pMsg); -CDF_STATUS sme_ps_enable_auto_ps_timer(tHalHandle hal_ctx, +QDF_STATUS sme_ps_enable_auto_ps_timer(tHalHandle hal_ctx, uint32_t sessionId, bool isReassoc); -CDF_STATUS sme_ps_disable_auto_ps_timer(tHalHandle hal_ctx, +QDF_STATUS sme_ps_disable_auto_ps_timer(tHalHandle hal_ctx, uint32_t sessionId); -CDF_STATUS sme_ps_open(tHalHandle hal_ctx); +QDF_STATUS sme_ps_open(tHalHandle hal_ctx); -CDF_STATUS sme_ps_open_per_session(tHalHandle hal_ctx, uint32_t session_id); +QDF_STATUS sme_ps_open_per_session(tHalHandle hal_ctx, uint32_t session_id); void sme_auto_ps_entry_timer_expired(void *ps_param); -CDF_STATUS sme_ps_close(tHalHandle hal_ctx); -CDF_STATUS sme_ps_close_per_session(tHalHandle hal_ctx, uint32_t sessionId); +QDF_STATUS sme_ps_close(tHalHandle hal_ctx); +QDF_STATUS sme_ps_close_per_session(tHalHandle hal_ctx, uint32_t sessionId); #ifdef FEATURE_WLAN_SCAN_PNO void sme_set_pno_channel_prediction(tpSirPNOScanReq request_buf, tpAniSirGlobal mac_ctx); -CDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, +QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, tpSirPNOScanReq request, uint8_t session_id, preferred_network_found_ind_cb callback_routine, @@ -96,7 +96,7 @@ static inline void sme_set_pno_channel_prediction(void *request_buf, {} #endif -CDF_STATUS sme_is_auto_ps_timer_running(tHalHandle hal_ctx, +QDF_STATUS sme_is_auto_ps_timer_running(tHalHandle hal_ctx, uint32_t session_id); #endif /* #if !defined(__SME_POWER_SAVE_API_H) */ diff --git a/core/sme/inc/sme_qos_api.h b/core/sme/inc/sme_qos_api.h index c9fd0cfed0..f3a18a4091 100644 --- a/core/sme/inc/sme_qos_api.h +++ b/core/sme/inc/sme_qos_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -83,14 +83,14 @@ typedef enum { * async: In case of UAPSD, once PE notifies successful TSPEC * negotiation, or CSR notifies for successful reassoc to SME-QoS, * notify HDD if PMC can't put the module in UAPSD mode right away - * (CDF_STATUS_PMC_PENDING) + * (QDF_STATUS_PMC_PENDING) */ SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_PENDING, /* * async: In case of UAPSD, once PE notifies successful TSPEC * negotiation, or CSR notifies for successful reassoc to SME-QoS, * notify HDD if PMC can't put the module in UAPSD mode at all - * (CDF_STATUS_E_FAILURE) + * (QDF_STATUS_E_FAILURE) */ SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_SET_FAILED, /* @@ -129,14 +129,14 @@ typedef enum { * async: In case of UAPSD, once PE notifies successful TSPEC * negotiation or CSR notifies for successful reassoc to SME-QoS, * notify HDD if PMC can't put the module in UAPSD mode right away - * (CDF_STATUS_PMC_PENDING) + * (QDF_STATUS_PMC_PENDING) */ SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_PENDING, /* * async: In case of UAPSD, once PE notifies successful TSPEC * negotiation, or CSR notifies for successful reassoc to SME-QoS, * notify HDD if PMC can't put the module in UAPSD mode at all - * (CDF_STATUS_E_FAILURE) + * (QDF_STATUS_E_FAILURE) */ SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_SET_FAILED, /* sync: STA is handing off to a new AP */ @@ -231,7 +231,7 @@ typedef struct { /*-------------------------------------------------------------------------- External APIs ------------------------------------------------------------------------*/ -typedef CDF_STATUS (*sme_QosCallback)(tHalHandle hHal, void *HDDcontext, +typedef QDF_STATUS (*sme_QosCallback)(tHalHandle hHal, void *HDDcontext, sme_QosWmmTspecInfo *pCurrentQoSInfo, sme_QosStatusType status, uint32_t QosFlowID); sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId, @@ -244,12 +244,12 @@ sme_QosStatusType sme_qos_release_req(tHalHandle hHal, uint32_t QosFlowID); bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, sme_QosWmmTspecInfo *pQoSInfo, uint8_t sessionId); void sme_qos_update_hand_off(uint8_t sessionId, bool updateHandOff); -CDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, +QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, sme_QosWmmUpType *dscpmapping, uint8_t sessionId); -CDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal mac_ctx, uint32_t session_id); -CDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal mac_ctx, uint32_t session_id); diff --git a/core/sme/inc/sme_qos_internal.h b/core/sme/inc/sme_qos_internal.h index ed6948bcc6..7e24a2976d 100644 --- a/core/sme/inc/sme_qos_internal.h +++ b/core/sme/inc/sme_qos_internal.h @@ -113,17 +113,17 @@ typedef struct { /*-------------------------------------------------------------------------- External APIs for CSR - Internal to SME ------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_open(tpAniSirGlobal pMac); -CDF_STATUS sme_qos_close(tpAniSirGlobal pMac); -CDF_STATUS sme_qos_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, +QDF_STATUS sme_qos_open(tpAniSirGlobal pMac); +QDF_STATUS sme_qos_close(tpAniSirGlobal pMac); +QDF_STATUS sme_qos_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf); /*-------------------------------------------------------------------------- Internal APIs for CSR ------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc); -CDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac, uint8_t sessionId, sme_qos_csr_event_indType ind, void *pEvent_info); uint8_t sme_qos_get_acm_mask(tpAniSirGlobal pMac, diff --git a/core/sme/inc/sme_rrm_api.h b/core/sme/inc/sme_rrm_api.h index d009844701..1720d3b6c3 100644 --- a/core/sme/inc/sme_rrm_api.h +++ b/core/sme/inc/sme_rrm_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -46,14 +46,14 @@ #include "sme_internal.h" #include "sme_rrm_internal.h" -CDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, +QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf); -CDF_STATUS rrm_close(tpAniSirGlobal pMac); -CDF_STATUS rrm_ready(tpAniSirGlobal pMac); -CDF_STATUS rrm_open(tpAniSirGlobal pMac); -CDF_STATUS rrm_change_default_config_param(tpAniSirGlobal pMac, +QDF_STATUS rrm_close(tpAniSirGlobal pMac); +QDF_STATUS rrm_ready(tpAniSirGlobal pMac); +QDF_STATUS rrm_open(tpAniSirGlobal pMac); +QDF_STATUS rrm_change_default_config_param(tpAniSirGlobal pMac, struct rrm_config_param *rrm_config); -CDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, +QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionId, tpRrmNeighborReq pNeighborReq, tpRrmNeighborRspCallbackInfo callbackInfo); tRrmNeighborReportDesc *sme_rrm_get_first_bss_entry_from_neighbor_cache( @@ -61,7 +61,7 @@ tRrmNeighborReportDesc *sme_rrm_get_first_bss_entry_from_neighbor_cache( tRrmNeighborReportDesc *sme_rrm_get_next_bss_entry_from_neighbor_cache( tpAniSirGlobal pMac, tpRrmNeighborReportDesc pBssEntry); -CDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, +QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsgBuf); #endif diff --git a/core/sme/inc/sme_rrm_internal.h b/core/sme/inc/sme_rrm_internal.h index e3926374f7..fdcb5e1ba7 100644 --- a/core/sme/inc/sme_rrm_internal.h +++ b/core/sme/inc/sme_rrm_internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -54,7 +54,7 @@ typedef struct sRrmNeighborReportDesc { } tRrmNeighborReportDesc, *tpRrmNeighborReportDesc; typedef void (*NeighborReportRspCallback)(void *context, - CDF_STATUS cdf_status); + QDF_STATUS qdf_status); typedef struct sRrmNeighborRspCallbackInfo { uint32_t timeout; /* in ms.. min value is 10 (10ms) */ diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 63f7444166..5c7169a65d 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -66,72 +66,72 @@ extern tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, tSirMbMsg *pMb); static tSelfRecoveryStats g_self_recovery_stats; /* TxMB Functions */ -extern CDF_STATUS pmc_prepare_command(tpAniSirGlobal pMac, uint32_t sessionId, +extern QDF_STATUS pmc_prepare_command(tpAniSirGlobal pMac, uint32_t sessionId, eSmeCommandType cmdType, void *pvParam, uint32_t size, tSmeCmd **ppCmd); extern void pmc_release_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); extern void qos_release_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); -extern CDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, +extern QDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, tSmeCmd *p2pRemainonChn); -extern CDF_STATUS sme_remain_on_chn_rsp(tpAniSirGlobal pMac, uint8_t *pMsg); -extern CDF_STATUS sme_remain_on_chn_ready(tHalHandle hHal, uint8_t *pMsg); -extern CDF_STATUS sme_send_action_cnf(tHalHandle hHal, uint8_t *pMsg); +extern QDF_STATUS sme_remain_on_chn_rsp(tpAniSirGlobal pMac, uint8_t *pMsg); +extern QDF_STATUS sme_remain_on_chn_ready(tHalHandle hHal, uint8_t *pMsg); +extern QDF_STATUS sme_send_action_cnf(tHalHandle hHal, uint8_t *pMsg); -static CDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac); +static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac); static void sme_abort_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, bool fStopping); eCsrPhyMode sme_get_phy_mode(tHalHandle hHal); -CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf); void sme_disconnect_connected_sessions(tpAniSirGlobal pMac); -CDF_STATUS sme_handle_generic_change_country_code(tpAniSirGlobal pMac, +QDF_STATUS sme_handle_generic_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf); -CDF_STATUS sme_process_nss_update_resp(tpAniSirGlobal mac, uint8_t *msg); +QDF_STATUS sme_process_nss_update_resp(tpAniSirGlobal mac, uint8_t *msg); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) bool csr_is_supported_channel(tpAniSirGlobal pMac, uint8_t channelId); #endif #ifdef WLAN_FEATURE_11W -CDF_STATUS sme_unprotected_mgmt_frm_ind(tHalHandle hHal, +QDF_STATUS sme_unprotected_mgmt_frm_ind(tHalHandle hHal, tpSirSmeUnprotMgmtFrameInd pSmeMgmtFrm); #endif /* Message processor for events from DFS */ -CDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, +QDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf); /* Channel Change Response Indication Handler */ -CDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, +QDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf); /* Internal SME APIs */ -CDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme) +QDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; if (psSme) { - if (CDF_IS_STATUS_SUCCESS + if (QDF_IS_STATUS_SUCCESS (cdf_mutex_acquire(&psSme->lkSmeGlobalLock))) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } return status; } -CDF_STATUS sme_release_global_lock(tSmeStruct *psSme) +QDF_STATUS sme_release_global_lock(tSmeStruct *psSme) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; if (psSme) { - if (CDF_IS_STATUS_SUCCESS + if (QDF_IS_STATUS_SUCCESS (cdf_mutex_release(&psSme->lkSmeGlobalLock))) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } @@ -146,7 +146,7 @@ CDF_STATUS sme_release_global_lock(tSmeStruct *psSme) * Processes the HW mode response and invokes the HDD callback * to process further */ -static CDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg) +static QDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg) { tListElem *entry = NULL; tSmeCmd *command = NULL; @@ -169,18 +169,18 @@ static CDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg) LL_ACCESS_LOCK); if (!entry) { sms_log(mac, LOGE, FL("No cmd found in active list")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } command = GET_BASE_ADDR(entry, tSmeCmd, Link); if (!command) { sms_log(mac, LOGE, FL("Base address is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (e_sme_command_set_hw_mode != command->command) { sms_log(mac, LOGE, FL("Command mismatch!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } callback = command->u.set_hw_mode_cmd.set_hw_mode_cb; @@ -247,7 +247,7 @@ end: sme_release_command(mac, command); } sme_process_pending_queue(mac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -258,7 +258,7 @@ end: * Processes the HW mode transition indication and invoke the HDD callback * to process further */ -static CDF_STATUS sme_process_hw_mode_trans_ind(tpAniSirGlobal mac, +static QDF_STATUS sme_process_hw_mode_trans_ind(tpAniSirGlobal mac, uint8_t *msg) { hw_mode_transition_cb callback = NULL; @@ -267,7 +267,7 @@ static CDF_STATUS sme_process_hw_mode_trans_ind(tpAniSirGlobal mac, param = (struct sir_hw_mode_trans_ind *)msg; if (!param) { sms_log(mac, LOGE, FL("HW mode trans ind param is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } callback = mac->sme.sme_hw_mode_trans_cb; @@ -279,7 +279,7 @@ static CDF_STATUS sme_process_hw_mode_trans_ind(tpAniSirGlobal mac, param->vdev_mac_map); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -303,46 +303,46 @@ static void free_sme_cmds(tpAniSirGlobal mac_ctx) mac_ctx->sme.pSmeCmdBufAddr = NULL; } -static CDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) +static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) { - CDF_STATUS status; + QDF_STATUS status; tSmeCmd *pCmd; uint32_t cmd_idx; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; cdf_mc_timer_t *cmdTimeoutTimer = NULL; uint32_t sme_cmd_ptr_ary_sz; pMac->sme.totalSmeCmd = SME_TOTAL_COMMAND; status = csr_ll_open(pMac->hHdd, &pMac->sme.smeCmdActiveList); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; status = csr_ll_open(pMac->hHdd, &pMac->sme.smeCmdPendingList); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; status = csr_ll_open(pMac->hHdd, &pMac->sme.smeScanCmdActiveList); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; status = csr_ll_open(pMac->hHdd, &pMac->sme.smeScanCmdPendingList); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; status = csr_ll_open(pMac->hHdd, &pMac->sme.smeCmdFreeList); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; /* following pointer contains array of pointers for tSmeCmd* */ sme_cmd_ptr_ary_sz = sizeof(void *) * pMac->sme.totalSmeCmd; pMac->sme.pSmeCmdBufAddr = cdf_mem_malloc(sme_cmd_ptr_ary_sz); if (NULL == pMac->sme.pSmeCmdBufAddr) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; cdf_mem_set(pMac->sme.pSmeCmdBufAddr, sme_cmd_ptr_ary_sz, 0); for (cmd_idx = 0; cmd_idx < pMac->sme.totalSmeCmd; cmd_idx++) { /* @@ -357,7 +357,7 @@ static CDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) pMac->sme.pSmeCmdBufAddr[cmd_idx] = cdf_mem_malloc(sizeof(tSmeCmd)); if (NULL == pMac->sme.pSmeCmdBufAddr[cmd_idx]) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; free_sme_cmds(pMac); goto end; } @@ -372,12 +372,12 @@ static CDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) (cdf_mc_timer_t *) cdf_mem_malloc(sizeof(cdf_mc_timer_t)); if (cmdTimeoutTimer) { pMac->sme.smeCmdActiveList.cmdTimeoutTimer = cmdTimeoutTimer; - cdf_status = + qdf_status = cdf_mc_timer_init(pMac->sme.smeCmdActiveList. cmdTimeoutTimer, CDF_TIMER_TYPE_SW, active_list_cmd_timeout_handle, (void *)pMac); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Init Timer fail for active list command process time out"); cdf_mem_free(pMac->sme.smeCmdActiveList. @@ -390,7 +390,7 @@ static CDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) } end: - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(pMac, LOGE, "failed to initialize sme command list:%d\n", status); @@ -434,7 +434,7 @@ void purge_sme_session_cmd_list(tpAniSirGlobal pMac, uint32_t sessionId, tDblLinkList localList; cdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!CDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return; } @@ -461,9 +461,9 @@ void purge_sme_session_cmd_list(tpAniSirGlobal pMac, uint32_t sessionId, csr_ll_close(&localList); } -static CDF_STATUS free_sme_cmd_list(tpAniSirGlobal pMac) +static QDF_STATUS free_sme_cmd_list(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; purge_sme_cmd_list(pMac); csr_ll_close(&pMac->sme.smeCmdPendingList); @@ -478,7 +478,7 @@ static CDF_STATUS free_sme_cmd_list(tpAniSirGlobal pMac) pMac->sme.smeCmdActiveList.cmdTimeoutTimer = NULL; status = cdf_mutex_acquire(&pMac->sme.lkSmeGlobalLock); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL("Failed to acquire the lock status = %d"), status); goto done; @@ -487,7 +487,7 @@ static CDF_STATUS free_sme_cmd_list(tpAniSirGlobal pMac) free_sme_cmds(pMac); status = cdf_mutex_release(&pMac->sme.lkSmeGlobalLock); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL("Failed to release the lock status = %d"), status); } @@ -805,7 +805,7 @@ end: bool sme_process_command(tpAniSirGlobal pMac) { bool fContinue = false; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry; tSmeCmd *pCommand; tListElem *pSmeEntry; @@ -873,7 +873,7 @@ sme_process_cmd: pCommand->sessionId); status = csr_prepare_disconnect_command(pMac, pCommand->sessionId, &sme_cmd); - if (status == CDF_STATUS_SUCCESS && sme_cmd) { + if (status == QDF_STATUS_SUCCESS && sme_cmd) { csr_ll_lock(&pMac->sme.smeCmdPendingList); csr_ll_insert_head(&pMac->sme.smeCmdPendingList, &sme_cmd->Link, LL_ACCESS_NOLOCK); @@ -914,7 +914,7 @@ sme_process_cmd: case eSmeCommandRoam: csr_ll_unlock(&pMac->sme.smeCmdActiveList); status = csr_roam_process_command(pMac, pCommand); - if (!CDF_IS_STATUS_SUCCESS(status) + if (!QDF_IS_STATUS_SUCCESS(status) && csr_ll_remove_entry(&pMac->sme.smeCmdActiveList, &pCommand->Link, LL_ACCESS_LOCK)) csr_release_command_roam(pMac, pCommand); @@ -926,7 +926,7 @@ sme_process_cmd: case eSmeCommandSetKey: csr_ll_unlock(&pMac->sme.smeCmdActiveList); status = csr_roam_process_set_key_command(pMac, pCommand); - if (!CDF_IS_STATUS_SUCCESS(status) + if (!QDF_IS_STATUS_SUCCESS(status) && csr_ll_remove_entry(&pMac->sme.smeCmdActiveList, &pCommand->Link, LL_ACCESS_LOCK)) { csr_release_command_set_key(pMac, pCommand); @@ -1003,10 +1003,10 @@ sme_process_cmd: csr_ll_unlock(&pMac->sme.smeCmdActiveList); pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link); sme_release_command(pMac, pCommand); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) fContinue = true; process_scan_q: if (!(sme_process_scan_queue(pMac))) @@ -1038,29 +1038,29 @@ bool sme_command_pending(tpAniSirGlobal pMac) * smeOpen must be called before any other SME APIs can be involved. * smeOpen must be called after mac_open. * - * Return: CDF_STATUS_SUCCESS - SME is successfully initialized. + * Return: QDF_STATUS_SUCCESS - SME is successfully initialized. * Other status means SME is failed to be initialized */ -CDF_STATUS sme_open(tHalHandle hHal) +QDF_STATUS sme_open(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); pMac->sme.state = SME_STATE_STOP; pMac->sme.currDeviceMode = CDF_STA_MODE; - if (!CDF_IS_STATUS_SUCCESS(cdf_mutex_init( + if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init( &pMac->sme.lkSmeGlobalLock))) { sms_log(pMac, LOGE, FL("sme_open failed init lock")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = csr_open(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("csr_open failed, status=%d"), status); return status; } status = sme_ps_open(hHal); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("sme_ps_open failed during initialization with status=%d"), status); @@ -1072,14 +1072,14 @@ CDF_STATUS sme_open(tHalHandle hHal) #ifndef WLAN_MDM_CODE_REDUCTION_OPT status = sme_qos_open(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Qos open, status=%d"), status); return status; } #endif #ifdef FEATURE_OEM_DATA_SUPPORT status = oem_data_oem_data_req_open(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("oem_data_oem_data_req_open, status=%d"), status); @@ -1087,12 +1087,12 @@ CDF_STATUS sme_open(tHalHandle hHal) } #endif status = init_sme_cmd_list(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; #if defined WLAN_FEATURE_VOWIFI status = rrm_open(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("rrm_open failed, status=%d"), status); return status; } @@ -1105,7 +1105,7 @@ CDF_STATUS sme_open(tHalHandle hHal) /* * sme_init_chan_list, triggers channel setup based on country code. */ -CDF_STATUS sme_init_chan_list(tHalHandle hal, uint8_t *alpha2, +QDF_STATUS sme_init_chan_list(tHalHandle hal, uint8_t *alpha2, enum country_src cc_src) { tpAniSirGlobal pmac = PMAC_STRUCT(hal); @@ -1130,15 +1130,15 @@ CDF_STATUS sme_init_chan_list(tHalHandle hal, uint8_t *alpha2, \Param pSmeConfigParams - a pointer to a caller allocated object of typedef struct _smeConfigParams. - \return CDF_STATUS_SUCCESS - SME update the config parameters successfully. + \return QDF_STATUS_SUCCESS - SME update the config parameters successfully. Other status means SME is failed to update the config parameters. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_set11dinfo(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams) +QDF_STATUS sme_set11dinfo(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -1150,7 +1150,7 @@ CDF_STATUS sme_set11dinfo(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams) } status = csr_set_channels(hHal, &pSmeConfigParams->csrConfig); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_change_default_config_param failed with status=%d", status); @@ -1182,15 +1182,15 @@ void sme_set_scan_disable(tHalHandle h_hal, int value) \param hHal - The handle returned by HostapdAdapter. \Param v_REGDOMAIN_t - The current Regulatory Domain requested for SoftAp. - \return CDF_STATUS_SUCCESS - SME successfully completed the request. + \return QDF_STATUS_SUCCESS - SME successfully completed the request. Other status means, failed to get the current regulatory domain. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal, v_REGDOMAIN_t *domainIdSoftAp) +QDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal, v_REGDOMAIN_t *domainIdSoftAp) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -1202,14 +1202,14 @@ CDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal, v_REGDOMAIN_t *domainIdSoftAp } *domainIdSoftAp = pMac->scan.domainIdCurrent; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; return status; } -CDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) +QDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -1220,7 +1220,7 @@ CDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) } status = csr_set_reg_info(hHal, apCntryCode); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_set_reg_info failed with status=%d", status); } @@ -1228,9 +1228,9 @@ CDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) } #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) +QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) { - CDF_STATUS status; + QDF_STATUS status; bool ret = false; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint8_t ch_list[WNI_CFG_VALID_CHANNEL_LIST] = { 0 }; @@ -1239,21 +1239,21 @@ CDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, pPlmReq->sessionId); status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), pPlmReq->sessionId); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!pSession->sessionActive) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Invalid Sessionid")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!pPlmReq->enable) @@ -1301,12 +1301,12 @@ send_plm_start: msg.reserved = 0; msg.bodyptr = pPlmReq; - if (!CDF_IS_STATUS_SUCCESS(cds_mq_post_message(CDF_MODULE_ID_WMA, + if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_PLM_REQ to WMA")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); @@ -1329,15 +1329,15 @@ send_plm_start: \Param pSmeConfigParams - a pointer to a caller allocated object of typedef struct _smeConfigParams. - \return CDF_STATUS_SUCCESS - SME update the config parameters successfully. + \return QDF_STATUS_SUCCESS - SME update the config parameters successfully. Other status means SME is failed to update the config parameters. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams) +QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -1352,7 +1352,7 @@ CDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams status = csr_change_default_config_param(pMac, &pSmeConfigParams->csrConfig); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_change_default_config_param failed with status=%d", status); @@ -1361,7 +1361,7 @@ CDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams status = rrm_change_default_config_param(hHal, &pSmeConfigParams->rrmConfig); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "rrm_change_default_config_param failed with status=%d", status); @@ -1380,7 +1380,7 @@ CDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams */ status = sme_cfg_set_int(hHal, WNI_CFG_SCAN_IN_POWERSAVE, true); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Could not pass on WNI_CFG_SCAN_IN_POWERSAVE to CFG"); } @@ -1396,7 +1396,7 @@ CDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams * * Return: Return the status of the updation. */ -CDF_STATUS sme_update_roam_params(tHalHandle hal, +QDF_STATUS sme_update_roam_params(tHalHandle hal, uint8_t session_id, struct roam_ext_params roam_params_src, int update_param) { @@ -1582,12 +1582,12 @@ void sme_process_ready_to_ext_wow(tHalHandle hHal, Regulatory domain, valid channel list, Tx power per channel, a list with active/passive scan allowed per valid channel. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_change_config_params(tHalHandle hHal, +QDF_STATUS sme_change_config_params(tHalHandle hHal, tCsrUpdateConfigParam *pUpdateConfigParam) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pUpdateConfigParam) { @@ -1598,7 +1598,7 @@ CDF_STATUS sme_change_config_params(tHalHandle hHal, status = csr_change_config_params(pMac, pUpdateConfigParam); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csrUpdateConfigParam failed with status=%d", status); } @@ -1618,17 +1618,17 @@ CDF_STATUS sme_change_config_params(tHalHandle hHal, This is a synchronous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - eWNI_SME_SYS_READY_IND is sent to PE + \return QDF_STATUS_SUCCESS - eWNI_SME_SYS_READY_IND is sent to PE successfully. Other status means SME failed to send the message to PE. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) +QDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) { tSirSmeReadyReq Msg; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -1642,7 +1642,7 @@ CDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) if (eSIR_FAILURE != u_mac_post_ctrl_msg(hHal, (tSirMbMsg *) &Msg)) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } else { sms_log(pMac, LOGE, "u_mac_post_ctrl_msg failed to send eWNI_SME_SYS_READY_IND"); @@ -1650,7 +1650,7 @@ CDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) } status = csr_ready(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_ready failed with status=%d", status); @@ -1658,8 +1658,8 @@ CDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) } #if defined WLAN_FEATURE_VOWIFI - if (CDF_STATUS_SUCCESS != rrm_ready(hHal)) { - status = CDF_STATUS_E_FAILURE; + if (QDF_STATUS_SUCCESS != rrm_ready(hHal)) { + status = QDF_STATUS_E_FAILURE; sms_log(pMac, LOGE, "rrm_ready failed"); break; } @@ -1679,20 +1679,20 @@ CDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) This is a synchronous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - SME is ready. + \return QDF_STATUS_SUCCESS - SME is ready. Other status means SME is failed to start \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_start(tHalHandle hHal) +QDF_STATUS sme_start(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); do { status = csr_start(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_start failed during smeStart with status=%d", status); @@ -1712,13 +1712,13 @@ CDF_STATUS sme_start(tHalHandle hHal) * Scan request message from upper layer is handled as * part of this API * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sme_handle_scan_req(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_handle_scan_req(tpAniSirGlobal mac_ctx, void *msg) { struct ani_scan_req *scan_msg; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint16_t session_id; csr_scan_completeCallback callback; @@ -1728,7 +1728,7 @@ static CDF_STATUS sme_handle_scan_req(tpAniSirGlobal mac_ctx, status = csr_scan_request(mac_ctx, session_id, scan_msg->scan_param, callback, scan_msg->ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("scan request failed. session_id %d"), session_id); } @@ -1745,13 +1745,13 @@ static CDF_STATUS sme_handle_scan_req(tpAniSirGlobal mac_ctx, * Roc request message from upper layer is handled as * part of this API * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sme_handle_roc_req(tHalHandle hal, +static QDF_STATUS sme_handle_roc_req(tHalHandle hal, void *msg) { struct ani_roc_req *roc_msg; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); remainOnChanCallback callback; @@ -1766,7 +1766,7 @@ static CDF_STATUS sme_handle_roc_req(tHalHandle hal, roc_msg->channel, roc_msg->duration, callback, roc_msg->ctx, roc_msg->is_p2pprobe_allowed, roc_msg->scan_id); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("scan request failed. session_id %d scan_id %d"), roc_msg->session_id, roc_msg->scan_id); @@ -1782,11 +1782,11 @@ static CDF_STATUS sme_handle_roc_req(tHalHandle hal, * *------------------------------------------------------------------*/ -CDF_STATUS sme_unprotected_mgmt_frm_ind(tHalHandle hHal, +QDF_STATUS sme_unprotected_mgmt_frm_ind(tHalHandle hHal, tpSirSmeUnprotMgmtFrameInd pSmeMgmtFrm) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo pRoamInfo = { 0 }; uint32_t SessionId = pSmeMgmtFrm->sessionId; @@ -1807,9 +1807,9 @@ CDF_STATUS sme_unprotected_mgmt_frm_ind(tHalHandle hHal, * Handle the DFS Radar Event and indicate it to the SAP * *------------------------------------------------------------------*/ -CDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBuf) +QDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo roamInfo = { 0 }; tSirSmeDfsEventInd *dfs_event; tSirSmeCSAIeTxCompleteRsp *csaIeTxCompleteRsp; @@ -1827,7 +1827,7 @@ CDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu sms_log(pMac, LOGE, "%s: pMsg is NULL for eWNI_SME_DFS_RADAR_FOUND message", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sessionId = dfs_event->sessionId; roamInfo.dfs_event.sessionId = sessionId; @@ -1856,7 +1856,7 @@ CDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu sms_log(pMac, LOGE, "%s: pMsg is NULL for eWNI_SME_DFS_CSAIE_TX_COMPLETE_IND", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sessionId = csaIeTxCompleteRsp->sessionId; roamStatus = eCSR_ROAM_DFS_CHAN_SW_NOTIFY; @@ -1870,7 +1870,7 @@ CDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu { sms_log(pMac, LOG1, "%s: Invalid DFS message = 0x%x", __func__, msgType); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } } @@ -1892,11 +1892,11 @@ CDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu * * Return: success if msg indicated to SAP else return failure */ -static CDF_STATUS sme_extended_change_channel_ind(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_extended_change_channel_ind(tpAniSirGlobal mac_ctx, void *msg_buf) { struct sir_sme_ext_cng_chan_ind *ext_chan_ind; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t session_id = 0; tCsrRoamInfo roamInfo = {0}; eRoamCmdStatus roam_status; @@ -1907,7 +1907,7 @@ static CDF_STATUS sme_extended_change_channel_ind(tpAniSirGlobal mac_ctx, if (NULL == ext_chan_ind) { sms_log(mac_ctx, LOGE, FL("pMsg is NULL for eWNI_SME_EXT_CHANGE_CHANNEL_IND")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } session_id = ext_chan_ind->session_id; roamInfo.target_channel = ext_chan_ind->new_channel; @@ -1929,10 +1929,10 @@ static CDF_STATUS sme_extended_change_channel_ind(tpAniSirGlobal mac_ctx, * Handle the tsm ie indication from LIM and forward it to HDD. * *------------------------------------------------------------------*/ -CDF_STATUS sme_tsm_ie_ind(tHalHandle hHal, tSirSmeTsmIEInd *pSmeTsmIeInd) +QDF_STATUS sme_tsm_ie_ind(tHalHandle hHal, tSirSmeTsmIEInd *pSmeTsmIeInd) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo pRoamInfo = { 0 }; uint32_t SessionId = pSmeTsmIeInd->sessionId; pRoamInfo.tsmIe.tsid = pSmeTsmIeInd->tsmIe.tsid; @@ -1954,13 +1954,13 @@ CDF_STATUS sme_tsm_ie_ind(tHalHandle hHal, tSirSmeTsmIEInd *pSmeTsmIeInd) \param pCckmIeLen - length of the CCKM IE \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_cckm_ie(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_cckm_ie(tHalHandle hHal, uint8_t sessionId, uint8_t *pCckmIe, uint8_t cckmIeLen) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_set_cckm_ie(pMac, sessionId, pCckmIe, cckmIeLen); sme_release_global_lock(&pMac->sme); } @@ -1975,10 +1975,10 @@ CDF_STATUS sme_set_cckm_ie(tHalHandle hHal, uint8_t sessionId, \param pEseBcnReq - pointer to ESE beacon request \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, +QDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, const tCsrEseBeaconReq *pEseBcnReq) { - CDF_STATUS status = eSIR_SUCCESS; + QDF_STATUS status = eSIR_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tpSirBeaconReportReqInd pSmeBcnReportReq = NULL; tCsrEseBeaconReqParams *pBeaconReq = NULL; @@ -1989,7 +1989,7 @@ CDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, if (pSmeRrmContext->eseBcnReqInProgress == true) { sms_log(pMac, LOGE, "A Beacon Report Req is already in progress"); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } /* Store the info in RRM context */ @@ -2001,7 +2001,7 @@ CDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, if (NULL == pSmeBcnReportReq) { sms_log(pMac, LOGP, "Memory Allocation Failure!!! ESE BcnReq Ind to SME"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pSmeRrmContext->eseBcnReqInProgress = true; @@ -2031,7 +2031,7 @@ CDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, status = sme_rrm_process_beacon_report_req_ind(pMac, pSmeBcnReportReq); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) pSmeRrmContext->eseBcnReqInProgress = false; return status; @@ -2074,7 +2074,7 @@ static void sme_process_fw_mem_dump_rsp(tpAniSirGlobal mac_ctx, cds_msg_t *msg) * Processes the dual mac configuration response and invokes the HDD callback * to process further */ -static CDF_STATUS sme_process_dual_mac_config_resp(tpAniSirGlobal mac, +static QDF_STATUS sme_process_dual_mac_config_resp(tpAniSirGlobal mac, uint8_t *msg) { tListElem *entry = NULL; @@ -2095,18 +2095,18 @@ static CDF_STATUS sme_process_dual_mac_config_resp(tpAniSirGlobal mac, LL_ACCESS_LOCK); if (!entry) { sms_log(mac, LOGE, FL("No cmd found in active list")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } command = GET_BASE_ADDR(entry, tSmeCmd, Link); if (!command) { sms_log(mac, LOGE, FL("Base address is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (e_sme_command_set_dual_mac_config != command->command) { sms_log(mac, LOGE, FL("Command mismatch!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } callback = command->u.set_dual_mac_cmd.set_dual_mac_cb; @@ -2132,7 +2132,7 @@ static CDF_STATUS sme_process_dual_mac_config_resp(tpAniSirGlobal mac, sme_release_command(mac, command); sme_process_pending_queue(mac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -2146,15 +2146,15 @@ static CDF_STATUS sme_process_dual_mac_config_resp(tpAniSirGlobal mac, \param hHal - The handle returned by mac_open. \param pMsg - A pointer to a caller allocated object of tSirMsgQ. - \return CDF_STATUS_SUCCESS - SME successfully process the message. + \return QDF_STATUS_SUCCESS - SME successfully process the message. Other status means SME failed to process the message to HAL. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) +QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (pMsg == NULL) { @@ -2162,7 +2162,7 @@ CDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) return status; } status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGW, FL("Locking failed, bailing out")); if (pMsg->bodyptr) cdf_mem_free(pMsg->bodyptr); @@ -2705,7 +2705,7 @@ release_lock: * Processes the nss update response and invokes the HDD * callback to process further */ -CDF_STATUS sme_process_nss_update_resp(tpAniSirGlobal mac, uint8_t *msg) +QDF_STATUS sme_process_nss_update_resp(tpAniSirGlobal mac, uint8_t *msg) { tListElem *entry = NULL; tSmeCmd *command = NULL; @@ -2725,18 +2725,18 @@ CDF_STATUS sme_process_nss_update_resp(tpAniSirGlobal mac, uint8_t *msg) LL_ACCESS_LOCK); if (!entry) { sms_log(mac, LOGE, FL("No cmd found in active list")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } command = GET_BASE_ADDR(entry, tSmeCmd, Link); if (!command) { sms_log(mac, LOGE, FL("Base address is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (e_sme_command_nss_update != command->command) { sms_log(mac, LOGE, FL("Command mismatch!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } callback = command->u.nss_update_cmd.nss_update_cb; @@ -2763,7 +2763,7 @@ CDF_STATUS sme_process_nss_update_resp(tpAniSirGlobal mac, uint8_t *msg) sme_release_command(mac, command); } sme_process_pending_queue(mac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* No need to hold the global lock here because this function can only be called */ @@ -2789,23 +2789,23 @@ void sme_free_msg(tHalHandle hHal, cds_msg_t *pMsg) \param hHal - The handle returned by mac_open \param tHalStopType - reason for stopping - \return CDF_STATUS_SUCCESS - SME is stopped. + \return QDF_STATUS_SUCCESS - SME is stopped. Other status means SME is failed to stop but caller should still consider SME is stopped. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_stop(tHalHandle hHal, tHalStopType stopType) +QDF_STATUS sme_stop(tHalHandle hHal, tHalStopType stopType) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; - CDF_STATUS fail_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_E_FAILURE; + QDF_STATUS fail_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); p2p_stop(hHal); status = csr_stop(pMac, stopType); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_stop failed during smeStop with status=%d", status); fail_status = status; @@ -2813,7 +2813,7 @@ CDF_STATUS sme_stop(tHalHandle hHal, tHalStopType stopType) purge_sme_cmd_list(pMac); - if (!CDF_IS_STATUS_SUCCESS(fail_status)) { + if (!QDF_IS_STATUS_SUCCESS(fail_status)) { status = fail_status; } @@ -2834,25 +2834,25 @@ CDF_STATUS sme_stop(tHalHandle hHal, tHalStopType stopType) This is a synchronous call \param hHal - The handle returned by mac_open - \return CDF_STATUS_SUCCESS - SME is successfully close. + \return QDF_STATUS_SUCCESS - SME is successfully close. Other status means SME is failed to be closed but caller still cannot call any other SME functions except smeOpen. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_close(tHalHandle hHal) +QDF_STATUS sme_close(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; - CDF_STATUS fail_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_E_FAILURE; + QDF_STATUS fail_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (!pMac) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* Note: pSession will be invalid from here on, do not access */ status = csr_close(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_close failed during sme close with status=%d", status); @@ -2860,7 +2860,7 @@ CDF_STATUS sme_close(tHalHandle hHal) } #ifndef WLAN_MDM_CODE_REDUCTION_OPT status = sme_qos_close(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "Qos close failed during sme close with status=%d", status); @@ -2869,7 +2869,7 @@ CDF_STATUS sme_close(tHalHandle hHal) #endif #ifdef FEATURE_OEM_DATA_SUPPORT status = oem_data_oem_data_req_close(hHal); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "OEM DATA REQ close failed during sme close with status=%d", status); @@ -2877,7 +2877,7 @@ CDF_STATUS sme_close(tHalHandle hHal) } #endif status = sme_ps_close(hHal); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "sme_ps_close failed during smeClose status=%d", status); @@ -2886,7 +2886,7 @@ CDF_STATUS sme_close(tHalHandle hHal) #if defined WLAN_FEATURE_VOWIFI status = rrm_close(hHal); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "RRM close failed during sme close with status=%d", status); @@ -2898,12 +2898,12 @@ CDF_STATUS sme_close(tHalHandle hHal) free_sme_cmd_list(pMac); - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cdf_mutex_destroy(&pMac->sme.lkSmeGlobalLock))) { - fail_status = CDF_STATUS_E_FAILURE; + fail_status = QDF_STATUS_E_FAILURE; } - if (!CDF_IS_STATUS_SUCCESS(fail_status)) { + if (!QDF_IS_STATUS_SUCCESS(fail_status)) { status = fail_status; } @@ -2926,11 +2926,11 @@ CDF_STATUS sme_close(tHalHandle hHal) * * Return: Status of operation */ -CDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, tCsrScanRequest *scan_req, csr_scan_completeCallback callback, void *ctx) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); struct ani_scan_req *scan_msg; cds_msg_t msg; @@ -2947,13 +2947,13 @@ CDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, scan_count = csr_ll_count(&mac_ctx->sme.smeScanCmdActiveList); if (scan_count >= mac_ctx->scan.max_scan_count) { sms_log(mac_ctx, LOGE, FL("Max scan reached")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_get_scan_id(&scan_req_id); scan_req->scan_id = scan_req_id; status = sme_acquire_global_lock(&mac_ctx->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("Unable to acquire lock")); return status; } @@ -2963,7 +2963,7 @@ CDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, sms_log(mac_ctx, LOGE, " scan_req: failed to allocate mem for msg"); sme_release_global_lock(&mac_ctx->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } scan_msg->msg_type = eWNI_SME_SCAN_CMD; scan_msg->msg_len = (uint16_t) sizeof(struct ani_scan_req); @@ -2976,21 +2976,21 @@ CDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, "scan_req:failed to allocate mem for scanreq"); sme_release_global_lock(&mac_ctx->sme); cdf_mem_free(scan_msg); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } csr_scan_copy_request(mac_ctx, scan_msg->scan_param, scan_req); msg.type = eWNI_SME_SCAN_CMD; msg.bodyptr = scan_msg; msg.reserved = 0; msg.bodyval = 0; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(mac_ctx, LOGE, " sme_scan_req failed to post msg"); csr_scan_free_request(mac_ctx, scan_msg->scan_param); cdf_mem_free(scan_msg->scan_param); cdf_mem_free(scan_msg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac_ctx->sme); return status; @@ -3002,13 +3002,13 @@ CDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, This is a synchronous call \param pFilter - If pFilter is NULL, all cached results are returned \param phResult - an object for the result. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, tCsrScanResultFilter *pFilter, tScanResultHandle *phResult) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -3016,7 +3016,7 @@ CDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, 0)); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_scan_get_result(hHal, pFilter, phResult); sme_release_global_lock(&pMac->sme); } @@ -3036,14 +3036,14 @@ CDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, * This function is written to get AP's channel id from CSR by filtering * the result which matches our roam profile. This is a synchronous call. * - * Return: CDF_STATUS. + * Return: QDF_STATUS. */ -CDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, +QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, tCsrRoamProfile *profile, tScanResultHandle *scan_cache, uint8_t *ap_chnl_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_handle); tCsrScanResultFilter *scan_filter = NULL; tScanResultHandle filtered_scan_result = NULL; @@ -3052,13 +3052,13 @@ CDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, if (NULL == mac_ctx) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("mac_ctx is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } scan_filter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == scan_filter) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("scan_filter mem alloc failed")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else { cdf_mem_set(scan_filter, sizeof(tCsrScanResultFilter), 0); cdf_mem_set(&first_ap_profile, sizeof(tSirBssDescription), 0); @@ -3074,7 +3074,7 @@ CDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, scan_filter); } - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* Save the WPS info */ if (NULL != profile) { scan_filter->bWPSAssociation = @@ -3089,14 +3089,14 @@ CDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Preparing the profile filter failed")); cdf_mem_free(scan_filter); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { status = csr_scan_get_result(hal_handle, scan_filter, &filtered_scan_result); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { csr_get_bssdescr_from_scan_handle(filtered_scan_result, &first_ap_profile); *scan_cache = filtered_scan_result; @@ -3116,19 +3116,19 @@ CDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Scan is empty, set chnl to 0")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } } else { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to get scan get result")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } csr_free_scan_filter(mac_ctx, scan_filter); sme_release_global_lock(&mac_ctx->sme); } else { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Aquiring lock failed")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } cdf_mem_free(scan_filter); @@ -3157,14 +3157,14 @@ bool sme_store_joinreq_param(tHalHandle hal_handle, uint32_t session_id) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_handle); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; bool ret_status = true; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_STORE_JOIN_REQ, session_id, 0)); status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if (false == csr_store_joinreq_param(mac_ctx, profile, scan_cache, roam_id, session_id)) { ret_status = false; @@ -3192,14 +3192,14 @@ bool sme_clear_joinreq_param(tHalHandle hal_handle, uint32_t session_id) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_handle); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; bool ret_status = true; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CLEAR_JOIN_REQ, session_id, 0)); status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if (false == csr_clear_joinreq_param(mac_ctx, session_id)) { ret_status = false; @@ -3222,30 +3222,30 @@ bool sme_clear_joinreq_param(tHalHandle hal_handle, * This function will issue station's stored join request further down to csr * to proceed forward. * - * Return: CDF_STATUS_SUCCESS or CDF_STATUS_E_FAILURE. + * Return: QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE. **/ -CDF_STATUS sme_issue_stored_joinreq(tHalHandle hal_handle, +QDF_STATUS sme_issue_stored_joinreq(tHalHandle hal_handle, uint32_t *roam_id, uint32_t session_id) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_handle); - CDF_STATUS status = CDF_STATUS_E_FAILURE; - CDF_STATUS ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_E_FAILURE; + QDF_STATUS ret_status = QDF_STATUS_SUCCESS; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ISSUE_JOIN_REQ, session_id, 0)); status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_STATUS_SUCCESS == status) { - if (CDF_STATUS_SUCCESS != csr_issue_stored_joinreq(mac_ctx, + if (QDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS != csr_issue_stored_joinreq(mac_ctx, roam_id, session_id)) { - ret_status = CDF_STATUS_E_FAILURE; + ret_status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac_ctx->sme); } else { csr_clear_joinreq_param(mac_ctx, session_id); - ret_status = CDF_STATUS_E_FAILURE; + ret_status = QDF_STATUS_E_FAILURE; } return ret_status; } @@ -3254,18 +3254,18 @@ CDF_STATUS sme_issue_stored_joinreq(tHalHandle hal_handle, \fn sme_scan_flush_result \brief a wrapper function to request CSR to clear scan results. This is a synchronous call - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_scan_flush_result(tHalHandle hHal) +QDF_STATUS sme_scan_flush_result(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_RESULTS, 0, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_scan_flush_result(hHal); sme_release_global_lock(&pMac->sme); } @@ -3279,18 +3279,18 @@ CDF_STATUS sme_scan_flush_result(tHalHandle hHal) This is a synchronous call \param tHalHandle - HAL context handle \param sessionId - session id - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_filter_scan_results(tHalHandle hHal, uint8_t sessionId) +QDF_STATUS sme_filter_scan_results(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_RESULTS, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_scan_filter_results(pMac); sme_release_global_lock(&pMac->sme); } @@ -3298,16 +3298,16 @@ CDF_STATUS sme_filter_scan_results(tHalHandle hHal, uint8_t sessionId) return status; } -CDF_STATUS sme_scan_flush_p2p_result(tHalHandle hHal, uint8_t sessionId) +QDF_STATUS sme_scan_flush_p2p_result(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_P2PRESULTS, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_scan_flush_selective_result(hHal, true); sme_release_global_lock(&pMac->sme); } @@ -3326,7 +3326,7 @@ CDF_STATUS sme_scan_flush_p2p_result(tHalHandle hHal, uint8_t sessionId) tCsrScanResultInfo *sme_scan_result_get_first(tHalHandle hHal, tScanResultHandle hScanResult) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrScanResultInfo *pRet = NULL; @@ -3334,7 +3334,7 @@ tCsrScanResultInfo *sme_scan_result_get_first(tHalHandle hHal, TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_GETFIRST, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pRet = csr_scan_result_get_first(pMac, hScanResult); sme_release_global_lock(&pMac->sme); } @@ -3354,7 +3354,7 @@ tCsrScanResultInfo *sme_scan_result_get_first(tHalHandle hHal, tCsrScanResultInfo *sme_scan_result_get_next(tHalHandle hHal, tScanResultHandle hScanResult) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrScanResultInfo *pRet = NULL; @@ -3362,7 +3362,7 @@ tCsrScanResultInfo *sme_scan_result_get_next(tHalHandle hHal, TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_GETNEXT, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pRet = csr_scan_result_get_next(pMac, hScanResult); sme_release_global_lock(&pMac->sme); } @@ -3378,18 +3378,18 @@ tCsrScanResultInfo *sme_scan_result_get_next(tHalHandle hHal, \param hScanResult - returned from csr_scan_get_result. hScanResult is considered gone by calling this function and even before this function reutrns. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_scan_result_purge(tHalHandle hHal, tScanResultHandle hScanResult) +QDF_STATUS sme_scan_result_purge(tHalHandle hHal, tScanResultHandle hScanResult) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_PURGE, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_scan_result_purge(hHal, hScanResult); sme_release_global_lock(&pMac->sme); } @@ -3407,21 +3407,21 @@ CDF_STATUS sme_scan_result_purge(tHalHandle hHal, tScanResultHandle hScanResult) tPmkidCandidateInfo allocated when retruning, this is either the number needed or number of items put into pPmkidList - \return CDF_STATUS - when fail, it usually means the buffer allocated is not + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough and pNumItems has the number of tPmkidCandidateInfo. \Note: pNumItems is a number of tPmkidCandidateInfo, not sizeof(tPmkidCandidateInfo) * something ---------------------------------------------------------------------------*/ -CDF_STATUS sme_scan_get_pmkid_candidate_list(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_scan_get_pmkid_candidate_list(tHalHandle hHal, uint8_t sessionId, tPmkidCandidateInfo *pPmkidList, uint32_t *pNumItems) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_scan_get_pmkid_candidate_list(pMac, sessionId, pPmkidList, @@ -3479,23 +3479,23 @@ uint32_t sme_get_channel_bonding_mode24_g(tHalHandle hHal) \param hBssListIn - a list of BSS descriptor to roam to. It is returned from csr_scan_get_result \param pRoamId - to get back the request ID - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, tCsrRoamProfile *pProfile, uint32_t *pRoamId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (!pMac) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_CONNECT, sessionId, 0)); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_connect(pMac, sessionId, pProfile, @@ -3503,7 +3503,7 @@ CDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, } else { sms_log(pMac, LOGE, FL("invalid sessionID %d"), sessionId); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } else { @@ -3523,17 +3523,17 @@ CDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, \param phyMode new phyMode which is to set - \return CDF_STATUS SUCCESS. + \return QDF_STATUS SUCCESS. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode) +QDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: invalid context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMac->roam.configParam.phyMode = phyMode; @@ -3543,7 +3543,7 @@ CDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode) pMac->roam.configParam. ProprietaryRatesEnabled); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- @@ -3556,21 +3556,21 @@ CDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode) that might need modification dynamically once STA is up & running and this could trigger a reassoc \param pRoamId - to get back the request ID - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, tCsrRoamProfile *pProfile, tCsrRoamModifyProfileFields modProfileFields, uint32_t *pRoamId, bool fForce) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_REASSOC, sessionId, 0)); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { if ((NULL == pProfile) && (fForce == 1)) { status = @@ -3583,7 +3583,7 @@ CDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, modProfileFields, pRoamId); } } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3596,22 +3596,22 @@ CDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, \brief a wrapper function to request CSR to disconnect and reconnect with the same profile This is an asynchronous call. - \return CDF_STATUS. It returns fail if currently connected + \return QDF_STATUS. It returns fail if currently connected ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_connect_to_last_profile(tHalHandle hHal, uint8_t sessionId) +QDF_STATUS sme_roam_connect_to_last_profile(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_connect_to_last_profile(pMac, sessionId); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3625,12 +3625,12 @@ CDF_STATUS sme_roam_connect_to_last_profile(tHalHandle hHal, uint8_t sessionId) This is an asynchronous call. \param reason -- To indicate the reason for disconnecting. Currently, only eCSR_DISCONNECT_REASON_MIC_ERROR is meanful. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, eCsrRoamDisconnectReason reason) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -3638,11 +3638,11 @@ CDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, reason)); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_disconnect(pMac, sessionId, reason); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3655,20 +3655,20 @@ CDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, \brief To stop BSS for Soft AP. This is an asynchronous API. \param hHal - Global structure \param sessionId - sessionId of SoftAP - \return CDF_STATUS SUCCESS Roam callback will be called to indicate actual results + \return QDF_STATUS SUCCESS Roam callback will be called to indicate actual results -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_stop_bss(tHalHandle hHal, uint8_t sessionId) +QDF_STATUS sme_roam_stop_bss(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_issue_stop_bss_cmd(pMac, sessionId, true); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3682,12 +3682,12 @@ CDF_STATUS sme_roam_stop_bss(tHalHandle hHal, uint8_t sessionId) \param hHal - Global structure \param sessionId - sessionId of SoftAP \param pPeerMacAddr - Caller allocated memory filled with peer MAC address (6 bytes) - \return CDF_STATUS SUCCESS Roam callback will be called to indicate actual results + \return QDF_STATUS SUCCESS Roam callback will be called to indicate actual results -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, const uint8_t *pPeerMacAddr) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { @@ -3696,13 +3696,13 @@ CDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, } status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_issue_disassociate_sta_cmd(pMac, sessionId, pPeerMacAddr, eSIR_MAC_DEAUTH_LEAVING_BSS_REASON); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3718,14 +3718,14 @@ CDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, * * To disassociate a station. This is an asynchronous API. * - * Return: CDF_STATUS_SUCCESS on success or another CDF_STATUS error + * Return: QDF_STATUS_SUCCESS on success or another QDF_STATUS error * code on error. Roam callback will be called to indicate actual * result */ -CDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, struct tagCsrDelStaParams *pDelStaParams) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { @@ -3737,13 +3737,13 @@ CDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, TRACE_CODE_SME_RX_HDD_MSG_DEAUTH_STA, sessionId, pDelStaParams->reason_code)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_issue_deauth_sta_cmd(pMac, sessionId, pDelStaParams); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3756,12 +3756,12 @@ CDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, \brief To start or stop TKIP counter measures. This is an asynchronous API. \param sessionId - sessionId of SoftAP \param pPeerMacAddr - Caller allocated memory filled with peer MAC address (6 bytes) - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, bool bEnable) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { @@ -3770,13 +3770,13 @@ CDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, } status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_issue_tkip_counter_measures(pMac, sessionId, bEnable); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3797,14 +3797,14 @@ CDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, \param pfnSapEventCallback - Sap event callback in HDD \param pAssocBuf - Caller allocated memory to be filled with associatd stations info - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, CDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { @@ -3813,7 +3813,7 @@ CDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, } status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_get_associated_stas(pMac, sessionId, modId, @@ -3821,7 +3821,7 @@ CDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, pfnSapEventCallback, pAssocStasBuf); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3837,14 +3837,14 @@ CDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, \param pUsrContext - Opaque HDD context \param pfnSapEventCallback - Sap event callback in HDD \pRemoveMac - pointer to Mac address which needs to be removed from session - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, void *pUsrContext, void *pfnSapEventCallback, struct cdf_mac_addr pRemoveMac) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { @@ -3853,7 +3853,7 @@ CDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, } status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_get_wps_session_overlap(pMac, sessionId, @@ -3861,7 +3861,7 @@ CDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, pfnSapEventCallback, pRemoveMac); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3874,21 +3874,21 @@ CDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, \brief a wrapper function to request CSR to return the current connect state of Roaming This is a synchronous call. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_get_connect_state(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_connect_state(tHalHandle hHal, uint8_t sessionId, eCsrConnectState *pState) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_get_connect_state(pMac, sessionId, pState); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3904,24 +3904,24 @@ CDF_STATUS sme_roam_get_connect_state(tHalHandle hHal, uint8_t sessionId, This is a synchronous call. \param pProfile - pointer to a caller allocated structure tCsrRoamConnectedProfile - \return CDF_STATUS. Failure if not connected + \return QDF_STATUS. Failure if not connected ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, tCsrRoamConnectedProfile *pProfile) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_get_connect_profile(pMac, sessionId, pProfile); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3957,30 +3957,30 @@ void sme_roam_free_connect_profile(tCsrRoamConnectedProfile *profile) \param update_entire_cache - this bool value specifies if the entire pmkid cache should be overwritten or should it be updated entry by entry. - \return CDF_STATUS - when fail, it usually means the buffer allocated is not + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough and pNumItems has the number of tPmkidCacheInfo. \Note: pNumItems is a number of tPmkidCacheInfo, not sizeof(tPmkidCacheInfo) * something ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId, tPmkidCacheInfo *pPMKIDCache, uint32_t numItems, bool update_entire_cache) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_SET_PMKIDCACHE, sessionId, numItems)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_set_pmkid_cache(pMac, sessionId, pPMKIDCache, numItems, update_entire_cache); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3988,22 +3988,22 @@ CDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId, return status; } -CDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId, const uint8_t *pBSSId, bool flush_cache) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_DEL_PMKIDCACHE, sessionId, flush_cache)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_del_pmkid_from_cache(pMac, sessionId, pBSSId, flush_cache); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -4021,22 +4021,22 @@ CDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId, * \param pmk_len - Length could be only 16 bytes in case if LEAP * connections. Need to pass this information to * firmware. - * \return CDF_STATUS -status whether PSK/PMK is set or not + * \return QDF_STATUS -status whether PSK/PMK is set or not *--------------------------------------------------------------------------- */ -CDF_STATUS sme_roam_set_psk_pmk(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_set_psk_pmk(tHalHandle hHal, uint8_t sessionId, uint8_t *pPSK_PMK, size_t pmk_len) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_set_psk_pmk(pMac, sessionId, pPSK_PMK, pmk_len); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -4053,23 +4053,23 @@ CDF_STATUS sme_roam_set_psk_pmk(tHalHandle hHal, uint8_t sessionId, \param pBuf - Caller allocated memory that contain the IE field, if any, upon return \param secType - Specifies whether looking for WPA/WPA2/WAPI IE - \return CDF_STATUS - when fail, it usually means the buffer allocated is not + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_get_security_req_ie(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_security_req_ie(tHalHandle hHal, uint8_t sessionId, uint32_t *pLen, uint8_t *pBuf, eCsrSecurityType secType) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_get_wpa_rsn_req_ie(hHal, sessionId, pLen, pBuf); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -4087,23 +4087,23 @@ CDF_STATUS sme_roam_get_security_req_ie(tHalHandle hHal, uint8_t sessionId, \param pBuf - Caller allocated memory that contain the IE field, if any, upon return \param secType - Specifies whether looking for WPA/WPA2/WAPI IE - \return CDF_STATUS - when fail, it usually means the buffer allocated is not + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_get_security_rsp_ie(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_security_rsp_ie(tHalHandle hHal, uint8_t sessionId, uint32_t *pLen, uint8_t *pBuf, eCsrSecurityType secType) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_get_wpa_rsn_rsp_ie(pMac, sessionId, pLen, pBuf); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -4121,18 +4121,18 @@ CDF_STATUS sme_roam_get_security_rsp_ie(tHalHandle hHal, uint8_t sessionId, ---------------------------------------------------------------------------*/ uint32_t sme_roam_get_num_pmkid_cache(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint32_t numPmkidCache = 0; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { numPmkidCache = csr_roam_get_num_pmkid_cache(pMac, sessionId); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -4149,26 +4149,26 @@ uint32_t sme_roam_get_num_pmkid_cache(tHalHandle hHal, uint8_t sessionId) needed or actually number in tPmkidCacheInfo. \param pPmkidCache - Caller allocated memory that contains PMKID cache, if any, upon return - \return CDF_STATUS - when fail, it usually means the buffer allocated is not + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_get_pmkid_cache(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_pmkid_cache(tHalHandle hHal, uint8_t sessionId, uint32_t *pNum, tPmkidCacheInfo *pPmkidCache) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_GET_PMKIDCACHE, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_get_pmkid_cache(pMac, sessionId, pNum, pPmkidCache); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -4182,19 +4182,19 @@ CDF_STATUS sme_roam_get_pmkid_cache(tHalHandle hHal, uint8_t sessionId, currently maintained by CSR. This is a synchronous call. \param pParam - caller allocated memory - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam) +QDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_CONFIGPARAM, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_get_config_param(pMac, &pParam->csrConfig); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, "%s csr_get_config_param failed", __func__); sme_release_global_lock(&pMac->sme); @@ -4217,15 +4217,15 @@ CDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam) * * This function sets the string value in cfg parameter. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_cfg_set_int(tHalHandle hal, uint16_t cfg_id, uint32_t value) +QDF_STATUS sme_cfg_set_int(tHalHandle hal, uint16_t cfg_id, uint32_t value) { tpAniSirGlobal pmac = PMAC_STRUCT(hal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (eSIR_SUCCESS != cfg_set_int(pmac, cfg_id, value)) - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } @@ -4239,16 +4239,16 @@ CDF_STATUS sme_cfg_set_int(tHalHandle hal, uint16_t cfg_id, uint32_t value) * * This function sets the string value in cfg parameter. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_cfg_set_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, +QDF_STATUS sme_cfg_set_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, uint32_t length) { tpAniSirGlobal pmac = PMAC_STRUCT(hal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (eSIR_SUCCESS != cfg_set_str(pmac, cfg_id, str, length)) - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } @@ -4262,15 +4262,15 @@ CDF_STATUS sme_cfg_set_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, * * This function gets the value of the cfg parameter. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_cfg_get_int(tHalHandle hal, uint16_t cfg_id, uint32_t *cfg_value) +QDF_STATUS sme_cfg_get_int(tHalHandle hal, uint16_t cfg_id, uint32_t *cfg_value) { tpAniSirGlobal pmac = PMAC_STRUCT(hal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (eSIR_SUCCESS != wlan_cfg_get_int(pmac, cfg_id, cfg_value)) - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } @@ -4284,16 +4284,16 @@ CDF_STATUS sme_cfg_get_int(tHalHandle hal, uint16_t cfg_id, uint32_t *cfg_value) * * This function gets the string value of the cfg parameter. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_cfg_get_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, +QDF_STATUS sme_cfg_get_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, uint32_t *length) { tpAniSirGlobal pmac = PMAC_STRUCT(hal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (eSIR_SUCCESS != wlan_cfg_get_str(pmac, cfg_id, str, length)) - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; return status; } @@ -4310,26 +4310,26 @@ CDF_STATUS sme_cfg_get_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, \param pModifyProfileFields - pointer to the connected profile fields changing which can cause reassoc - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_get_modify_profile_fields(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_get_modify_profile_fields(tHalHandle hHal, uint8_t sessionId, tCsrRoamModifyProfileFields * pModifyProfileFields) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_MODPROFFIELDS, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_get_modify_profile_fields(pMac, sessionId, pModifyProfileFields); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -4360,12 +4360,12 @@ void sme_set_dhcp_till_power_active_flag(tHalHandle hal, uint8_t flag) called whenever an 11d scan is done \param hHal - The handle returned by mac_open. \param callback - 11d scan complete routine to be registered - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_register11d_scan_done_callback(tHalHandle hHal, +QDF_STATUS sme_register11d_scan_done_callback(tHalHandle hHal, csr_scan_completeCallback callback) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); pMac->scan.callback11dScanDone = callback; @@ -4384,12 +4384,12 @@ CDF_STATUS sme_register11d_scan_done_callback(tHalHandle hHal, * sme_oem_data_rsp_callback is used to register sme_send_oem_data_rsp_msg * callback function. * - * Return: CDF_STATUS. + * Return: QDF_STATUS. */ -CDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal, +QDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal, sme_send_oem_data_rsp_msg callback) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pmac = PMAC_STRUCT(h_hal); pmac->oemData.oem_data_rsp_callback = callback; @@ -4408,12 +4408,12 @@ CDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal, * related capabilities are updated. More capabilities can be * added in future. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_oem_update_capability(tHalHandle hal, +QDF_STATUS sme_oem_update_capability(tHalHandle hal, struct sme_oem_capability *cap) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pmac = PMAC_STRUCT(hal); uint8_t *bytes; @@ -4436,12 +4436,12 @@ CDF_STATUS sme_oem_update_capability(tHalHandle hal, * Currently RTT related capabilities are received. More * capabilities can be added in future. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_oem_get_capability(tHalHandle hal, +QDF_STATUS sme_oem_get_capability(tHalHandle hal, struct sme_oem_capability *cap) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pmac = PMAC_STRUCT(hal); uint8_t *bytes; @@ -4484,9 +4484,9 @@ void sme_register_ftm_msg_processor(tHalHandle hal, * do a pattern match on these patterns when WoW is enabled during system * suspend. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_wow_add_pattern(tHalHandle hal, +QDF_STATUS sme_wow_add_pattern(tHalHandle hal, struct wow_add_pattern *pattern, uint8_t session_id) { @@ -4501,7 +4501,7 @@ CDF_STATUS sme_wow_add_pattern(tHalHandle hal, if (NULL == ptrn) { sms_log(pMac, LOGP, FL("Fail to allocate memory for WoWLAN Add Bcast Pattern ")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } (void)cdf_mem_copy(ptrn, pattern, sizeof(*ptrn)); @@ -4526,9 +4526,9 @@ CDF_STATUS sme_wow_add_pattern(tHalHandle hal, * @pattern: pointer to delete pattern parameter * @sessionId: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_wow_delete_pattern(tHalHandle hal, +QDF_STATUS sme_wow_delete_pattern(tHalHandle hal, struct wow_delete_pattern *pattern, uint8_t sessionId) { tpAniSirGlobal pMac = PMAC_STRUCT(hal); @@ -4542,7 +4542,7 @@ CDF_STATUS sme_wow_delete_pattern(tHalHandle hal, if (NULL == delete_ptrn) { sms_log(pMac, LOGP, FL("Fail to allocate memory for WoWLAN Delete Bcast Pattern ")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } (void)cdf_mem_copy(delete_ptrn, pattern, sizeof(*delete_ptrn)); msg_q.type = WMA_WOW_DEL_PTRN; @@ -4589,16 +4589,16 @@ CDF_STATUS sme_wow_delete_pattern(tHalHandle hal, * Currently there is no requirement or use case to support * UAPSD and WOWL at the same time. * - * Return: CDF_STATUS - * CDF_STATUS_SUCCESS Device is already in WoWLAN mode - * CDF_STATUS_E_FAILURE Device cannot enter WoWLAN mode. - * CDF_STATUS_PMC_PENDING Request accepted. SME will enable + * Return: QDF_STATUS + * QDF_STATUS_SUCCESS Device is already in WoWLAN mode + * QDF_STATUS_E_FAILURE Device cannot enter WoWLAN mode. + * QDF_STATUS_PMC_PENDING Request accepted. SME will enable * WOWL after BMPS mode is entered. */ -CDF_STATUS sme_enter_wowl(tHalHandle hal_ctx, +QDF_STATUS sme_enter_wowl(tHalHandle hal_ctx, void (*enter_wowl_callback_routine)(void *callback_context, - CDF_STATUS status), + QDF_STATUS status), void *enter_wowl_callback_context, #ifdef WLAN_WAKEUP_EVENTS void (*wakeIndicationCB)(void *callback_context, @@ -4609,7 +4609,7 @@ CDF_STATUS sme_enter_wowl(tHalHandle hal_ctx, tpSirSmeWowlEnterParams wowl_enter_params, uint8_t session_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -4641,14 +4641,14 @@ CDF_STATUS sme_enter_wowl(tHalHandle hal_ctx, * * SME will initiate exit from WoWLAN mode and device will be * put in BMPS mode. - * Return CDF_STATUS - * CDF_STATUS_E_FAILURE Device cannot exit WoWLAN mode. - * CDF_STATUS_SUCCESS Request accepted to exit WoWLAN mode. + * Return QDF_STATUS + * QDF_STATUS_E_FAILURE Device cannot exit WoWLAN mode. + * QDF_STATUS_SUCCESS Request accepted to exit WoWLAN mode. */ -CDF_STATUS sme_exit_wowl(tHalHandle hal_ctx, +QDF_STATUS sme_exit_wowl(tHalHandle hal_ctx, tpSirSmeWowlExitParams wowl_exit_params) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); uint8_t session_id; MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -4671,10 +4671,10 @@ CDF_STATUS sme_exit_wowl(tHalHandle hal_ctx, * * Return: Status of operation */ -CDF_STATUS sme_roam_set_key(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_roam_set_key(tHalHandle hal, uint8_t session_id, tCsrRoamSetKey *set_key, uint32_t *ptr_roam_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); uint32_t roam_id; uint32_t i; @@ -4686,14 +4686,14 @@ CDF_STATUS sme_roam_set_key(tHalHandle hal, uint8_t session_id, if (set_key->keyLength > CSR_MAX_KEY_LEN) { sms_log(mac_ctx, LOGE, FL("Invalid key length %d"), set_key->keyLength); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /*Once Setkey is done, we can go in BMPS */ if (set_key->keyLength) ps_global_info->remain_in_power_active_till_dhcp = false; status = sme_acquire_global_lock(&mac_ctx->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; roam_id = GET_NEXT_ROAM_ID(&mac_ctx->roam); @@ -4710,7 +4710,7 @@ CDF_STATUS sme_roam_set_key(tHalHandle hal, uint8_t session_id, if (!session) { sms_log(mac_ctx, LOGE, FL("session %d not found"), session_id); sme_release_global_lock(&mac_ctx->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (CSR_IS_INFRA_AP(&session->connectedProfile) && set_key->keyDirection == eSIR_TX_DEFAULT) { @@ -4745,20 +4745,20 @@ CDF_STATUS sme_roam_set_key(tHalHandle hal, uint8_t session_id, RSSI, do not hold up but return this value. \param pContext - user context to be passed back along with the callback \param p_cds_context - cds context - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_rssi(tHalHandle hHal, +QDF_STATUS sme_get_rssi(tHalHandle hHal, tCsrRssiCallback callback, uint8_t staId, struct cdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_RSSI, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_get_rssi(pMac, callback, staId, bssId, lastRSSI, pContext, p_cds_context); @@ -4776,17 +4776,17 @@ CDF_STATUS sme_get_rssi(tHalHandle hHal, \param staId - The station ID for which the stats is requested for \param pContext - user context to be passed back along with the callback \param p_cds_context - cds context - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_snr(tHalHandle hHal, +QDF_STATUS sme_get_snr(tHalHandle hHal, tCsrSnrCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_get_snr(pMac, callback, staId, bssId, pContext); sme_release_global_lock(&pMac->sme); } @@ -4802,17 +4802,17 @@ CDF_STATUS sme_get_snr(tHalHandle hHal, \param staId - The station ID for which the stats is requested for \param pContext - user context to be passed back along with the callback \param p_cds_context - cds context - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_tsm_stats(tHalHandle hHal, +QDF_STATUS sme_get_tsm_stats(tHalHandle hHal, tCsrTsmStatsCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_get_tsm_stats(pMac, callback, staId, bssId, pContext, p_cds_context, tid); @@ -4838,22 +4838,22 @@ CDF_STATUS sme_get_tsm_stats(tHalHandle hHal, \param staId - The station ID for which the stats is requested for \param pContext - user context to be passed back along with the callback \param sessionId - sme session interface - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_statistics(tHalHandle hHal, +QDF_STATUS sme_get_statistics(tHalHandle hHal, eCsrStatsRequesterType requesterId, uint32_t statsMask, tCsrStatsCallback callback, uint32_t periodicity, bool cache, uint8_t staId, void *pContext, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_STATS, NO_SESSION, periodicity)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_get_statistics(pMac, requesterId, statsMask, callback, periodicity, cache, staId, pContext, @@ -4865,24 +4865,24 @@ CDF_STATUS sme_get_statistics(tHalHandle hHal, } -CDF_STATUS sme_get_link_status(tHalHandle hHal, +QDF_STATUS sme_get_link_status(tHalHandle hHal, tCsrLinkStatusCallback callback, void *pContext, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tAniGetLinkStatus *pMsg; cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pMsg = cdf_mem_malloc(sizeof(tAniGetLinkStatus)); if (NULL == pMsg) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for link status", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMsg->msgType = WMA_LINK_STATUS_GET_REQ; @@ -4895,14 +4895,14 @@ CDF_STATUS sme_get_link_status(tHalHandle hHal, cds_message.bodyptr = pMsg; cds_message.reserved = 0; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(CDF_MODULE_ID_WMA, &cds_message))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post LINK STATUS MSG fail", __func__); cdf_mem_free(pMsg); pMac->sme.linkStatusContext = NULL; pMac->sme.linkStatusCallback = NULL; - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); @@ -4929,12 +4929,12 @@ CDF_STATUS sme_get_link_status(tHalHandle hHal, returns fail status and this parameter contains the number that is needed. - \return CDF_STATUS SUCCESS. + \return QDF_STATUS SUCCESS. FAILURE or RESOURCES The API finished and failed. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_get_country_code(tHalHandle hHal, uint8_t *pBuf, uint8_t *pbLen) +QDF_STATUS sme_get_country_code(tHalHandle hHal, uint8_t *pBuf, uint8_t *pbLen) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -4994,12 +4994,12 @@ bool sme_is_wmm_supported(tHalHandle hHal) \param sendRegHint If we want to send reg hint to nl80211 - \return CDF_STATUS SUCCESS. + \return QDF_STATUS SUCCESS. FAILURE or RESOURCES The API finished and failed. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_change_country_code(tHalHandle hHal, +QDF_STATUS sme_change_country_code(tHalHandle hHal, tSmeChangeCountryCallback callback, uint8_t *pCountry, void *pContext, @@ -5007,7 +5007,7 @@ CDF_STATUS sme_change_country_code(tHalHandle hHal, tAniBool countryFromUserSpace, tAniBool sendRegHint) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg; tAniChangeCountryCodeReq *pMsg; @@ -5016,7 +5016,7 @@ CDF_STATUS sme_change_country_code(tHalHandle hHal, TRACE_CODE_SME_RX_HDD_CHANGE_CNTRYCODE, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, FL(" called")); if ((pMac->roam.configParam.Is11dSupportEnabledOriginal == true) @@ -5027,7 +5027,7 @@ CDF_STATUS sme_change_country_code(tHalHandle hHal, "Set Country Code Fail since the STA is associated and userspace does not have priority "); sme_release_global_lock(&pMac->sme); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } @@ -5036,7 +5036,7 @@ CDF_STATUS sme_change_country_code(tHalHandle hHal, sms_log(pMac, LOGE, " csrChangeCountryCode: failed to allocate mem for req"); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMsg->msgType = eWNI_SME_CHANGE_COUNTRY_CODE; @@ -5052,12 +5052,12 @@ CDF_STATUS sme_change_country_code(tHalHandle hHal, msg.bodyptr = pMsg; msg.reserved = 0; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(pMac, LOGE, " sme_change_country_code failed to post msg to self "); cdf_mem_free((void *)pMsg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, FL(" returned")); sme_release_global_lock(&pMac->sme); @@ -5079,15 +5079,15 @@ CDF_STATUS sme_change_country_code(tHalHandle hHal, \param reg_domain regulatory domain - \return CDF_STATUS SUCCESS. + \return QDF_STATUS SUCCESS. FAILURE or RESOURCES The API finished and failed. -----------------------------------------------------------------------------*/ -CDF_STATUS sme_generic_change_country_code(tHalHandle hHal, +QDF_STATUS sme_generic_change_country_code(tHalHandle hHal, uint8_t *pCountry) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg; tAniGenericChangeCountryCodeReq *pMsg; @@ -5099,7 +5099,7 @@ CDF_STATUS sme_generic_change_country_code(tHalHandle hHal, } status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, FL(" called")); pMsg = cdf_mem_malloc(sizeof(tAniGenericChangeCountryCodeReq)); @@ -5107,7 +5107,7 @@ CDF_STATUS sme_generic_change_country_code(tHalHandle hHal, sms_log(pMac, LOGE, " sme_generic_change_country_code: failed to allocate mem for req"); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMsg->msgType = eWNI_SME_GENERIC_CHANGE_COUNTRY_CODE; @@ -5120,12 +5120,12 @@ CDF_STATUS sme_generic_change_country_code(tHalHandle hHal, msg.bodyptr = pMsg; msg.reserved = 0; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(pMac, LOGE, "sme_generic_change_country_code failed to post msg to self"); cdf_mem_free(pMsg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, FL(" returned")); sme_release_global_lock(&pMac->sme); @@ -5148,30 +5148,30 @@ CDF_STATUS sme_generic_change_country_code(tHalHandle hHal, \param sessionId - session ID. - \return CDF_STATUS SUCCESS. + \return QDF_STATUS SUCCESS. FAILURE or RESOURCES The API finished and failed. --------------------------------------------------------------------------*/ -CDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, +QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, uint8_t device_mode, uint8_t *macAddr, uint8_t sessionId) { - CDF_STATUS status; - CDF_STATUS cdf_status; + QDF_STATUS status; + QDF_STATUS qdf_status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tAniDHCPInd *pMsg; tCsrRoamSession *pSession; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found "), sessionId); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMsg = (tAniDHCPInd *) cdf_mem_malloc(sizeof(tAniDHCPInd)); @@ -5180,7 +5180,7 @@ CDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, "%s: Not able to allocate memory for dhcp start", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMsg->msgType = WMA_DHCP_START_IND; pMsg->msgLen = (uint16_t) sizeof(tAniDHCPInd); @@ -5194,12 +5194,12 @@ CDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, cds_message.bodyptr = pMsg; cds_message.reserved = 0; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post DHCP Start MSG fail", __func__); cdf_mem_free(pMsg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -5219,29 +5219,29 @@ CDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, \param sessionId - session ID. - \return CDF_STATUS SUCCESS. + \return QDF_STATUS SUCCESS. FAILURE or RESOURCES The API finished and failed. --------------------------------------------------------------------------*/ -CDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, +QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, uint8_t device_mode, uint8_t *macAddr, uint8_t sessionId) { - CDF_STATUS status; - CDF_STATUS cdf_status; + QDF_STATUS status; + QDF_STATUS qdf_status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tAniDHCPInd *pMsg; tCsrRoamSession *pSession; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found "), sessionId); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMsg = (tAniDHCPInd *) cdf_mem_malloc(sizeof(tAniDHCPInd)); @@ -5250,7 +5250,7 @@ CDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, "%s: Not able to allocate memory for dhcp stop", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMsg->msgType = WMA_DHCP_STOP_IND; @@ -5265,12 +5265,12 @@ CDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, cds_message.bodyptr = pMsg; cds_message.reserved = 0; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post DHCP Stop MSG fail", __func__); cdf_mem_free(pMsg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); @@ -5293,7 +5293,7 @@ void sme_set_cfg_privacy(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_CFGPRIVACY, NO_SESSION, 0)); - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { csr_set_cfg_privacy(pMac, pProfile, fPrivacy); sme_release_global_lock(&pMac->sme); } @@ -5307,21 +5307,21 @@ void sme_set_cfg_privacy(tHalHandle hHal, \param pRrmNeighborReq - Pointer to a caller allocated object of type tRrmNeighborReq. Caller owns the memory and is responsible for freeing it. - \return CDF_STATUS - CDF_STATUS_E_FAILURE - failure - CDF_STATUS_SUCCESS success + \return QDF_STATUS + QDF_STATUS_E_FAILURE - failure + QDF_STATUS_SUCCESS success ---------------------------------------------------------------------------*/ -CDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, tpRrmNeighborReq pRrmNeighborReq, tpRrmNeighborRspCallbackInfo callbackInfo) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_NEIGHBOR_REPORTREQ, NO_SESSION, 0)); - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { status = sme_rrm_neighbor_report_request(hHal, sessionId, pRrmNeighborReq, callbackInfo); @@ -5357,21 +5357,21 @@ void sms_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) which the HOST driver was built \param hHal - The handle returned by mac_open. \param pVersion - Points to the Version structure to be filled - \return CDF_STATUS - CDF_STATUS_E_INVAL - failure - CDF_STATUS_SUCCESS success + \return QDF_STATUS + QDF_STATUS_E_INVAL - failure + QDF_STATUS_SUCCESS success ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_wcnss_wlan_compiled_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_wlan_compiled_version(tHalHandle hHal, tSirVersionType *pVersion) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { if (pVersion != NULL) - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; else - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; sme_release_global_lock(&pMac->sme); } @@ -5385,21 +5385,21 @@ CDF_STATUS sme_get_wcnss_wlan_compiled_version(tHalHandle hHal, which the WCNSS driver reports it was built \param hHal - The handle returned by mac_open. \param pVersion - Points to the Version structure to be filled - \return CDF_STATUS - CDF_STATUS_E_INVAL - failure - CDF_STATUS_SUCCESS success + \return QDF_STATUS + QDF_STATUS_E_INVAL - failure + QDF_STATUS_SUCCESS success ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_wcnss_wlan_reported_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_wlan_reported_version(tHalHandle hHal, tSirVersionType *pVersion) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { if (pVersion != NULL) - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; else - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; sme_release_global_lock(&pMac->sme); } @@ -5413,26 +5413,26 @@ CDF_STATUS sme_get_wcnss_wlan_reported_version(tHalHandle hHal, \param hHal - The handle returned by mac_open. \param pVersion - Points to the Version string buffer to be filled \param versionBufferSize - THe size of the Version string buffer - \return CDF_STATUS - CDF_STATUS_E_INVAL - failure - CDF_STATUS_SUCCESS success + \return QDF_STATUS + QDF_STATUS_E_INVAL - failure + QDF_STATUS_SUCCESS success ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_wcnss_software_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_software_version(tHalHandle hHal, uint8_t *pVersion, uint32_t versionBufferSize) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); v_CONTEXT_t cds_context = cds_get_global_context(); - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { if (pVersion != NULL) { status = wma_get_wcnss_software_version(cds_context, pVersion, versionBufferSize); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -5446,22 +5446,22 @@ CDF_STATUS sme_get_wcnss_software_version(tHalHandle hHal, \param hHal - The handle returned by mac_open. \param pVersion - Points to the Version string buffer to be filled \param versionBufferSize - THe size of the Version string buffer - \return CDF_STATUS - CDF_STATUS_E_INVAL - failure - CDF_STATUS_SUCCESS success + \return QDF_STATUS + QDF_STATUS_E_INVAL - failure + QDF_STATUS_SUCCESS success ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_wcnss_hardware_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_hardware_version(tHalHandle hHal, uint8_t *pVersion, uint32_t versionBufferSize) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { if (pVersion != NULL) - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; else - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; sme_release_global_lock(&pMac->sme); } @@ -5480,21 +5480,21 @@ CDF_STATUS sme_get_wcnss_hardware_version(tHalHandle hHal, tBkidCandidateInfo allocated when retruning, this is either the number needed or number of items put into pPmkidList - \return CDF_STATUS - when fail, it usually means the buffer allocated is not + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough and pNumItems has the number of tBkidCandidateInfo. \Note: pNumItems is a number of tBkidCandidateInfo, not sizeof(tBkidCandidateInfo) * something ---------------------------------------------------------------------------*/ -CDF_STATUS sme_scan_get_bkid_candidate_list(tHalHandle hHal, uint32_t sessionId, +QDF_STATUS sme_scan_get_bkid_candidate_list(tHalHandle hHal, uint32_t sessionId, tBkidCandidateInfo *pBkidList, uint32_t *pNumItems) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_scan_get_bkid_candidate_list(pMac, sessionId, pBkidList, pNumItems); @@ -5516,27 +5516,27 @@ CDF_STATUS sme_scan_get_bkid_candidate_list(tHalHandle hHal, uint32_t sessionId, \brief a wrapper function for OEM DATA REQ \param sessionId - session id to be used. \param pOemDataReqId - pointer to an object to get back the request ID - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_oem_data_req(tHalHandle hHal, +QDF_STATUS sme_oem_data_req(tHalHandle hHal, uint8_t sessionId, tOemDataReqConfig *pOemDataReqConfig, uint32_t *pOemDataReqID) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); do { /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { uint32_t lOemDataReqId = pMac->oemData.oemDataReqID++; /* let it wrap around */ if (pOemDataReqID) { *pOemDataReqID = lOemDataReqId; } else { sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = @@ -5570,29 +5570,29 @@ CDF_STATUS sme_oem_data_req(tHalHandle hHal, (6 bytes) \param pbSessionId - pointer to a caller allocated buffer for returned session ID - \return CDF_STATUS_SUCCESS - session is opened. sessionId returned. + \return QDF_STATUS_SUCCESS - session is opened. sessionId returned. Other status means SME is failed to open the session. - CDF_STATUS_E_RESOURCES - no more session available. + QDF_STATUS_E_RESOURCES - no more session available. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, +QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, void *pContext, uint8_t *pSelfMacAddr, uint8_t *pbSessionId, uint32_t type, uint32_t subType) { - CDF_STATUS status; + QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: type=%d, subType=%d", __func__, type, subType); if (NULL == pbSessionId) { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } else { status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_open_session(pMac, callback, pContext, pSelfMacAddr, pbSessionId, type, @@ -5619,24 +5619,24 @@ CDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, \param sessionId - A previous opened session's ID. - \return CDF_STATUS_SUCCESS - session is closed. + \return QDF_STATUS_SUCCESS - session is closed. Other status means SME is failed to open the session. - CDF_STATUS_E_INVAL - session is not opened. + QDF_STATUS_E_INVAL - session is not opened. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId, csr_roamSessionCloseCallback callback, void *pContext) { - CDF_STATUS status; + QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CLOSE_SESSION, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_close_session(pMac, sessionId, false, callback, pContext); @@ -5655,20 +5655,20 @@ CDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId, \param pAPWPSIES - pointer to a caller allocated object of tSirAPWPSIEs - \return CDF_STATUS – SUCCESS – + \return QDF_STATUS – SUCCESS – FAILURE or RESOURCES – The API finished and failed. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_update_apwpsie(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_update_apwpsie(tHalHandle hHal, uint8_t sessionId, tSirAPWPSIEs *pAPWPSIES) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_update_apwpsie(pMac, sessionId, pAPWPSIES); @@ -5687,20 +5687,20 @@ CDF_STATUS sme_roam_update_apwpsie(tHalHandle hHal, uint8_t sessionId, \param pAPSirRSNie - pointer to a caller allocated object of tSirRSNie with WPS/RSN IEs - \return CDF_STATUS – SUCCESS – + \return QDF_STATUS – SUCCESS – FAILURE or RESOURCES – The API finished and failed. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_update_apwparsni_es(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_update_apwparsni_es(tHalHandle hHal, uint8_t sessionId, tSirRSNie *pAPSirRSNie) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_update_wparsni_es(pMac, sessionId, pAPSirRSNie); @@ -5720,19 +5720,19 @@ CDF_STATUS sme_roam_update_apwparsni_es(tHalHandle hHal, uint8_t sessionId, \param - \return CDF_STATUS SUCCESS + \return QDF_STATUS SUCCESS FAILURE or RESOURCES The API finished and failed. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_change_mcc_beacon_interval(tHalHandle hHal, uint8_t sessionId) +QDF_STATUS sme_change_mcc_beacon_interval(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sms_log(pMac, LOG1, FL("Update Beacon PARAMS ")); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_send_chng_mcc_beacon_interval(pMac, sessionId); sme_release_global_lock(&pMac->sme); } @@ -5745,18 +5745,18 @@ CDF_STATUS sme_change_mcc_beacon_interval(tHalHandle hHal, uint8_t sessionId) * @sessionId: Session Identifier * @request: Pointer to the offload request. * - * Return CDF_STATUS + * Return QDF_STATUS */ -CDF_STATUS sme_set_host_offload(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_host_offload(tHalHandle hHal, uint8_t sessionId, tpSirHostOffloadReq request) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_HOSTOFFLOAD, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { #ifdef WLAN_NS_OFFLOAD if (SIR_IPV6_NS_OFFLOAD == request->offloadType) { status = sme_set_ps_ns_offload(hHal, request, @@ -5780,9 +5780,9 @@ CDF_STATUS sme_set_host_offload(tHalHandle hHal, uint8_t sessionId, * @sessionId: Session Identifier * @pGtkOffload: Pointer to the GTK offload request.. * - * Return CDF_STATUS + * Return QDF_STATUS */ -CDF_STATUS sme_set_gtk_offload(tHalHandle hHal, +QDF_STATUS sme_set_gtk_offload(tHalHandle hHal, tpSirGtkOffloadParams pGtkOffload, uint8_t sessionId) { @@ -5798,14 +5798,14 @@ CDF_STATUS sme_set_gtk_offload(tHalHandle hHal, if (NULL == pSession) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session not found ", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for GTK offload request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_copy_macaddr(&pGtkOffload->bssid, @@ -5816,15 +5816,15 @@ CDF_STATUS sme_set_gtk_offload(tHalHandle hHal, msg.type = WMA_GTK_OFFLOAD_REQ; msg.reserved = 0; msg.bodyptr = request_buf; - 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, FL("Not able to post SIR_HAL_SET_GTK_OFFLOAD message to HAL")); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5834,9 +5834,9 @@ CDF_STATUS sme_set_gtk_offload(tHalHandle hHal, * @sessionId: Session Identifier. * callback_context: callback_context. * - * Return CDF_STATUS + * Return QDF_STATUS */ -CDF_STATUS sme_get_gtk_offload(tHalHandle hHal, +QDF_STATUS sme_get_gtk_offload(tHalHandle hHal, gtk_offload_get_info_callback callback_routine, void *callback_context, uint8_t session_id) { @@ -5851,14 +5851,14 @@ CDF_STATUS sme_get_gtk_offload(tHalHandle hHal, if (NULL == pSession) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session not found", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for Get GTK offload request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_copy_macaddr(&request_buf->bssid, @@ -5883,15 +5883,15 @@ CDF_STATUS sme_get_gtk_offload(tHalHandle hHal, pMac->sme.gtk_offload_get_info_cb = callback_routine; pMac->sme.gtk_offload_get_info_cb_context = callback_context; - 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, FL("Not able to post WMA_GTK_OFFLOAD_GETINFO_REQ message to WMA")); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_GTK_OFFLOAD */ @@ -5900,9 +5900,9 @@ CDF_STATUS sme_get_gtk_offload(tHalHandle hHal, \brief API to set the Keep Alive feature. \param hHal - The handle returned by mac_open. \param request - Pointer to the Keep Alive request. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, +QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, tpSirKeepAliveReq request) { tpSirKeepAliveReq request_buf; @@ -5916,13 +5916,13 @@ CDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, if (pSession == NULL) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Session not Found")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirKeepAliveReq)); if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for keep alive request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_copy_macaddr(&request->bssid, &pSession->connectedProfile.bssid); @@ -5936,15 +5936,15 @@ CDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, msg.type = WMA_SET_KEEP_ALIVE; msg.reserved = 0; msg.bodyptr = request_buf; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_KEEP_ALIVE message to WMA")); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_WLAN_SCAN_PNO @@ -5953,9 +5953,9 @@ CDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, \brief API to set the Preferred Network List Offload feature. \param hHal - The handle returned by mac_open. \param request - Pointer to the offload request. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_set_preferred_network_list(tHalHandle hHal, +QDF_STATUS sme_set_preferred_network_list(tHalHandle hHal, tpSirPNOScanReq request, uint8_t sessionId, void (*callback_routine)(void *callback_context, @@ -5964,13 +5964,13 @@ CDF_STATUS sme_set_preferred_network_list(tHalHandle hHal, void *callback_context) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status; + QDF_STATUS status; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_PREF_NET_LIST, sessionId, request->ucNetworksCount)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { sme_set_ps_preferred_network_list(hHal, request, sessionId, callback_routine, callback_context); sme_release_global_lock(&pMac->sme); @@ -5987,20 +5987,20 @@ CDF_STATUS sme_set_preferred_network_list(tHalHandle hHal, \param hHal - The handle returned by mac_open. \param sessionId - sessionId on which we need to abort scan. \param reason - Reason to abort the scan. - \return CDF_STATUS - CDF_STATUS_E_FAILURE - failure - CDF_STATUS_SUCCESS success + \return QDF_STATUS + QDF_STATUS_E_FAILURE - failure + QDF_STATUS_SUCCESS success ---------------------------------------------------------------------------*/ -CDF_STATUS sme_abort_mac_scan(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_abort_mac_scan(tHalHandle hHal, uint8_t sessionId, eCsrAbortReason reason) { - CDF_STATUS status; + QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ABORT_MACSCAN, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_scan_abort_mac_scan(pMac, sessionId, reason); sme_release_global_lock(&pMac->sme); @@ -6014,10 +6014,10 @@ CDF_STATUS sme_abort_mac_scan(tHalHandle hHal, uint8_t sessionId, \brief API to get current channel on which STA is parked this function gives channel information only of infra station or IBSS station \param hHal, pointer to memory location and sessionId - \returns CDF_STATUS_SUCCESS - CDF_STATUS_E_FAILURE + \returns QDF_STATUS_SUCCESS + QDF_STATUS_E_FAILURE -------------------------------------------------------------------------------*/ -CDF_STATUS sme_get_operation_channel(tHalHandle hHal, uint32_t *pChannel, +QDF_STATUS sme_get_operation_channel(tHalHandle hHal, uint32_t *pChannel, uint8_t sessionId) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -6035,10 +6035,10 @@ CDF_STATUS sme_get_operation_channel(tHalHandle hHal, uint32_t *pChannel, || (pSession->connectedProfile.BSSType == eCSR_BSS_TYPE_START_IBSS)) { *pChannel = pSession->connectedProfile.operationChannel; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* sme_get_operation_channel ends here */ /** @@ -6053,23 +6053,23 @@ CDF_STATUS sme_get_operation_channel(tHalHandle hHal, uint32_t *pChannel, * * Return: Success if msg is posted to PE else Failure. */ -CDF_STATUS sme_register_mgmt_frame_ind_callback(tHalHandle hal, +QDF_STATUS sme_register_mgmt_frame_ind_callback(tHalHandle hal, sir_mgmt_frame_ind_callback callback) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); struct sir_sme_mgmt_frame_cb_req *msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; sms_log(mac_ctx, LOG1, FL(": ENTER")); - if (CDF_STATUS_SUCCESS == + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&mac_ctx->sme)) { msg = cdf_mem_malloc(sizeof(*msg)); if (NULL == msg) { sms_log(mac_ctx, LOGE, FL("Not able to allocate memory for eWNI_SME_REGISTER_MGMT_FRAME_CB")); sme_release_global_lock(&mac_ctx->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(msg, sizeof(*msg), 0); msg->message_type = eWNI_SME_REGISTER_MGMT_FRAME_CB; @@ -6080,7 +6080,7 @@ CDF_STATUS sme_register_mgmt_frame_ind_callback(tHalHandle hal, sme_release_global_lock(&mac_ctx->sme); return status; } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* --------------------------------------------------------------------------- @@ -6092,19 +6092,19 @@ CDF_STATUS sme_register_mgmt_frame_ind_callback(tHalHandle hal, \param matchData - data which needs to be matched before passing frame to HDD. \param matchDataLen - Length of matched data. - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, uint16_t frameType, uint8_t *matchData, uint16_t matchLen) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_REGISTER_MGMTFR, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { tSirRegisterMgmtFrame *pMsg; uint16_t len; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -6113,21 +6113,21 @@ CDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!CSR_IS_SESSION_ANY(sessionId) && !pSession->sessionActive) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s Invalid Sessionid", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(tSirRegisterMgmtFrame) + matchLen; pMsg = cdf_mem_malloc(len); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else { cdf_mem_set(pMsg, len, 0); pMsg->messageType = eWNI_SME_REGISTER_MGMT_FRAME_REQ; @@ -6153,20 +6153,20 @@ CDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, \param matchData - data which needs to be matched before passing frame to HDD. \param matchDataLen - Length of matched data. - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, uint16_t frameType, uint8_t *matchData, uint16_t matchLen) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_DEREGISTER_MGMTFR, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { tSirRegisterMgmtFrame *pMsg; uint16_t len; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -6175,21 +6175,21 @@ CDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!CSR_IS_SESSION_ANY(sessionId) && !pSession->sessionActive) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s Invalid Sessionid", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(tSirRegisterMgmtFrame) + matchLen; pMsg = cdf_mem_malloc(len); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else { cdf_mem_set(pMsg, len, 0); pMsg->messageType = eWNI_SME_REGISTER_MGMT_FRAME_REQ; @@ -6218,15 +6218,15 @@ CDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, * * This function process the roc request and generates scan identifier.s * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, +QDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, uint8_t channel, uint32_t duration, remainOnChanCallback callback, void *pContext, uint8_t isP2PProbeReqAllowed, uint32_t *scan_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hHal); uint32_t san_req_id, scan_count; struct ani_roc_req *roc_msg; @@ -6239,7 +6239,7 @@ CDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, scan_count = csr_ll_count(&mac_ctx->sme.smeScanCmdActiveList); if (scan_count >= mac_ctx->scan.max_scan_count) { sms_log(mac_ctx, LOGE, FL("Max scan reached")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_get_scan_id(&san_req_id); @@ -6252,7 +6252,7 @@ CDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, sms_log(mac_ctx, LOGE, " scan_req: failed to allocate mem for msg"); sme_release_global_lock(&mac_ctx->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } roc_msg->msg_type = eWNI_SME_ROC_CMD; roc_msg->msg_len = (uint16_t) sizeof(struct ani_roc_req); @@ -6267,12 +6267,12 @@ CDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, msg.bodyptr = roc_msg; msg.reserved = 0; msg.bodyval = 0; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(mac_ctx, LOGE, " sme_scan_req failed to post msg"); cdf_mem_free(roc_msg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac_ctx->sme); return status; @@ -6283,19 +6283,19 @@ CDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, \brief API to enable/disable forwarding of probeReq to apps in p2p. \param hHal - The handle returned by mac_open. \param falg: to set the Probe request forarding to wpa_supplicant in listen state in p2p - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ #ifndef WLAN_FEATURE_CONCURRENT_P2P -CDF_STATUS sme_report_probe_req(tHalHandle hHal, uint8_t flag) +QDF_STATUS sme_report_probe_req(tHalHandle hHal, uint8_t flag) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); do { /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* call set in context */ pMac->p2pContext.probeReqForwarding = flag; /* release the lock for the sme object */ @@ -6314,19 +6314,19 @@ CDF_STATUS sme_report_probe_req(tHalHandle hHal, uint8_t flag) \param hHal - The handle returned by mac_open. \param p2pIe - Ptr to p2pIe from HDD. \param p2pIeLength: length of p2pIe - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength) +QDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_P2P_IE, NO_SESSION, 0)); /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (NULL != pMac->p2pContext.probeRspIe) { cdf_mem_free(pMac->p2pContext.probeRspIe); pMac->p2pContext.probeRspIeLength = 0; @@ -6337,7 +6337,7 @@ CDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength) sms_log(pMac, LOGE, "%s: Unable to allocate P2P IE", __func__); pMac->p2pContext.probeRspIeLength = 0; - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; } else { pMac->p2pContext.probeRspIeLength = p2pIeLength; @@ -6362,22 +6362,22 @@ CDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength) \fn sme_send_action \brief API to send action frame from supplicant. \param hHal - The handle returned by mac_open. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_send_action(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_send_action(tHalHandle hHal, uint8_t sessionId, const uint8_t *pBuf, uint32_t len, uint16_t wait, bool noack, uint16_t channel_freq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SEND_ACTION, sessionId, 0)); /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { p2p_send_action(hHal, sessionId, pBuf, len, wait, noack, channel_freq); /* release the lock for the sme object */ @@ -6389,17 +6389,17 @@ CDF_STATUS sme_send_action(tHalHandle hHal, uint8_t sessionId, return status; } -CDF_STATUS sme_cancel_remain_on_channel(tHalHandle hHal, +QDF_STATUS sme_cancel_remain_on_channel(tHalHandle hHal, uint8_t sessionId, uint32_t scan_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CANCEL_REMAIN_ONCHAN, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = p2p_cancel_remain_on_channel(hHal, sessionId, scan_id); sme_release_global_lock(&pMac->sme); } @@ -6407,13 +6407,13 @@ CDF_STATUS sme_cancel_remain_on_channel(tHalHandle hHal, } /* Power Save Related */ -CDF_STATUS sme_p2p_set_ps(tHalHandle hHal, tP2pPsConfig *data) +QDF_STATUS sme_p2p_set_ps(tHalHandle hHal, tP2pPsConfig *data) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = p2p_set_ps(hHal, data); sme_release_global_lock(&pMac->sme); } @@ -6440,27 +6440,27 @@ CDF_STATUS sme_p2p_set_ps(tHalHandle hHal, tP2pPsConfig *data) FILTER_ALL_BROADCAST: FILTER_ALL_MULTICAST_BROADCAST: - \return CDF_STATUS + \return QDF_STATUS --------------------------------------------------------------------------- */ -CDF_STATUS sme_configure_rxp_filter(tHalHandle hHal, +QDF_STATUS sme_configure_rxp_filter(tHalHandle hHal, tpSirWlanSetRxpFilters wlanRxpFilterParam) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_RXPFIL, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ cds_message.bodyptr = wlanRxpFilterParam; cds_message.type = WMA_CFG_RXP_FILTER_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -6485,16 +6485,16 @@ CDF_STATUS sme_configure_rxp_filter(tHalHandle hHal, event is received. callback_context - Context associated with csr_readyToSuspendCallback. - \return CDF_STATUS + \return QDF_STATUS --------------------------------------------------------------------------- */ -CDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, +QDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, uint32_t conn_state_mask, csr_readyToSuspendCallback callback, void *callback_context) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; @@ -6506,15 +6506,15 @@ CDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, pMac->readyToSuspendContext = callback_context; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ cds_message.bodyval = conn_state_mask; cds_message.type = WMA_WLAN_SUSPEND_IND; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pMac->readyToSuspendCallback = NULL; pMac->readyToSuspendContext = NULL; - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -6536,14 +6536,14 @@ CDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, wlanResumeParam- Depicts the wlan resume params - \return CDF_STATUS + \return QDF_STATUS --------------------------------------------------------------------------- */ -CDF_STATUS sme_configure_resume_req(tHalHandle hHal, +QDF_STATUS sme_configure_resume_req(tHalHandle hHal, tpSirWlanResumeParam wlanResumeParam) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; @@ -6551,13 +6551,13 @@ CDF_STATUS sme_configure_resume_req(tHalHandle hHal, TRACE_CODE_SME_RX_HDD_CONFIG_RESUMEREQ, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ cds_message.bodyptr = wlanResumeParam; cds_message.type = WMA_WLAN_RESUME_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -6573,21 +6573,21 @@ CDF_STATUS sme_configure_resume_req(tHalHandle hHal, * @callback_context - ext_wow callback context * * SME will pass this request to lower mac to configure Extr WoW - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_configure_ext_wow(tHalHandle hHal, +QDF_STATUS sme_configure_ext_wow(tHalHandle hHal, tpSirExtWoWParams wlanExtParams, csr_readyToExtWoWCallback callback, void *callback_context) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tpSirExtWoWParams MsgPtr = cdf_mem_malloc(sizeof(*MsgPtr)); if (!MsgPtr) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_EXTWOW, NO_SESSION, 0)); @@ -6596,18 +6596,18 @@ CDF_STATUS sme_configure_ext_wow(tHalHandle hHal, pMac->readyToExtWoWContext = callback_context; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ cdf_mem_copy(MsgPtr, wlanExtParams, sizeof(*MsgPtr)); cds_message.bodyptr = MsgPtr; cds_message.type = WMA_WLAN_EXT_WOW; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pMac->readyToExtWoWCallback = NULL; pMac->readyToExtWoWContext = NULL; cdf_mem_free(MsgPtr); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { @@ -6632,35 +6632,35 @@ CDF_STATUS sme_configure_ext_wow(tHalHandle hHal, wlanAppType1Params- Depicts the wlan App Type 1(Indoor) params - \return CDF_STATUS + \return QDF_STATUS --------------------------------------------------------------------------- */ -CDF_STATUS sme_configure_app_type1_params(tHalHandle hHal, +QDF_STATUS sme_configure_app_type1_params(tHalHandle hHal, tpSirAppType1Params wlanAppType1Params) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tpSirAppType1Params MsgPtr = cdf_mem_malloc(sizeof(*MsgPtr)); if (!MsgPtr) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_APP_TYPE1, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ cdf_mem_copy(MsgPtr, wlanAppType1Params, sizeof(*MsgPtr)); cds_message.bodyptr = MsgPtr; cds_message.type = WMA_WLAN_SET_APP_TYPE1_PARAMS; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { cdf_mem_free(MsgPtr); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { @@ -6683,35 +6683,35 @@ CDF_STATUS sme_configure_app_type1_params(tHalHandle hHal, wlanAppType2Params- Depicts the wlan App Type 2 (Outdoor) params - \return CDF_STATUS + \return QDF_STATUS --------------------------------------------------------------------------- */ -CDF_STATUS sme_configure_app_type2_params(tHalHandle hHal, +QDF_STATUS sme_configure_app_type2_params(tHalHandle hHal, tpSirAppType2Params wlanAppType2Params) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tpSirAppType2Params MsgPtr = cdf_mem_malloc(sizeof(*MsgPtr)); if (!MsgPtr) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_APP_TYPE2, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ cdf_mem_copy(MsgPtr, wlanAppType2Params, sizeof(*MsgPtr)); cds_message.bodyptr = MsgPtr; cds_message.type = WMA_WLAN_SET_APP_TYPE2_PARAMS; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { cdf_mem_free(MsgPtr); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { @@ -6736,12 +6736,12 @@ CDF_STATUS sme_configure_app_type2_params(tHalHandle hHal, -------------------------------------------------------------------------------*/ int8_t sme_get_infra_session_id(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; int8_t sessionid = -1; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { sessionid = csr_get_infra_session_id(pMac); @@ -6766,11 +6766,11 @@ int8_t sme_get_infra_session_id(tHalHandle hHal) -------------------------------------------------------------------------------*/ uint8_t sme_get_infra_operation_channel(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint8_t channel = 0; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { channel = csr_get_infra_operation_channel(pMac, sessionId); @@ -6784,11 +6784,11 @@ uint8_t sme_get_infra_operation_channel(tHalHandle hHal, uint8_t sessionId) /* If other BSS is not up or not connected it will return 0 */ uint8_t sme_get_concurrent_operation_channel(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint8_t channel = 0; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { channel = csr_get_concurrent_operation_channel(pMac); CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: " @@ -6804,12 +6804,12 @@ uint16_t sme_check_concurrent_channel_overlap(tHalHandle hHal, uint16_t sap_ch, eCsrPhyMode sapPhyMode, uint8_t cc_switch_mode) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint16_t channel = 0; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { channel = csr_check_concurrent_channel_overlap(pMac, sap_ch, sapPhyMode, cc_switch_mode); @@ -6869,13 +6869,13 @@ void sme_update_roam_pno_channel_prediction_config( * hHal - HAL handle for device * pMsg - found network description * -* Returns: CDF_STATUS +* Returns: QDF_STATUS * ******************************************************************************/ -CDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg) +QDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirPrefNetworkFoundInd *pPrefNetworkFoundInd = (tSirPrefNetworkFoundInd *) pMsg; uint8_t dumpSsId[SIR_MAC_MAX_SSID_LENGTH + 1]; @@ -6883,7 +6883,7 @@ CDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg) if (NULL == pMsg) { sms_log(pMac, LOGE, "in %s msg ptr is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pMac->pnoOffload) { @@ -6916,7 +6916,7 @@ CDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg) /* we may have a frame */ status = csr_scan_save_preferred_network_found(pMac, pPrefNetworkFoundInd); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to save preferred network")); } @@ -6928,7 +6928,7 @@ CDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg) } /* Call Preferred Netowrk Found Indication callback routine. */ - if (CDF_IS_STATUS_SUCCESS(status) + if (QDF_IS_STATUS_SUCCESS(status) && (pMac->sme.pref_netw_found_cb != NULL)) { pMac->sme.pref_netw_found_cb(pMac->sme. preferred_network_found_ind_cb_ctx, @@ -6937,7 +6937,7 @@ CDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg) } else { sms_log(pMac, LOGE, "%s: callback failed - SSID is NULL", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; @@ -6945,14 +6945,14 @@ CDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg) #endif /* FEATURE_WLAN_SCAN_PNO */ -CDF_STATUS sme_get_cfg_valid_channels(tHalHandle hHal, uint8_t *aValidChannels, +QDF_STATUS sme_get_cfg_valid_channels(tHalHandle hHal, uint8_t *aValidChannels, uint32_t *len) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_get_cfg_valid_channels(pMac, aValidChannels, len); sme_release_global_lock(&pMac->sme); } @@ -6979,15 +6979,15 @@ CDF_STATUS sme_get_cfg_valid_channels(tHalHandle hHal, uint8_t *aValidChannels, \param pMac - The handle returned by mac_open. \param pMsgBuf - MSG Buffer - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) +QDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tAniChangeCountryCodeReq *pMsg; v_REGDOMAIN_t domainIdIoctl; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; static uint8_t default_country[CDS_COUNTRY_CODE_LEN + 1]; pMsg = (tAniChangeCountryCodeReq *) pMsgBuf; @@ -7000,15 +7000,15 @@ CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) pMac->roam.configParam.Is11dSupportEnabled = pMac->roam.configParam.Is11dSupportEnabledOriginal; - cdf_status = cds_read_default_country(default_country); + qdf_status = cds_read_default_country(default_country); /* read the country code and use it */ - if (CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (QDF_IS_STATUS_SUCCESS(qdf_status)) { cdf_mem_copy(pMsg->countryCode, default_country, WNI_CFG_COUNTRY_CODE_LEN); } else { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } /* @@ -7031,11 +7031,11 @@ CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) } if (pMac->roam.configParam.Is11dSupportEnabled) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; /* Set Current Country code and Current Regulatory domain */ status = csr_set_country_code(pMac, pMsg->countryCode); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { /* Supplicant country code failed. So give 11D priority */ pMac->roam.configParam.Is11dSupportEnabled = pMac->roam.configParam.Is11dSupportEnabledOriginal; @@ -7053,7 +7053,7 @@ CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) (v_REGDOMAIN_t *) & domainIdIoctl, SOURCE_QUERY); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL(" fail to get regId %d"), domainIdIoctl); return status; } else if (REGDOMAIN_WORLD == domainIdIoctl) { @@ -7066,7 +7066,7 @@ CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) status = wma_set_reg_domain(pMac, domainIdIoctl); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL(" fail to set regId %d"), domainIdIoctl); return status; } else { @@ -7089,7 +7089,7 @@ CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) pDevContext); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7104,11 +7104,11 @@ CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) * * Return: status of operation */ -CDF_STATUS +QDF_STATUS sme_handle_generic_change_country_code(tpAniSirGlobal mac_ctx, void *pMsgBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; v_REGDOMAIN_t reg_domain_id = 0; bool is_11d_country = false; bool supplicant_priority = @@ -7147,7 +7147,7 @@ sme_handle_generic_change_country_code(tpAniSirGlobal mac_ctx, (v_REGDOMAIN_t *) ®_domain_id, SOURCE_11D); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* if Supplicant country code has priority, disable 11d */ @@ -7164,7 +7164,7 @@ sme_handle_generic_change_country_code(tpAniSirGlobal mac_ctx, /* set to default domain ID */ mac_ctx->scan.domainIdDefault = mac_ctx->scan.domainIdCurrent; } - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(mac_ctx, LOGE, FL("fail to set regId %d"), reg_domain_id); return status; @@ -7185,7 +7185,7 @@ sme_handle_generic_change_country_code(tpAniSirGlobal mac_ctx, /* get the channels based on new cc */ status = csr_get_channel_and_power_list(mac_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(mac_ctx, LOGE, FL("fail to get Channels")); return status; } @@ -7203,7 +7203,7 @@ sme_handle_generic_change_country_code(tpAniSirGlobal mac_ctx, mac_ctx->scan.curScanType = eSIR_ACTIVE_SCAN; sme_disconnect_connected_sessions(mac_ctx); sms_log(mac_ctx, LOG1, FL(" returned")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static bool @@ -7260,7 +7260,7 @@ void sme_disconnect_connected_sessions(tpAniSirGlobal mac_ctx) } #ifdef WLAN_FEATURE_PACKET_FILTERING -CDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, tpSirRcvFltMcAddrList pMulticastAddrs) { tpSirRcvFltMcAddrList request_buf; @@ -7285,7 +7285,7 @@ CDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "%s: Unable to find the session Id: %d", __func__, sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirRcvFltMcAddrList)); @@ -7294,7 +7294,7 @@ CDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, "%s: Not able to " "allocate memory for 8023 Multicast List request", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } if (!csr_is_conn_state_connected_infra(pMac, sessionId)) { @@ -7302,7 +7302,7 @@ CDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, "%s: Ignoring the " "indication as we are not connected", __func__); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(request_buf, pMulticastAddrs, @@ -7315,19 +7315,19 @@ CDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, msg.type = WMA_8023_MULTICAST_LIST_REQ; msg.reserved = 0; msg.bodyptr = request_buf; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_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_8023_MULTICAST_LIST message to WMA", __func__); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, +QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, tpSirRcvPktFilterCfgType pRcvPktFilterCfg, uint8_t sessionId) { @@ -7351,14 +7351,14 @@ CDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, "%s: Not able to " "allocate memory for Receive Filter Set Filter request", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } if (NULL == pSession) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session Not found ", __func__); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_copy_macaddr(&pRcvPktFilterCfg->self_macaddr, @@ -7411,19 +7411,19 @@ CDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, } - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_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_RECEIVE_FILTER_SET_FILTER message to WMA", __func__); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, +QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, tpSirRcvFltPktClearParam pRcvFltPktClearParam, uint8_t sessionId) { @@ -7438,7 +7438,7 @@ CDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, if (NULL == pSession) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session Not found", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirRcvFltPktClearParam)); @@ -7446,7 +7446,7 @@ CDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for Receive Filter " "Clear Filter request", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_copy_macaddr(&pRcvFltPktClearParam->self_macaddr, @@ -7460,16 +7460,16 @@ CDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, msg.type = WMA_RECEIVE_FILTER_CLEAR_FILTER_REQ; msg.reserved = 0; msg.bodyptr = request_buf; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_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_RECEIVE_FILTER_CLEAR_FILTER message to WMA", __func__); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_PACKET_FILTERING */ @@ -7488,12 +7488,12 @@ CDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, -------------------------------------------------------------------------------*/ bool sme_is_channel_valid(tHalHandle hHal, uint8_t channel) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; bool valid = false; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { valid = csr_roam_is_channel_valid(pMac, channel); @@ -7509,15 +7509,15 @@ bool sme_is_channel_valid(tHalHandle hHal, uint8_t channel) \param hHal \param sessionId - Session Identifier \eBand band value to be configured - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_freq_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) +QDF_STATUS sme_set_freq_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_set_band(hHal, sessionId, eBand); sme_release_global_lock(&pMac->sme); } @@ -7529,15 +7529,15 @@ CDF_STATUS sme_set_freq_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) \brief Used to get the current band settings. \param hHal \pBand pointer to hold band value - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_get_freq_band(tHalHandle hHal, eCsrBand *pBand) +QDF_STATUS sme_get_freq_band(tHalHandle hHal, eCsrBand *pBand) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { *pBand = csr_get_current_band(hHal); sme_release_global_lock(&pMac->sme); } @@ -7552,10 +7552,10 @@ CDF_STATUS sme_get_freq_band(tHalHandle hHal, eCsrBand *pBand) \param band \param power to set in dB - \- return CDF_STATUS + \- return QDF_STATUS ----------------------------------------------------------------------------*/ -CDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) +QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) { cds_msg_t msg; tpMaxTxPowerPerBandParams pMaxTxPowerPerBandParams = NULL; @@ -7566,7 +7566,7 @@ CDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:Not able to allocate memory for pMaxTxPowerPerBandParams", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMaxTxPowerPerBandParams->power = dB; @@ -7576,15 +7576,15 @@ CDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) msg.reserved = 0; msg.bodyptr = pMaxTxPowerPerBandParams; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_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_SET_MAX_TX_POWER_PER_BAND_REQ", __func__); cdf_mem_free(pMaxTxPowerPerBandParams); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- @@ -7598,10 +7598,10 @@ CDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) \param pBssid BSSID to set the power cap for \param pBssid pSelfMacAddress self MAC Address \param pBssid power to set in dB - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, +QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, struct cdf_mac_addr pSelfMacAddress, int8_t dB) { cds_msg_t msg; @@ -7614,7 +7614,7 @@ CDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for pMaxTxParams", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_copy_macaddr(&pMaxTxParams->bssId, &pBssid); @@ -7625,15 +7625,15 @@ CDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, msg.reserved = 0; msg.bodyptr = pMaxTxParams; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_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_SET_MAX_TX_POWER_REQ message to WMA", __func__); cdf_mem_free(pMaxTxParams); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- @@ -7643,10 +7643,10 @@ CDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, \brief Set the customer Mac Address. \param customMacAddr customer MAC Address - \- return CDF_STATUS + \- return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) +QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) { cds_msg_t msg; tSirMacAddr *pBaseMacAddr; @@ -7655,7 +7655,7 @@ CDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) if (NULL == pBaseMacAddr) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for pBaseMacAddr")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(*pBaseMacAddr, customMacAddr, sizeof(tSirMacAddr)); @@ -7664,15 +7664,15 @@ CDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) msg.reserved = 0; msg.bodyptr = pBaseMacAddr; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Not able to post SIR_HAL_SET_BASE_MACADDR_IND message to WMA")); cdf_mem_free(pBaseMacAddr); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* ---------------------------------------------------------------------------- @@ -7683,9 +7683,9 @@ CDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) \pBSSId BSSID \dev_mode dev_mode such as station, P2PGO, SAP \param dBm power to set - \- return CDF_STATUS + \- return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, struct cdf_mac_addr pBSSId, enum tCDF_ADAPTER_MODE dev_mode, int dBm) { @@ -7700,7 +7700,7 @@ CDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, if ((int)power != dBm) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: error, invalid power = %d", __func__, dBm); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pTxParams = cdf_mem_malloc(sizeof(tMaxTxPowerParams)); @@ -7708,7 +7708,7 @@ CDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for pTxParams", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_copy_macaddr(&pTxParams->bssId, &pBSSId); @@ -7718,15 +7718,15 @@ CDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, msg.reserved = 0; msg.bodyptr = pTxParams; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: failed to post WMA_SET_TX_POWER_REQ to WMA", __func__); cdf_mem_free(pTxParams); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- @@ -7739,17 +7739,17 @@ CDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, \param hHal \param sessionId \param ssidHidden 0 - Broadcast SSID, 1 - Disable broadcast SSID - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden) +QDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint16_t len; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { tpSirUpdateParams pMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -7757,7 +7757,7 @@ CDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden) sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!pSession->sessionActive) @@ -7767,7 +7767,7 @@ CDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden) len = sizeof(tSirUpdateParams); pMsg = cdf_mem_malloc(len); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else { cdf_mem_set(pMsg, sizeof(tSirUpdateParams), 0); pMsg->messageType = eWNI_SME_HIDE_SSID_REQ; @@ -7789,12 +7789,12 @@ CDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden) \param hHal - The handle returned by mac_open. \param newTMLevel - new Thermal Mitigation Level \param tmMode - Thermal Mitigation handle mode, default 0 - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMode) +QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMode) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tAniSetTmLevelReq *setTmLevelReq = NULL; @@ -7802,7 +7802,7 @@ CDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_TMLEVEL, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { setTmLevelReq = (tAniSetTmLevelReq *) cdf_mem_malloc(sizeof(tAniSetTmLevelReq)); @@ -7811,7 +7811,7 @@ CDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod "%s: Not able to allocate memory for sme_set_tm_level", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } setTmLevelReq->tmMode = tmMode; @@ -7820,12 +7820,12 @@ CDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod /* serialize the req through MC thread */ cds_message.bodyptr = setTmLevelReq; cds_message.type = WMA_SET_TM_LEVEL_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Set TM Level MSG fail", __func__); cdf_mem_free(setTmLevelReq); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -7888,15 +7888,15 @@ void sme_reset_power_values_for5_g(tHalHandle hHal) \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_update_roam_prefer5_g_hz(tHalHandle hHal, bool nRoamPrefer5GHz) +QDF_STATUS sme_update_roam_prefer5_g_hz(tHalHandle hHal, bool nRoamPrefer5GHz) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_RP5G, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamPrefer5GHz is changed from %d to %d", __func__, pMac->roam.configParam.nRoamPrefer5GHz, @@ -7917,15 +7917,15 @@ CDF_STATUS sme_update_roam_prefer5_g_hz(tHalHandle hHal, bool nRoamPrefer5GHz) \param nRoamIntraBand Enable/Disable Intra band roaming \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_roam_intra_band(tHalHandle hHal, const bool nRoamIntraBand) +QDF_STATUS sme_set_roam_intra_band(tHalHandle hHal, const bool nRoamIntraBand) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_ROAMIBAND, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamIntraBand is changed from %d to %d", __func__, pMac->roam.configParam.nRoamIntraBand, @@ -7947,17 +7947,17 @@ CDF_STATUS sme_set_roam_intra_band(tHalHandle hHal, const bool nRoamIntraBand) \param nProbes number of probe requests to be sent out \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_update_roam_scan_n_probes(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_update_roam_scan_n_probes(tHalHandle hHal, uint8_t sessionId, const uint8_t nProbes) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_ROAM_SCAN_N_PROBES, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamScanNProbes is changed from %d to %d", __func__, pMac->roam.configParam.nProbes, nProbes); @@ -7984,19 +7984,19 @@ CDF_STATUS sme_update_roam_scan_n_probes(tHalHandle hHal, uint8_t sessionId, If false then command is not sent to firmware \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal, +QDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal, uint8_t sessionId, const uint16_t nRoamScanHomeAwayTime, const bool bSendOffloadCmd) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_ROAM_SCAN_HOME_AWAY_TIME, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamScanHomeAwayTime is changed from %d to %d", __func__, @@ -8025,10 +8025,10 @@ CDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal, * * Return: success if msg is sent else return failure */ -CDF_STATUS sme_ext_change_channel(tHalHandle h_hal, uint32_t channel, +QDF_STATUS sme_ext_change_channel(tHalHandle h_hal, uint32_t channel, uint8_t session_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac_ctx = PMAC_STRUCT(h_hal); uint8_t channel_state; @@ -8038,12 +8038,12 @@ CDF_STATUS sme_ext_change_channel(tHalHandle h_hal, uint32_t channel, if (CHANNEL_STATE_DISABLE == channel_state) { sms_log(mac_ctx, LOGE, FL(" Invalid channel %d "), channel); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* update the channel list to the firmware */ status = csr_send_ext_change_channel(mac_ctx, channel, session_id); @@ -8104,14 +8104,14 @@ uint16_t sme_get_roam_scan_home_away_time(tHalHandle hHal) \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_update_roam_rssi_diff(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_update_roam_rssi_diff(tHalHandle hHal, uint8_t sessionId, uint8_t RoamRssiDiff) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam rssi diff to %d - old value is %d - roam state is %s", RoamRssiDiff, @@ -8138,22 +8138,22 @@ CDF_STATUS sme_update_roam_rssi_diff(tHalHandle hHal, uint8_t sessionId, isFastTransitionEnabled. This is a synchronous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - SME update isFastTransitionEnabled config + \return QDF_STATUS_SUCCESS - SME update isFastTransitionEnabled config successfully. Other status means SME is failed to update isFastTransitionEnabled. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_fast_transition_enabled(tHalHandle hHal, +QDF_STATUS sme_update_fast_transition_enabled(tHalHandle hHal, bool isFastTransitionEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_FTENABLED, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: FastTransitionEnabled is changed from %d to %d", __func__, @@ -8175,18 +8175,18 @@ CDF_STATUS sme_update_fast_transition_enabled(tHalHandle hHal, \param hHal - HAL handle for device \param isWESModeEnabled - WES mode \param sessionId - Session Identifier - \return CDF_STATUS_SUCCESS - SME update isWESModeEnabled config successfully. + \return QDF_STATUS_SUCCESS - SME update isWESModeEnabled config successfully. Other status means SME is failed to update isWESModeEnabled. -------------------------------------------------------------------------*/ -CDF_STATUS sme_update_wes_mode(tHalHandle hHal, bool isWESModeEnabled, +QDF_STATUS sme_update_wes_mode(tHalHandle hHal, bool isWESModeEnabled, uint8_t sessionId) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set WES Mode to %d - old value is %d - roam state is %s", isWESModeEnabled, @@ -8210,19 +8210,19 @@ CDF_STATUS sme_update_wes_mode(tHalHandle hHal, bool isWESModeEnabled, any value other than 0 is treated as invalid value \param hHal - HAL handle for device \param sessionId - Session Identifier - \return CDF_STATUS_SUCCESS - SME update config successfully. + \return QDF_STATUS_SUCCESS - SME update config successfully. Other status means SME failure to update -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, bool roamScanControl) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_SCANCTRL, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam scan control to %d - old value is %d - roam state is %s", roamScanControl, @@ -8255,12 +8255,12 @@ CDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, This is a synchronous call \param hHal - The handle returned by mac_open. \param sessionId - Session Identifier - \return CDF_STATUS_SUCCESS - SME update isFastRoamIniFeatureEnabled config + \return QDF_STATUS_SUCCESS - SME update isFastRoamIniFeatureEnabled config successfully. Other status means SME is failed to update isFastRoamIniFeatureEnabled. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_is_fast_roam_ini_feature_enabled +QDF_STATUS sme_update_is_fast_roam_ini_feature_enabled (tHalHandle hHal, uint8_t sessionId, const bool isFastRoamIniFeatureEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -8272,7 +8272,7 @@ CDF_STATUS sme_update_is_fast_roam_ini_feature_enabled __func__, pMac->roam.configParam.isFastRoamIniFeatureEnabled, isFastRoamIniFeatureEnabled); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, @@ -8284,7 +8284,7 @@ CDF_STATUS sme_update_is_fast_roam_ini_feature_enabled csr_neighbor_roam_update_fast_roaming_enabled(pMac, sessionId, isFastRoamIniFeatureEnabled); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -8294,18 +8294,18 @@ CDF_STATUS sme_update_is_fast_roam_ini_feature_enabled isMAWCIniFeatureEnabled. This is a synchronous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - SME update MAWCEnabled config successfully. + \return QDF_STATUS_SUCCESS - SME update MAWCEnabled config successfully. Other status means SME is failed to update MAWCEnabled. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_is_mawc_ini_feature_enabled(tHalHandle hHal, +QDF_STATUS sme_update_is_mawc_ini_feature_enabled(tHalHandle hHal, const bool MAWCEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: MAWCEnabled is changed from %d to %d", __func__, pMac->roam.configParam.MAWCEnabled, MAWCEnabled); @@ -8322,17 +8322,17 @@ CDF_STATUS sme_update_is_mawc_ini_feature_enabled(tHalHandle hHal, This is a synchronous call \param hHal - The handle returned by mac_open \param sessionId - Session Identifier - \return CDF_STATUS_SUCCESS on success + \return QDF_STATUS_SUCCESS on success Other status on failure \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_stop_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason) +QDF_STATUS sme_stop_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_roam_offload_scan(pMac, sessionId, ROAM_SCAN_OFFLOAD_STOP, reason); sme_release_global_lock(&pMac->sme); @@ -8346,17 +8346,17 @@ CDF_STATUS sme_stop_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason) This is a synchronous call \param hHal - The handle returned by mac_open \param sessionId - Session Identifier - \return CDF_STATUS_SUCCESS on success + \return QDF_STATUS_SUCCESS on success Other status on failure \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_start_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason) +QDF_STATUS sme_start_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_roam_offload_scan(pMac, sessionId, ROAM_SCAN_OFFLOAD_START, reason); sme_release_global_lock(&pMac->sme); @@ -8370,21 +8370,21 @@ CDF_STATUS sme_start_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason) Concurrent session exists This is a synchronuous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS + \return QDF_STATUS_SUCCESS Other status means SME is failed \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal, +QDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal, bool bFastRoamInConIniFeatureEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pMac->roam.configParam.bFastRoamInConIniFeatureEnabled = bFastRoamInConIniFeatureEnabled; if (0 == pMac->roam.configParam.isRoamOffloadScanEnabled) { @@ -8406,12 +8406,12 @@ CDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal, \param hHal - The handle returned by mac_open. \param sessionId - Session Identifier \param isEseIniFeatureEnabled - flag to enable/disable - \return CDF_STATUS_SUCCESS - SME update isEseIniFeatureEnabled config + \return QDF_STATUS_SUCCESS - SME update isEseIniFeatureEnabled config successfully. Other status means SME is failed to update isEseIniFeatureEnabled. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_is_ese_feature_enabled +QDF_STATUS sme_update_is_ese_feature_enabled (tHalHandle hHal, uint8_t sessionId, const bool isEseIniFeatureEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -8422,7 +8422,7 @@ CDF_STATUS sme_update_is_ese_feature_enabled __func__, pMac->roam.configParam.isEseIniFeatureEnabled, isEseIniFeatureEnabled); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, @@ -8441,7 +8441,7 @@ CDF_STATUS sme_update_is_ese_feature_enabled ROAM_SCAN_OFFLOAD_UPDATE_CFG, REASON_ESE_INI_CFG_CHANGED); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_ESE */ @@ -8452,20 +8452,20 @@ CDF_STATUS sme_update_is_ese_feature_enabled fEnableFwRssiMonitoring. This is a synchronous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - SME update fEnableFwRssiMonitoring. + \return QDF_STATUS_SUCCESS - SME update fEnableFwRssiMonitoring. config successfully. Other status means SME is failed to update fEnableFwRssiMonitoring. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, +QDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, bool fEnableFwRssiMonitoring) { - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; if (sme_cfg_set_int (hHal, WNI_CFG_PS_ENABLE_RSSI_MONITOR, - fEnableFwRssiMonitoring) == CDF_STATUS_E_FAILURE) { - cdf_ret_status = CDF_STATUS_E_FAILURE; + fEnableFwRssiMonitoring) == QDF_STATUS_E_FAILURE) { + cdf_ret_status = QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Could not pass on WNI_CFG_PS_RSSI_MONITOR to CFG"); } @@ -8481,24 +8481,24 @@ CDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, \param hHal - HAL handle for device \param sessionId - Session Identifier \param nOpportunisticThresholdDiff - Opportunistic Scan threshold diff - \return CDF_STATUS_SUCCESS - SME update nOpportunisticThresholdDiff config + \return QDF_STATUS_SUCCESS - SME update nOpportunisticThresholdDiff config successfully. else SME is failed to update nOpportunisticThresholdDiff. -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_roam_opportunistic_scan_threshold_diff(tHalHandle hHal, +QDF_STATUS sme_set_roam_opportunistic_scan_threshold_diff(tHalHandle hHal, uint8_t sessionId, const uint8_t nOpportunisticThresholdDiff) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_neighbor_roam_set_opportunistic_scan_threshold_diff(pMac, sessionId, nOpportunisticThresholdDiff); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "opportunistic threshold diff to %d" @@ -8540,22 +8540,22 @@ uint8_t sme_get_roam_opportunistic_scan_threshold_diff(tHalHandle hHal) \param hHal - HAL handle for device \param sessionId - Session Identifier \param nRoamRescanRssiDiff - roam rescan rssi diff - \return CDF_STATUS_SUCCESS - SME update nRoamRescanRssiDiff config + \return QDF_STATUS_SUCCESS - SME update nRoamRescanRssiDiff config successfully. else SME is failed to update nRoamRescanRssiDiff. -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_roam_rescan_rssi_diff(tHalHandle hHal, +QDF_STATUS sme_set_roam_rescan_rssi_diff(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamRescanRssiDiff) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_neighbor_roam_set_roam_rescan_rssi_diff(pMac, sessionId, nRoamRescanRssiDiff); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "opportunistic threshold diff to %d" @@ -8595,22 +8595,22 @@ uint8_t sme_get_roam_rescan_rssi_diff(tHalHandle hHal) \param hHal - HAL handle for device \param sessionId - Session Identifier \param nRoamBmissFirstBcnt - Roam first bmiss count - \return CDF_STATUS_SUCCESS - SME update nRoamBmissFirstBcnt + \return QDF_STATUS_SUCCESS - SME update nRoamBmissFirstBcnt successfully. else SME is failed to update nRoamBmissFirstBcnt -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_roam_bmiss_first_bcnt(tHalHandle hHal, +QDF_STATUS sme_set_roam_bmiss_first_bcnt(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamBmissFirstBcnt) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_neighbor_roam_set_roam_bmiss_first_bcnt(pMac, sessionId, nRoamBmissFirstBcnt); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "beacon miss first beacon count to %d" @@ -8648,22 +8648,22 @@ uint8_t sme_get_roam_bmiss_first_bcnt(tHalHandle hHal) \param hHal - HAL handle for device \param sessionId - Session Identifier \param nRoamBmissFinalBcnt - Roam final bmiss count - \return CDF_STATUS_SUCCESS - SME update nRoamBmissFinalBcnt + \return QDF_STATUS_SUCCESS - SME update nRoamBmissFinalBcnt successfully. else SME is failed to update nRoamBmissFinalBcnt -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_roam_bmiss_final_bcnt(tHalHandle hHal, +QDF_STATUS sme_set_roam_bmiss_final_bcnt(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamBmissFinalBcnt) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_neighbor_roam_set_roam_bmiss_final_bcnt(pMac, sessionId, nRoamBmissFinalBcnt); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "beacon miss final beacon count to %d" @@ -8703,22 +8703,22 @@ uint8_t sme_get_roam_bmiss_final_bcnt(tHalHandle hHal) \param hHal - HAL handle for device \param sessionId - Session Identifier \param nRoamBeaconRssiWeight - Roam beacon rssi weight - \return CDF_STATUS_SUCCESS - SME update nRoamBeaconRssiWeight config + \return QDF_STATUS_SUCCESS - SME update nRoamBeaconRssiWeight config successfully. else SME is failed to update nRoamBeaconRssiWeight -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_roam_beacon_rssi_weight(tHalHandle hHal, +QDF_STATUS sme_set_roam_beacon_rssi_weight(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamBeaconRssiWeight) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_neighbor_roam_set_roam_beacon_rssi_weight(pMac, sessionId, nRoamBeaconRssiWeight); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "beacon miss final beacon count to %d" @@ -8756,20 +8756,20 @@ uint8_t sme_get_roam_beacon_rssi_weight(tHalHandle hHal) This is a synchronous call \param hHal - The handle returned by mac_open. \param sessionId - Session Identifier - \return CDF_STATUS_SUCCESS - SME update config successful. + \return QDF_STATUS_SUCCESS - SME update config successful. Other status means SME is failed to update \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_set_neighbor_lookup_rssi_threshold +QDF_STATUS sme_set_neighbor_lookup_rssi_threshold (tHalHandle hHal, uint8_t sessionId, uint8_t neighborLookupRssiThreshold) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_neighbor_roam_set_lookup_rssi_threshold(pMac, sessionId, neighborLookupRssiThreshold); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set Lookup threshold to %d - old value is %d - roam state is %s", neighborLookupRssiThreshold, @@ -8794,18 +8794,18 @@ CDF_STATUS sme_set_neighbor_lookup_rssi_threshold \param hal - The handle returned by macOpen. \param session_id - Session Identifier \param delay_before_vdev_stop - value to be set - \return CDF_STATUS_SUCCESS - SME update config successful. + \return QDF_STATUS_SUCCESS - SME update config successful. Other status means SME is failed to update \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_set_delay_before_vdev_stop(tHalHandle hal, +QDF_STATUS sme_set_delay_before_vdev_stop(tHalHandle hal, uint8_t session_id, uint8_t delay_before_vdev_stop) { tpAniSirGlobal pMac = PMAC_STRUCT(hal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR param delay_before_vdev_stop changed from %d to %d"), @@ -8826,7 +8826,7 @@ CDF_STATUS sme_set_delay_before_vdev_stop(tHalHandle hal, rssi threshold This is a synchronous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - SME update config successful. + \return QDF_STATUS_SUCCESS - SME update config successful. Other status means SME is failed to update \sa --------------------------------------------------------------------------*/ @@ -8843,20 +8843,20 @@ uint8_t sme_get_neighbor_lookup_rssi_threshold(tHalHandle hHal) This is a synchronous call \param hHal - The handle returned by mac_open. \param sessionId - Session Identifier - \return CDF_STATUS_SUCCESS - SME update config successful. + \return QDF_STATUS_SUCCESS - SME update config successful. Other status means SME is failed to update \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_set_neighbor_scan_refresh_period +QDF_STATUS sme_set_neighbor_scan_refresh_period (tHalHandle hHal, uint8_t sessionId, uint16_t neighborScanResultsRefreshPeriod) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrNeighborRoamConfig *pNeighborRoamConfig = NULL; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -8891,19 +8891,19 @@ CDF_STATUS sme_set_neighbor_scan_refresh_period gRoamScanOffloadEnabled. This is a synchronous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - SME update config successfully. + \return QDF_STATUS_SUCCESS - SME update config successfully. Other status means SME is failed to update. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_roam_scan_offload_enabled(tHalHandle hHal, +QDF_STATUS sme_update_roam_scan_offload_enabled(tHalHandle hHal, bool nRoamScanOffloadEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL ("gRoamScanOffloadEnabled is changed from %d to %d"), @@ -8936,7 +8936,7 @@ uint16_t sme_get_neighbor_scan_refresh_period(tHalHandle hHal) \brief sme_get_empty_scan_refresh_period() - get empty scan refresh period This is a synchronuous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - SME update config successful. + \return QDF_STATUS_SUCCESS - SME update config successful. Other status means SME is failed to update \sa --------------------------------------------------------------------------*/ @@ -8960,16 +8960,16 @@ uint16_t sme_get_empty_scan_refresh_period(tHalHandle hHal) \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_update_empty_scan_refresh_period(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_update_empty_scan_refresh_period(tHalHandle hHal, uint8_t sessionId, uint16_t nEmptyScanRefreshPeriod) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrNeighborRoamConfig *pNeighborRoamConfig = NULL; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -9008,16 +9008,16 @@ CDF_STATUS sme_update_empty_scan_refresh_period(tHalHandle hHal, uint8_t session \param sessionId - Session Identifier \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_neighbor_scan_min_chan_time(tHalHandle hHal, +QDF_STATUS sme_set_neighbor_scan_min_chan_time(tHalHandle hHal, const uint16_t nNeighborScanMinChanTime, uint8_t sessionId) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set channel min dwell time to %d - old value is %d - roam state is %s", nNeighborScanMinChanTime, @@ -9050,17 +9050,17 @@ CDF_STATUS sme_set_neighbor_scan_min_chan_time(tHalHandle hHal, \param nNeighborScanMinChanTime - Channel maximum dwell time \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_neighbor_scan_max_chan_time(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_neighbor_scan_max_chan_time(tHalHandle hHal, uint8_t sessionId, const uint16_t nNeighborScanMaxChanTime) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrNeighborRoamConfig *pNeighborRoamConfig = NULL; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -9234,16 +9234,16 @@ uint16_t sme_get_neighbor_scan_max_chan_time(tHalHandle hHal, uint8_t sessionId) \param nNeighborScanPeriod - neighbor scan period \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId, const uint16_t nNeighborScanPeriod) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrNeighborRoamConfig *pNeighborRoamConfig = NULL; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -9311,14 +9311,14 @@ uint8_t sme_get_roam_rssi_diff(tHalHandle hHal) * This routine is called to Change roam scan channel list. * This is a synchronous call * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, uint8_t *pChannelList, uint8_t numChannels) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; uint8_t oldChannelList[WNI_CFG_VALID_CHANNEL_LIST_LEN * 2] = { 0 }; @@ -9328,7 +9328,7 @@ CDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { if (pMac->roam.configParam.isRoamOffloadScanEnabled) csr_roam_offload_scan(pMac, sessionId, ROAM_SCAN_OFFLOAD_UPDATE_CFG, @@ -9388,15 +9388,15 @@ CDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, * This routine is called to set ese roam scan channel list. * This is a synchronous call * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, +QDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, uint8_t *pChannelList, uint8_t numChannels) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; tpCsrChannelInfo curchnl_list_info @@ -9406,7 +9406,7 @@ CDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, uint8_t i = 0, j = 0; status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { if (pMac->roam.configParam.isRoamOffloadScanEnabled) csr_roam_offload_scan(pMac, sessionId, ROAM_SCAN_OFFLOAD_UPDATE_CFG, @@ -9423,7 +9423,7 @@ CDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, status = csr_create_roam_scan_channel_list(pMac, sessionId, pChannelList, numChannels, csr_get_current_band(hHal)); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (NULL != curchnl_list_info->ChannelList) { j = 0; for (i = 0; i < curchnl_list_info->numOfChannels; i++) { @@ -9455,9 +9455,9 @@ CDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, * * To get roam scan channel list This is a synchronous call * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_get_roam_scan_channel_list(tHalHandle hHal, +QDF_STATUS sme_get_roam_scan_channel_list(tHalHandle hHal, uint8_t *pChannelList, uint8_t *pNumChannels, uint8_t sessionId) { @@ -9466,10 +9466,10 @@ CDF_STATUS sme_get_roam_scan_channel_list(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; if (NULL == pNeighborRoamInfo->cfgParams.channelInfo.ChannelList) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, @@ -9583,13 +9583,13 @@ uint8_t sme_is_feature_supported_by_fw(uint8_t featEnumValue) \param tdlsLinkEstablishParams - TDLS Peer Link Establishment Parameters \- return CDF_STATUS_SUCCES -------------------------------------------------------------------------*/ -CDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, +QDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrTdlsLinkEstablishParams * tdlsLinkEstablishParams) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -9598,7 +9598,7 @@ CDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, tdlsLinkEstablishParams->isOffChannelSupported)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_tdls_send_link_establish_params(hHal, sessionId, peerMac, tdlsLinkEstablishParams); sme_release_global_lock(&pMac->sme); @@ -9620,14 +9620,14 @@ CDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, \param responder - Tdls request type \- return CDF_STATUS_SUCCES -------------------------------------------------------------------------*/ -CDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, uint8_t frame_type, uint8_t dialog, uint16_t statusCode, uint32_t peerCapability, uint8_t *buf, uint8_t len, uint8_t responder) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrTdlsSendMgmt sendTdlsReq = { {0} }; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -9635,7 +9635,7 @@ CDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, TRACE_CODE_SME_RX_HDD_TDLS_SEND_MGMT_FRAME, sessionId, statusCode)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_copy(sendTdlsReq.peerMac, peerMac, sizeof(tSirMacAddr)); sendTdlsReq.frameType = frame_type; sendTdlsReq.buf = buf; @@ -9662,23 +9662,23 @@ CDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, \param staParams - Peer Station Parameters \- return CDF_STATUS_SUCCES -------------------------------------------------------------------------*/ -CDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrStaParams *pstaParams) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pstaParams) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s :pstaParams is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_CHANGE_PEER_STA, sessionId, pstaParams->capability)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_tdls_change_peer_sta(hHal, sessionId, peerMac, pstaParams); @@ -9696,17 +9696,17 @@ CDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, \param peerMac - peer's Mac Adress. \- return CDF_STATUS_SUCCES -------------------------------------------------------------------------*/ -CDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_ADD_PEER_STA, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_tdls_add_peer_sta(hHal, sessionId, peerMac); sme_release_global_lock(&pMac->sme); @@ -9723,17 +9723,17 @@ CDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, \param peerMac - peer's Mac Adress. \- return CDF_STATUS_SUCCES -------------------------------------------------------------------------*/ -CDF_STATUS sme_delete_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_delete_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_DEL_PEER_STA, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_tdls_del_peer_sta(hHal, sessionId, peerMac); sme_release_global_lock(&pMac->sme); @@ -9773,13 +9773,13 @@ void sme_set_tdls_power_save_prohibited(tHalHandle hHal, uint32_t sessionId, useSmeLock - Need to acquire SME Global Lock before state update or not - \return CDF_STATUS + \return QDF_STATUS --------------------------------------------------------------------------- */ -CDF_STATUS sme_update_fw_tdls_state(tHalHandle hHal, void *psmeTdlsParams, +QDF_STATUS sme_update_fw_tdls_state(tHalHandle hHal, void *psmeTdlsParams, bool useSmeLock) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = NULL; cds_msg_t cds_message; @@ -9787,19 +9787,19 @@ CDF_STATUS sme_update_fw_tdls_state(tHalHandle hHal, void *psmeTdlsParams, if (useSmeLock) { pMac = PMAC_STRUCT(hHal); if (NULL == pMac) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) return status; } /* serialize the req through MC thread */ cds_message.bodyptr = psmeTdlsParams; cds_message.type = WMA_UPDATE_FW_TDLS_STATE; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; /* release the lock if it was acquired */ if (useSmeLock) @@ -9815,13 +9815,13 @@ CDF_STATUS sme_update_fw_tdls_state(tHalHandle hHal, void *psmeTdlsParams, * * SME will send message to WMA to set TDLS Peer state in f/w * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, +QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, tSmeTdlsPeerStateParams *peerStateParams) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tTdlsPeerStateParams *pTdlsPeerStateParams = NULL; tTdlsPeerCapParams *peer_cap = NULL; @@ -9831,14 +9831,14 @@ CDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, uint8_t i; status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; pTdlsPeerStateParams = cdf_mem_malloc(sizeof(*pTdlsPeerStateParams)); if (NULL == pTdlsPeerStateParams) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("failed to allocate mem for tdls peer state param")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pTdlsPeerStateParams, sizeof(*pTdlsPeerStateParams)); @@ -9877,7 +9877,7 @@ CDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, peerStateParams->peerState); cdf_mem_free(pTdlsPeerStateParams); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } peer_cap = &(pTdlsPeerStateParams->peerCap); peer_cap->isPeerResponder = @@ -9931,10 +9931,10 @@ CDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, cds_message.reserved = 0; cds_message.bodyptr = pTdlsPeerStateParams; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { cdf_mem_free(pTdlsPeerStateParams); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); return status; @@ -9947,13 +9947,13 @@ CDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, * * API to set tdls channel switch parameters. * - * Return: CDF_STATUS_SUCCESS on success; another CDF_STATUS_* code otherwise + * Return: QDF_STATUS_SUCCESS on success; another CDF_STATUS_* code otherwise */ -CDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, +QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, sme_tdls_chan_switch_params *ch_switch_params) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); tdls_chan_switch_params *chan_switch_params = NULL; cds_msg_t cds_message; @@ -9962,14 +9962,14 @@ CDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, TRACE_CODE_SME_RX_HDD_TDLS_CHAN_SWITCH_REQ, NO_SESSION, ch_switch_params->tdls_off_channel)); status = sme_acquire_global_lock(&mac->sme); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) return status; chan_switch_params = cdf_mem_malloc(sizeof(*chan_switch_params)); if (NULL == chan_switch_params) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("fail to alloc mem for tdls chan switch param")); sme_release_global_lock(&mac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_zero(chan_switch_params, sizeof(*chan_switch_params)); @@ -9988,7 +9988,7 @@ CDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, ch_switch_params->tdls_off_ch_mode); cdf_mem_free(chan_switch_params); sme_release_global_lock(&mac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&chan_switch_params->peer_mac_addr, @@ -10010,39 +10010,39 @@ CDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, cds_message.reserved = 0; cds_message.bodyptr = chan_switch_params; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Message Post failed status=%d"), - cdf_status); + qdf_status); cdf_mem_free(chan_switch_params); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); return status; } #endif /* FEATURE_WLAN_TDLS */ -CDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, +QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, void *plsContext, void (*pCallbackfn)(tSirLinkSpeedInfo *indParam, void *pContext)) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if ((NULL == pCallbackfn) && (NULL == pMac->sme.pLinkSpeedIndCb)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Indication Call back did not registered", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else if (NULL != pCallbackfn) { pMac->sme.pLinkSpeedCbContext = plsContext; pMac->sme.pLinkSpeedIndCb = pCallbackfn; @@ -10050,11 +10050,11 @@ CDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, /* serialize the req through MC thread */ cds_message.bodyptr = lsReq; cds_message.type = WMA_GET_LINK_SPEED; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Link Speed msg fail", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -10068,10 +10068,10 @@ CDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, void sme_update_enable_ssr(tHalHandle hHal, bool enableSSR) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "SSR level is changed %d", enableSSR); /* not serializing this messsage, as this is only going @@ -10083,23 +10083,23 @@ void sme_update_enable_ssr(tHalHandle hHal, bool enableSSR) return; } -CDF_STATUS sme_check_ch_in_band(tpAniSirGlobal mac_ctx, uint8_t start_ch, +QDF_STATUS sme_check_ch_in_band(tpAniSirGlobal mac_ctx, uint8_t start_ch, uint8_t ch_cnt) { uint8_t i; for (i = 0; i < ch_cnt; i++) { - if (CDF_STATUS_SUCCESS != csr_is_valid_channel(mac_ctx, + if (QDF_STATUS_SUCCESS != csr_is_valid_channel(mac_ctx, (start_ch + i*4))) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void sme_set_160bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, chan_params_t *ch_params) { uint8_t start_ch = 0; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (channel >= 36 && channel <= 64) { ch_params->center_freq_seg0 = 50; @@ -10114,7 +10114,7 @@ void sme_set_160bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, if (ch_params->ch_width == CH_WIDTH_160MHZ) status = sme_check_ch_in_band(mac_ctx, start_ch, 8); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) ch_params->ch_width = CH_WIDTH_80MHZ; } @@ -10122,7 +10122,7 @@ void sme_set_80bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, chan_params_t *ch_params) { uint8_t start_ch = 0; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (channel >= 36 && channel <= 48) { ch_params->center_freq_seg0 = 42; @@ -10149,7 +10149,7 @@ void sme_set_80bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, if (ch_params->ch_width == CH_WIDTH_80MHZ) status = sme_check_ch_in_band(mac_ctx, start_ch, 4); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) ch_params->ch_width = CH_WIDTH_40MHZ; } @@ -10191,7 +10191,7 @@ void sme_set_40bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, /* * SME API to determine the channel bonding mode */ -CDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, +QDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, uint8_t channel, uint8_t ht_sec_ch, chan_params_t *ch_params) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hHal); @@ -10199,7 +10199,7 @@ CDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, if (!CSR_IS_PHY_MODE_11n(eCsrPhyMode) || ch_params->ch_width == CH_WIDTH_20MHZ || - CDF_STATUS_SUCCESS != csr_is_valid_channel(mac_ctx, channel)) { + QDF_STATUS_SUCCESS != csr_is_valid_channel(mac_ctx, channel)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel/phymode config: CB Mode disabled", __func__); @@ -10211,7 +10211,7 @@ CDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, else mac_ctx->roam.configParam.channelBondingMode5GHz = PHY_SINGLE_CHANNEL_CENTERED; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } sms_log(mac_ctx, LOGW, "%s: channel - %d, vht channel width - %d", @@ -10272,7 +10272,7 @@ CDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, mac_ctx->roam.configParam.channelBondingMode24GHz = ch_params->sec_ch_offset; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*convert the ini value to the ENUM used in csr and MAC for CB state*/ @@ -10304,20 +10304,20 @@ void sme_set_curr_device_mode(tHalHandle hHal, \param sessionId - Session Identifier \param pHandoffInfo - info provided by HDD with the handoff request (namely: BSSID, channel etc.) - \return CDF_STATUS_SUCCESS - SME passed the request to CSR successfully. + \return QDF_STATUS_SUCCESS - SME passed the request to CSR successfully. Other status means SME is failed to send the request. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_handoff_request(tHalHandle hHal, +QDF_STATUS sme_handoff_request(tHalHandle hHal, uint8_t sessionId, tCsrHandoffRequest *pHandoffInfo) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: invoked", __func__); status = csr_handoff_request(pMac, sessionId, pHandoffInfo); @@ -10334,25 +10334,25 @@ CDF_STATUS sme_handoff_request(tHalHandle hHal, \param hal - The handle returned by macOpen. \param session_id - Session Identifier \param request - Pointer to the offload request. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, struct sir_ipa_offload_enable_disable *request) { tpAniSirGlobal pMac = PMAC_STRUCT(hal); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; struct sir_ipa_offload_enable_disable *request_buf; cds_msg_t msg; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for \ IPA_OFFLOAD_ENABLE_DISABLE")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } request_buf->offload_type = request->offload_type; @@ -10362,20 +10362,20 @@ CDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, msg.type = WMA_IPA_OFFLOAD_ENABLE_DISABLE; msg.reserved = 0; msg.bodyptr = request_buf; - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( cds_mq_post_message(CDS_MQ_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_IPA_OFFLOAD_\ ENABLE_DISABLE message to WMA")); cdf_mem_free(request_buf); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* IPA_OFFLOAD */ @@ -10383,13 +10383,13 @@ CDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, * SME API to check if there is any infra station or * P2P client is connected */ -CDF_STATUS sme_is_sta_p2p_client_connected(tHalHandle hHal) +QDF_STATUS sme_is_sta_p2p_client_connected(tHalHandle hHal) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (csr_is_infra_connected(pMac)) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #ifdef FEATURE_WLAN_LPHB @@ -10401,13 +10401,13 @@ CDF_STATUS sme_is_sta_p2p_client_connected(tHalHandle hHal) \param pCallbackfn - LPHB timeout notification callback function pointer \- return Configuration message posting status, SUCCESS or Fail -------------------------------------------------------------------------*/ -CDF_STATUS sme_lphb_config_req +QDF_STATUS sme_lphb_config_req (tHalHandle hHal, tSirLPHBReq *lphdReq, - void (*pCallbackfn)(void *pHddCtx, tSirLPHBInd *indParam) + void (*pCallbackfn)(void *pHddCtx, tSirLPHBInd * indParam) ) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; @@ -10415,14 +10415,14 @@ CDF_STATUS sme_lphb_config_req TRACE_CODE_SME_RX_HDD_LPHB_CONFIG_REQ, NO_SESSION, lphdReq->cmd)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if ((LPHB_SET_EN_PARAMS_INDID == lphdReq->cmd) && (NULL == pCallbackfn) && (NULL == pMac->sme.pLphbIndCb)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Indication Call back did not registered", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else if (NULL != pCallbackfn) { pMac->sme.pLphbIndCb = pCallbackfn; } @@ -10430,11 +10430,11 @@ CDF_STATUS sme_lphb_config_req /* serialize the req through MC thread */ cds_message.bodyptr = lphdReq; cds_message.type = WMA_LPHB_CONF_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Config LPHB MSG fail", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -10472,13 +10472,13 @@ void sme_enable_disable_split_scan(tHalHandle hHal, uint8_t nNumStaChan, * @hal: global hal handle * @addPeriodicTxPtrnParams: request message * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS +QDF_STATUS sme_add_periodic_tx_ptrn(tHalHandle hal, struct sSirAddPeriodicTxPtrn *addPeriodicTxPtrnParams) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); struct sSirAddPeriodicTxPtrn *req_msg; cds_msg_t msg; @@ -10488,13 +10488,13 @@ sme_add_periodic_tx_ptrn(tHalHandle hal, req_msg = cdf_mem_malloc(sizeof(*req_msg)); if (!req_msg) { sms_log(mac, LOGE, FL("memory allocation failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *req_msg = *addPeriodicTxPtrnParams; status = sme_acquire_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -10506,7 +10506,7 @@ sme_add_periodic_tx_ptrn(tHalHandle hal, msg.bodyptr = req_msg; msg.type = WMA_ADD_PERIODIC_TX_PTRN_IND; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); @@ -10521,13 +10521,13 @@ sme_add_periodic_tx_ptrn(tHalHandle hal, * @hal: global hal handle * @delPeriodicTxPtrnParams: request message * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS +QDF_STATUS sme_del_periodic_tx_ptrn(tHalHandle hal, struct sSirDelPeriodicTxPtrn *delPeriodicTxPtrnParams) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); struct sSirDelPeriodicTxPtrn *req_msg; cds_msg_t msg; @@ -10537,13 +10537,13 @@ sme_del_periodic_tx_ptrn(tHalHandle hal, req_msg = cdf_mem_malloc(sizeof(*req_msg)); if (!req_msg) { sms_log(mac, LOGE, FL("memory allocation failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *req_msg = *delPeriodicTxPtrnParams; status = sme_acquire_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -10555,7 +10555,7 @@ sme_del_periodic_tx_ptrn(tHalHandle hal, msg.bodyptr = req_msg; msg.type = WMA_DEL_PERIODIC_TX_PTRN_IND; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); @@ -10664,20 +10664,20 @@ static struct sir_ocb_config *sme_copy_sir_ocb_config( * @callback: the callback to hdd * @config: the OCB configuration * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, +QDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, ocb_callback callback, struct sir_ocb_config *config) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; struct sir_ocb_config *msg_body; /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; /* @@ -10685,14 +10685,14 @@ CDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, * exists */ if (pMac->sme.ocb_set_config_callback) { - status = CDF_STATUS_E_BUSY; + status = QDF_STATUS_E_BUSY; goto end; } msg_body = sme_copy_sir_ocb_config(config); if (!msg_body) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } @@ -10704,7 +10704,7 @@ CDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, pMac->sme.ocb_set_config_context = context; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.ocb_set_config_callback = callback; @@ -10724,25 +10724,25 @@ end: * @hHal: reference to the HAL * @utc: the UTC time struct * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc) +QDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; struct sir_ocb_utc *sme_utc; /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; sme_utc = cdf_mem_malloc(sizeof(*sme_utc)); if (!sme_utc) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Malloc failed")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } *sme_utc = *utc; @@ -10751,7 +10751,7 @@ CDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc) msg.reserved = 0; msg.bodyptr = sme_utc; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post message to WDA")); cdf_mem_free(utc); @@ -10769,12 +10769,12 @@ end: * @hHal: reference to the HAL * @timing_advert: the timing advertisement struct * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, +QDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, struct sir_ocb_timing_advert *timing_advert) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; void *buf; @@ -10782,7 +10782,7 @@ CDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; buf = cdf_mem_malloc(sizeof(*sme_timing_advert) + @@ -10790,7 +10790,7 @@ CDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, if (!buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for start TA")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } @@ -10804,7 +10804,7 @@ CDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, msg.reserved = 0; msg.bodyptr = buf; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); goto end; @@ -10821,26 +10821,26 @@ end: * @hHal: reference to the HAL * @timing_advert: the timing advertisement struct * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, +QDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, struct sir_ocb_timing_advert *timing_advert) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; struct sir_ocb_timing_advert *sme_timing_advert; /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; sme_timing_advert = cdf_mem_malloc(sizeof(*timing_advert)); if (!sme_timing_advert) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for stop TA")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } *sme_timing_advert = *timing_advert; @@ -10849,7 +10849,7 @@ CDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, msg.reserved = 0; msg.bodyptr = sme_timing_advert; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); goto end; @@ -10891,26 +10891,26 @@ int sme_ocb_gen_timing_advert_frame(tHalHandle hal_handle, * @callback: the callback to hdd * @request: the TSF timer request * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context, +QDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context, ocb_callback callback, struct sir_ocb_get_tsf_timer *request) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; struct sir_ocb_get_tsf_timer *msg_body; /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; /* Allocate memory for the WMI request, and copy the parameter */ msg_body = cdf_mem_malloc(sizeof(*msg_body)); if (!msg_body) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } *msg_body = *request; @@ -10924,7 +10924,7 @@ CDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context, /* Post the message to WDA */ status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.ocb_get_tsf_timer_callback = NULL; @@ -10946,27 +10946,27 @@ end: * @callback: the callback to hdd * @request: the get DCC stats request * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, +QDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, ocb_callback callback, struct sir_dcc_get_stats *request) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; struct sir_dcc_get_stats *msg_body; /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; /* Allocate memory for the WMI request, and copy the parameter */ msg_body = cdf_mem_malloc(sizeof(*msg_body) + request->request_array_len); if (!msg_body) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } *msg_body = *request; @@ -10982,7 +10982,7 @@ CDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, pMac->sme.dcc_get_stats_context = context; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.dcc_get_stats_callback = callback; @@ -11003,26 +11003,26 @@ end: * @vdev_id: vdev id for OCB interface * @dcc_stats_bitmap: the entries in the stats to clear * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, +QDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, uint32_t dcc_stats_bitmap) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; struct sir_dcc_clear_stats *request; /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; request = cdf_mem_malloc(sizeof(struct sir_dcc_clear_stats)); if (!request) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } @@ -11034,7 +11034,7 @@ CDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, msg.bodyptr = request; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); cdf_mem_free(request); @@ -11054,20 +11054,20 @@ end: * @callback: the callback to hdd * @request: the update DCC request * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, +QDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, ocb_callback callback, struct sir_dcc_update_ndl *request) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; struct sir_dcc_update_ndl *msg_body; /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; /* Allocate memory for the WMI request, and copy the parameter */ @@ -11077,7 +11077,7 @@ CDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, if (!msg_body) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to allocate memory")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } @@ -11100,7 +11100,7 @@ CDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, pMac->sme.dcc_update_ndl_context = context; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.dcc_update_ndl_callback = NULL; @@ -11122,13 +11122,13 @@ end: * @context: the context of the call * @callback: the callback to hdd * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_register_for_dcc_stats_event(tHalHandle hHal, void *context, +QDF_STATUS sme_register_for_dcc_stats_event(tHalHandle hHal, void *context, ocb_callback callback) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; status = sme_acquire_global_lock(&pMac->sme); pMac->sme.dcc_stats_event_callback = callback; @@ -11226,14 +11226,14 @@ void active_list_cmd_timeout_handle(void *userData) } } -CDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) +QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) { cds_msg_t msg; tpSirModemPowerStateInd request_buf; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirModemPowerStateInd)); @@ -11241,7 +11241,7 @@ CDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for MODEM POWER STATE IND", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } request_buf->param = value; @@ -11249,20 +11249,20 @@ CDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) msg.type = WMA_MODEM_POWER_STATE_IND; msg.reserved = 0; msg.bodyptr = request_buf; - 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_MODEM_POWER_STATE_IND message" " to WMA", __func__); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef QCA_HT_2040_COEX -CDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, +QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, struct cdf_mac_addr macAddrSTA, uint8_t sessionId, uint8_t channel_type) @@ -11272,7 +11272,7 @@ CDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pHtOpMode = cdf_mem_malloc(sizeof(tUpdateVHTOpMode)); @@ -11280,7 +11280,7 @@ CDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for setting OP mode", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } switch (channel_type) { @@ -11296,7 +11296,7 @@ CDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, default: CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Invalid OP mode", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pHtOpMode->staId = staId, @@ -11307,20 +11307,20 @@ CDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, 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))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_UPDATE_OP_MODE message" " to WMA", __func__); cdf_mem_free(pHtOpMode); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Notifed FW about OP mode: %d for staId=%d", __func__, pHtOpMode->opMode, staId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- @@ -11331,15 +11331,15 @@ CDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, \param - \return CDF_STATUS SUCCESS + \return QDF_STATUS SUCCESS FAILURE or RESOURCES The API finished and failed. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, uint8_t channel_type, bool obssEnabled) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); ePhyChanBondState cbMode; @@ -11360,10 +11360,10 @@ CDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, default: CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:Error!!! Invalid HT20/40 mode !", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_set_ht2040_mode(pMac, sessionId, cbMode, obssEnabled); sme_release_global_lock(&pMac->sme); @@ -11381,22 +11381,22 @@ CDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, \param cbMode new channel bonding mode which is to set - \return CDF_STATUS SUCCESS. + \return QDF_STATUS SUCCESS. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_set_phy_cb_mode24_g(tHalHandle hHal, ePhyChanBondState phyCBMode) +QDF_STATUS sme_set_phy_cb_mode24_g(tHalHandle hHal, ePhyChanBondState phyCBMode) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: invalid context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMac->roam.configParam.channelBondingMode24GHz = phyCBMode; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -11405,7 +11405,7 @@ CDF_STATUS sme_set_phy_cb_mode24_g(tHalHandle hHal, ePhyChanBondState phyCBMode) * This should be called only if powersave offload * is enabled */ -CDF_STATUS sme_set_idle_powersave_config(void *cds_context, +QDF_STATUS sme_set_idle_powersave_config(void *cds_context, tHalHandle hHal, uint32_t value) { void *wmaContext = cds_get_context(CDF_MODULE_ID_WMA); @@ -11414,20 +11414,20 @@ CDF_STATUS sme_set_idle_powersave_config(void *cds_context, if (NULL == wmaContext) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: wmaContext is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, " Idle Ps Set Value %d", value); pMac->imps_enabled = false; - if (CDF_STATUS_SUCCESS != wma_set_idle_ps_config(wmaContext, value)) { + if (QDF_STATUS_SUCCESS != wma_set_idle_ps_config(wmaContext, value)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, " Failed to Set Idle Ps Value %d", value); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (value) pMac->imps_enabled = true; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } int16_t sme_get_ht_config(tHalHandle hHal, uint8_t session_id, uint16_t ht_capab) @@ -11469,7 +11469,7 @@ int sme_update_ht_config(tHalHandle hHal, uint8_t sessionId, uint16_t htCapab, return -EIO; } - if (CDF_STATUS_SUCCESS != wma_set_htconfig(sessionId, htCapab, value)) { + if (QDF_STATUS_SUCCESS != wma_set_htconfig(sessionId, htCapab, value)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to set ht capability in target"); return -EIO; @@ -11500,20 +11500,20 @@ int sme_update_ht_config(tHalHandle hHal, uint8_t sessionId, uint16_t htCapab, \brief API to Update rate \param hHal - The handle returned by mac_open \param rateUpdateParams - Pointer to rate update params - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, +QDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, tSirRateUpdateInd *rateUpdateParams) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status; + QDF_STATUS status; cds_msg_t msg; tSirRateUpdateInd *rate_upd = cdf_mem_malloc(sizeof(tSirRateUpdateInd)); if (rate_upd == NULL) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Rate update struct alloc failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } *rate_upd = *rateUpdateParams; @@ -11526,11 +11526,11 @@ CDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, eHAL_TX_RATE_HT20 | eHAL_TX_RATE_SGI; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { msg.type = WMA_RATE_UPDATE_IND; msg.bodyptr = rate_upd; - 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 " @@ -11539,11 +11539,11 @@ CDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, sme_release_global_lock(&pMac->sme); cdf_mem_free(rate_upd); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } return status; @@ -11558,20 +11558,20 @@ CDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, * * This routine will give you reg info * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_get_reg_info(tHalHandle hHal, uint8_t chanId, +QDF_STATUS sme_get_reg_info(tHalHandle hHal, uint8_t chanId, uint32_t *regInfo1, uint32_t *regInfo2) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status; + QDF_STATUS status; uint8_t i; bool found = false; status = sme_acquire_global_lock(&pMac->sme); *regInfo1 = 0; *regInfo2 = 0; - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; for (i = 0; i < WNI_CFG_VALID_CHANNEL_LIST_LEN; i++) { @@ -11586,7 +11586,7 @@ CDF_STATUS sme_get_reg_info(tHalHandle hHal, uint8_t chanId, } } if (!found) - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); return status; @@ -11598,18 +11598,18 @@ CDF_STATUS sme_get_reg_info(tHalHandle hHal, uint8_t chanId, \brief Used to plug in callback function for receiving auto shutdown evt \param hHal \param pCallbackfn : callback function pointer should be plugged in - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void) +QDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void) ) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Plug in Auto shutdown event callback", __func__); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if (NULL != pCallbackfn) { pMac->sme.pAutoShutdownNotificationCb = pCallbackfn; } @@ -11626,23 +11626,23 @@ CDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void) \param timer_val - The auto shutdown timer value to be set \- return Configuration message posting status, SUCCESS or Fail -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) +QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSirAutoShutdownCmdParams *auto_sh_cmd; cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { auto_sh_cmd = (tSirAutoShutdownCmdParams *) cdf_mem_malloc(sizeof(tSirAutoShutdownCmdParams)); if (auto_sh_cmd == NULL) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } auto_sh_cmd->timer_val = timer_val; @@ -11650,13 +11650,13 @@ CDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) /* serialize the req through MC thread */ cds_message.bodyptr = auto_sh_cmd; cds_message.type = WMA_SET_AUTO_SHUTDOWN_TIMER_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Auto shutdown MSG fail", __func__); cdf_mem_free(auto_sh_cmd); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Posted Auto shutdown MSG", __func__); @@ -11675,19 +11675,19 @@ CDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) Notification come from FW. \param hHal \param pCallbackfn : callback function pointer should be plugged in - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_add_ch_avoid_callback +QDF_STATUS sme_add_ch_avoid_callback (tHalHandle hHal, void (*pCallbackfn)(void *pAdapter, void *indParam) ) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Plug in CH AVOID CB", __func__); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if (NULL != pCallbackfn) { pMac->sme.pChAvoidNotificationCb = pCallbackfn; } @@ -11704,23 +11704,23 @@ CDF_STATUS sme_add_ch_avoid_callback \param update_type - The udpate_type parameter of this request call \- return Configuration message posting status, SUCCESS or Fail -------------------------------------------------------------------------*/ -CDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) +QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSirChAvoidUpdateReq *cauReq; cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { cauReq = (tSirChAvoidUpdateReq *) cdf_mem_malloc(sizeof(tSirChAvoidUpdateReq)); if (NULL == cauReq) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cauReq->reserved_param = 0; @@ -11728,14 +11728,14 @@ CDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) /* serialize the req through MC thread */ cds_message.bodyptr = cauReq; cds_message.type = WMA_CH_AVOID_UPDATE_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Ch Avoid Update MSG fail", __func__); cdf_mem_free(cauReq); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Posted Ch Avoid Update MSG", __func__); @@ -11757,7 +11757,7 @@ CDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) * Return: Configuration message posting status, SUCCESS or Fail * */ -CDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) +QDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) { cds_msg_t msg; uint32_t *val; @@ -11767,7 +11767,7 @@ CDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) if (NULL == val || NULL == mac_ptr) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pointer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *val = filter_type; @@ -11776,17 +11776,17 @@ CDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) msg.reserved = 0; msg.bodyptr = val; - 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 WDA_SET_MAS_ENABLE_DISABLE to WMA!", __func__); cdf_mem_free(val); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mac_ptr->sme.miracast_value = filter_type; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -11799,7 +11799,7 @@ CDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) * Return: Configuration message posting status, SUCCESS or Fail * */ -CDF_STATUS sme_set_mas(uint32_t val) +QDF_STATUS sme_set_mas(uint32_t val) { cds_msg_t msg; uint32_t *ptr_val; @@ -11808,7 +11808,7 @@ CDF_STATUS sme_set_mas(uint32_t val) if (NULL == ptr_val) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: could not allocate ptr_val", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *ptr_val = val; @@ -11817,15 +11817,15 @@ CDF_STATUS sme_set_mas(uint32_t val) msg.reserved = 0; msg.bodyptr = ptr_val; - 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 WDA_SET_MAS_ENABLE_DISABLE to WMA!", __func__); cdf_mem_free(ptr_val); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -11837,17 +11837,17 @@ CDF_STATUS sme_set_mas(uint32_t val) * * API to Indicate Channel change to new target channel * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, +QDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, struct cdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_channel_change_req(pMac, bssid, ch_params, profile); @@ -11859,12 +11859,12 @@ CDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, /* ------------------------------------------------------------------------- \fn sme_process_channel_change_resp \brief API to Indicate Channel change response message to SAP. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, +QDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo proam_info = { 0 }; eCsrRoamResult roamResult; tpSwitchChannelParams pChnlParams = (tpSwitchChannelParams) pMsgBuf; @@ -11874,7 +11874,7 @@ CDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, (tSirChanChangeResponse *) cdf_mem_malloc(sizeof(tSirChanChangeResponse)); if (NULL == proam_info.channelChangeRespEvent) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, "Channel Change Event Allocation Failed: %d\n", status); return status; @@ -11886,7 +11886,7 @@ CDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, proam_info.channelChangeRespEvent->secondaryChannelOffset = pChnlParams->ch_width; - if (pChnlParams->status == CDF_STATUS_SUCCESS) { + if (pChnlParams->status == QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Received success eWNI_SME_CHANNEL_CHANGE_RSP for sessionId[%d]", SessionId); @@ -11906,7 +11906,7 @@ CDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, eCSR_ROAM_SET_CHANNEL_RSP, roamResult); } else { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; sms_log(pMac, LOGE, "Invalid Channel Change Resp Message: %d\n", status); } @@ -11922,16 +11922,16 @@ CDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, \param hHal - The handle returned by mac_open \param sessionId - session ID \param dfsCacWaitStatus - CAC WAIT status flag - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct cdf_mac_addr bssid, +QDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct cdf_mac_addr bssid, uint8_t dfsCacWaitStatus) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_start_beacon_req(pMac, bssid, dfsCacWaitStatus); sme_release_global_lock(&pMac->sme); } @@ -11946,16 +11946,16 @@ CDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct cdf_mac_addr bssid, * @csaIeReqd: CSA IE Request * @ch_params: channel information * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct cdf_mac_addr bssid, +QDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct cdf_mac_addr bssid, uint8_t targetChannel, uint8_t csaIeReqd, chan_params_t *ch_params) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_send_chan_sw_ie_request(pMac, bssid, targetChannel, csaIeReqd, ch_params); sme_release_global_lock(&pMac->sme); @@ -11968,9 +11968,9 @@ CDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct cdf_mac_addr bssid, \brief SME API to initialize the thermal mitigation parameters \param hHal \param thermalParam : thermal mitigation parameters - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam) +QDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam) { t_thermal_mgmt *pWmaParam; cds_msg_t msg; @@ -11980,7 +11980,7 @@ CDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam if (NULL == pWmaParam) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: could not allocate tThermalMgmt", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero((void *)pWmaParam, sizeof(t_thermal_mgmt)); @@ -12004,24 +12004,24 @@ CDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam pWmaParam->thermalLevels[3].maxTempThreshold = thermalParam.smeThermalLevels[3].smeMaxTempThreshold; - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { msg.type = WMA_INIT_THERMAL_INFO_CMD; msg.bodyptr = pWmaParam; - 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_SET_THERMAL_INFO_CMD to WMA!", __func__); cdf_mem_free(pWmaParam); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } cdf_mem_free(pWmaParam); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -12046,31 +12046,31 @@ void sme_add_set_thermal_level_callback(tHalHandle hal, * @hal: Handler to HAL * @level: Thermal mitigation level * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_set_thermal_level(tHalHandle hal, uint8_t level) +QDF_STATUS sme_set_thermal_level(tHalHandle hal, uint8_t level) { cds_msg_t msg; tpAniSirGlobal pMac = PMAC_STRUCT(hal); - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { cdf_mem_set(&msg, sizeof(msg), 0); msg.type = WMA_SET_THERMAL_LEVEL; msg.bodyval = level; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_THERMAL_LEVEL to WMA!", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* --------------------------------------------------------------------------- @@ -12078,12 +12078,12 @@ CDF_STATUS sme_set_thermal_level(tHalHandle hal, uint8_t level) \brief SME API to set txpower limits \param hHal \param psmetx : power limits for 2g/5g - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) +QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t cds_message; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSirTxPowerLimit *tx_power_limit; @@ -12093,23 +12093,23 @@ CDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Memory allocation for TxPowerLimit failed!", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } *tx_power_limit = *psmetx; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cds_message.type = WMA_TX_POWER_LIMIT; cds_message.reserved = 0; cds_message.bodyptr = tx_power_limit; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_TX_POWER_LIMIT", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; cdf_mem_free(tx_power_limit); } sme_release_global_lock(&pMac->sme); @@ -12117,9 +12117,9 @@ CDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) return status; } -CDF_STATUS sme_update_connect_debug(tHalHandle hHal, uint32_t set_value) +QDF_STATUS sme_update_connect_debug(tHalHandle hHal, uint32_t set_value) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); pMac->fEnableDebugLog = set_value; return status; @@ -12139,14 +12139,14 @@ CDF_STATUS sme_update_connect_debug(tHalHandle hHal, uint32_t set_value) disablefwd - bool value that indicate disable intrabss fwd disable - \return CDF_STATUS + \return QDF_STATUS --------------------------------------------------------------------------- */ -CDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId, bool disablefwd) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - int status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + int status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t cds_message; tpDisableIntraBssFwd pSapDisableIntraFwd = NULL; @@ -12154,7 +12154,7 @@ CDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId, pSapDisableIntraFwd = cdf_mem_malloc(sizeof(tDisableIntraBssFwd)); if (NULL == pSapDisableIntraFwd) { sms_log(pMac, LOGP, "Memory Allocation Failure!!! %s", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pSapDisableIntraFwd, sizeof(tDisableIntraBssFwd)); @@ -12163,13 +12163,13 @@ CDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId, pSapDisableIntraFwd->disableintrabssfwd = disablefwd; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ cds_message.bodyptr = pSapDisableIntraFwd; cds_message.type = WMA_SET_SAP_INTRABSS_DIS; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + status = QDF_STATUS_E_FAILURE; cdf_mem_free(pSapDisableIntraFwd); } sme_release_global_lock(&pMac->sme); @@ -12205,9 +12205,9 @@ void sme_stats_ext_register_callback(tHalHandle hHal, StatsExtCallback callback) \param input - Stats Ext Request structure ptr - \return CDF_STATUS + \return QDF_STATUS ******************************************************************************/ -CDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input) +QDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input) { cds_msg_t msg; tpStatsExtRequest data; @@ -12217,7 +12217,7 @@ CDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input) data = cdf_mem_malloc(data_len); if (data == NULL) { - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(data, data_len); @@ -12232,15 +12232,15 @@ CDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input) msg.reserved = 0; msg.bodyptr = data; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_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_STATS_EXT_REQUEST message to WMA", __func__); cdf_mem_free(data); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /****************************************************************************** @@ -12252,16 +12252,16 @@ CDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input) \param hHal - HAL handle for device \param pMsg - Message body passed from WMA; includes NAN header - \return CDF_STATUS + \return QDF_STATUS ******************************************************************************/ -CDF_STATUS sme_stats_ext_event(tHalHandle hHal, void *pMsg) +QDF_STATUS sme_stats_ext_event(tHalHandle hHal, void *pMsg) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pMsg) { sms_log(pMac, LOGE, "in %s msg ptr is NULL", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { sms_log(pMac, LOG2, "SME: entering %s", __func__); @@ -12285,19 +12285,19 @@ CDF_STATUS sme_stats_ext_event(tHalHandle hHal, void *pMsg) \param sessionId - Session Identifier \param allowDFSChannelRoam - DFS roaming scan mode 0 (disable), 1 (passive), 2 (active) - \return CDF_STATUS_SUCCESS - SME update DFS roaming scan config + \return QDF_STATUS_SUCCESS - SME update DFS roaming scan config successfully. Other status means SME failed to update DFS roaming scan config. \sa -------------------------------------------------------------------------*/ -CDF_STATUS sme_update_dfs_scan_mode(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_update_dfs_scan_mode(tHalHandle hHal, uint8_t sessionId, uint8_t allowDFSChannelRoam) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set AllowDFSChannelRoam Mode to " "%d - old value is %d - roam state is %s", @@ -12341,14 +12341,14 @@ uint8_t sme_get_dfs_scan_mode(tHalHandle hHal) \param updateType - type of buffer \- return Success or failure -----------------------------------------------------------------------------*/ -CDF_STATUS sme_modify_add_ie(tHalHandle hHal, +QDF_STATUS sme_modify_add_ie(tHalHandle hHal, tSirModifyIE *pModifyIE, eUpdateIEsType updateType) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_modify_add_ies(pMac, pModifyIE, updateType); sme_release_global_lock(&pMac->sme); } @@ -12363,14 +12363,14 @@ CDF_STATUS sme_modify_add_ie(tHalHandle hHal, \param updateType - type of buffer \- return Success or failure -----------------------------------------------------------------------------*/ -CDF_STATUS sme_update_add_ie(tHalHandle hHal, +QDF_STATUS sme_update_add_ie(tHalHandle hHal, tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_update_add_ies(pMac, pUpdateIE, updateType); sme_release_global_lock(&pMac->sme); } @@ -12387,11 +12387,11 @@ CDF_STATUS sme_update_add_ie(tHalHandle hHal, bool sme_sta_in_middle_of_roaming(tHalHandle hHal, uint8_t sessionId) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; bool ret = false; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { ret = csr_neighbor_middle_of_roaming(hHal, sessionId); sme_release_global_lock(&pMac->sme); } @@ -12407,33 +12407,33 @@ bool sme_sta_in_middle_of_roaming(tHalHandle hHal, uint8_t sessionId) * * This routine is called to update dscp mapping * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, +QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, sme_QosWmmUpType *dscpmapping, uint8_t sessionId) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t i, j, peSessionId; tCsrRoamSession *pCsrSession = NULL; tpPESession pSession = NULL; status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; pCsrSession = CSR_GET_SESSION(pMac, sessionId); if (pCsrSession == NULL) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Session lookup fails for CSR session")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Invalid session Id %u"), sessionId); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession = pe_find_session_by_bssid(pMac, @@ -12444,14 +12444,14 @@ CDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL(" Session lookup fails for BSSID")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!pSession->QosMapSet.present) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("QOS Mapping IE not present")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } for (i = 0; i < SME_QOS_WMM_UP_MAX; i++) { for (j = pSession->QosMapSet.dscp_range[i][0]; @@ -12484,19 +12484,19 @@ CDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, \brief API to abort current roam scan cycle by roam scan offload module. \param hHal - The handle returned by mac_open. \param sessionId - Session Identifier - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_abort_roam_scan(tHalHandle hHal, uint8_t sessionId) +QDF_STATUS sme_abort_roam_scan(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sms_log(pMac, LOGW, "entering function %s", __func__); if (pMac->roam.configParam.isRoamOffloadScanEnabled) { /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_roam_offload_scan(pMac, sessionId, ROAM_SCAN_OFFLOAD_ABORT_SCAN, REASON_ROAM_ABORT_ROAM_SCAN); @@ -12518,14 +12518,14 @@ CDF_STATUS sme_abort_roam_scan(tHalHandle hHal, uint8_t sessionId) * * SME API to fetch all valid channels filtered by band * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, +QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, uint8_t wifiBand, uint32_t *aValidChannels, uint8_t *pNumChannels) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t chanList[WNI_CFG_VALID_CHANNEL_LIST_LEN] = { 0 }; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint8_t numChannels = 0; @@ -12535,18 +12535,18 @@ CDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, if (!aValidChannels || !pNumChannels) { sms_log(pMac, CDF_TRACE_LEVEL_ERROR, FL("Output channel list/NumChannels is NULL")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if ((wifiBand < WIFI_BAND_UNSPECIFIED) || (wifiBand >= WIFI_BAND_MAX)) { sms_log(pMac, CDF_TRACE_LEVEL_ERROR, FL("Invalid wifiBand (%d)"), wifiBand); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } status = sme_get_cfg_valid_channels(hHal, &chanList[0], &totValidChannels); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, CDF_TRACE_LEVEL_ERROR, FL("Fail to get valid channel list (err=%d)"), status); return status; @@ -12637,7 +12637,7 @@ CDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, default: sms_log(pMac, CDF_TRACE_LEVEL_ERROR, FL("Unknown wifiBand (%d))"), wifiBand); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; break; } *pNumChannels = numChannels; @@ -12650,25 +12650,25 @@ CDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, \brief SME API to fetch extscan capabilities \param hHal \param pReq: extscan capabilities structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_ext_scan_get_capabilities(tHalHandle hHal, +QDF_STATUS sme_ext_scan_get_capabilities(tHalHandle hHal, tSirGetExtScanCapabilitiesReqParams * pReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pReq; cds_message.type = WMA_EXTSCAN_GET_CAPABILITIES_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } @@ -12680,24 +12680,24 @@ CDF_STATUS sme_ext_scan_get_capabilities(tHalHandle hHal, \brief SME API to issue extscan start \param hHal \param pStartCmd: extscan start structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_ext_scan_start(tHalHandle hHal, +QDF_STATUS sme_ext_scan_start(tHalHandle hHal, tSirWifiScanCmdReqParams *pStartCmd) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pStartCmd; cds_message.type = WMA_EXTSCAN_START_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } @@ -12709,23 +12709,23 @@ CDF_STATUS sme_ext_scan_start(tHalHandle hHal, \brief SME API to issue extscan stop \param hHal \param pStopReq: extscan stop structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_ext_scan_stop(tHalHandle hHal, tSirExtScanStopReqParams *pStopReq) +QDF_STATUS sme_ext_scan_stop(tHalHandle hHal, tSirExtScanStopReqParams *pStopReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pStopReq; cds_message.type = WMA_EXTSCAN_STOP_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } return status; @@ -12736,25 +12736,25 @@ CDF_STATUS sme_ext_scan_stop(tHalHandle hHal, tSirExtScanStopReqParams *pStopReq \brief SME API to set BSSID hotlist \param hHal \param pSetHotListReq: extscan set hotlist structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_bss_hotlist(tHalHandle hHal, +QDF_STATUS sme_set_bss_hotlist(tHalHandle hHal, tSirExtScanSetBssidHotListReqParams * pSetHotListReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pSetHotListReq; cds_message.type = WMA_EXTSCAN_SET_BSSID_HOTLIST_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } @@ -12766,25 +12766,25 @@ CDF_STATUS sme_set_bss_hotlist(tHalHandle hHal, \brief SME API to reset BSSID hotlist \param hHal \param pSetHotListReq: extscan set hotlist structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_reset_bss_hotlist(tHalHandle hHal, +QDF_STATUS sme_reset_bss_hotlist(tHalHandle hHal, tSirExtScanResetBssidHotlistReqParams * pResetReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pResetReq; cds_message.type = WMA_EXTSCAN_RESET_BSSID_HOTLIST_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } @@ -12796,25 +12796,25 @@ CDF_STATUS sme_reset_bss_hotlist(tHalHandle hHal, \brief SME API to set significant change \param hHal \param pSetSignificantChangeReq: extscan set significant change structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_significant_change(tHalHandle hHal, +QDF_STATUS sme_set_significant_change(tHalHandle hHal, tSirExtScanSetSigChangeReqParams * pSetSignificantChangeReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pSetSignificantChangeReq; cds_message.type = WMA_EXTSCAN_SET_SIGNF_CHANGE_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } @@ -12826,25 +12826,25 @@ CDF_STATUS sme_set_significant_change(tHalHandle hHal, \brief SME API to reset significant change \param hHal \param pResetReq: extscan reset significant change structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_reset_significant_change(tHalHandle hHal, +QDF_STATUS sme_reset_significant_change(tHalHandle hHal, tSirExtScanResetSignificantChangeReqParams *pResetReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pResetReq; cds_message.type = WMA_EXTSCAN_RESET_SIGNF_CHANGE_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } @@ -12856,25 +12856,25 @@ CDF_STATUS sme_reset_significant_change(tHalHandle hHal, \brief SME API to get cached results \param hHal \param pCachedResultsReq: extscan get cached results structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_get_cached_results(tHalHandle hHal, +QDF_STATUS sme_get_cached_results(tHalHandle hHal, tSirExtScanGetCachedResultsReqParams * pCachedResultsReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pCachedResultsReq; cds_message.type = WMA_EXTSCAN_GET_CACHED_RESULTS_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } @@ -12891,10 +12891,10 @@ CDF_STATUS sme_get_cached_results(tHalHandle hHal, * * Return: eHalStatus enumeration */ -CDF_STATUS sme_set_epno_list(tHalHandle hal, +QDF_STATUS sme_set_epno_list(tHalHandle hal, struct wifi_epno_params *input) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); cds_msg_t cds_message; struct wifi_epno_params *req_msg; @@ -12906,7 +12906,7 @@ CDF_STATUS sme_set_epno_list(tHalHandle hal, req_msg = cdf_mem_malloc(len); if (!req_msg) { sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(req_msg, len); @@ -12927,7 +12927,7 @@ CDF_STATUS sme_set_epno_list(tHalHandle hal, } status = sme_acquire_global_lock(&mac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -12939,12 +12939,12 @@ CDF_STATUS sme_set_epno_list(tHalHandle hal, cds_message.bodyptr = req_msg; cds_message.type = WMA_SET_EPNO_LIST_REQ; status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); cdf_mem_free(req_msg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); return status; @@ -12960,10 +12960,10 @@ CDF_STATUS sme_set_epno_list(tHalHandle hal, * * Return: eHalStatus enumeration */ -CDF_STATUS sme_set_passpoint_list(tHalHandle hal, +QDF_STATUS sme_set_passpoint_list(tHalHandle hal, struct wifi_passpoint_req *input) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); cds_msg_t cds_message; struct wifi_passpoint_req *req_msg; @@ -12975,7 +12975,7 @@ CDF_STATUS sme_set_passpoint_list(tHalHandle hal, req_msg = cdf_mem_malloc(len); if (!req_msg) { sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(req_msg, len); @@ -12997,7 +12997,7 @@ CDF_STATUS sme_set_passpoint_list(tHalHandle hal, } status = sme_acquire_global_lock(&mac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -13009,12 +13009,12 @@ CDF_STATUS sme_set_passpoint_list(tHalHandle hal, cds_message.bodyptr = req_msg; cds_message.type = WMA_SET_PASSPOINT_LIST_REQ; status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); cdf_mem_free(req_msg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); return status; @@ -13027,10 +13027,10 @@ CDF_STATUS sme_set_passpoint_list(tHalHandle hal, * * Return: eHalStatus enumeration */ -CDF_STATUS sme_reset_passpoint_list(tHalHandle hal, +QDF_STATUS sme_reset_passpoint_list(tHalHandle hal, struct wifi_passpoint_req *input) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); cds_msg_t cds_message; struct wifi_passpoint_req *req_msg; @@ -13039,7 +13039,7 @@ CDF_STATUS sme_reset_passpoint_list(tHalHandle hal, req_msg = cdf_mem_malloc(sizeof(*req_msg)); if (!req_msg) { sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(req_msg, sizeof(*req_msg)); @@ -13047,7 +13047,7 @@ CDF_STATUS sme_reset_passpoint_list(tHalHandle hal, req_msg->session_id = input->session_id; status = sme_acquire_global_lock(&mac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -13059,12 +13059,12 @@ CDF_STATUS sme_reset_passpoint_list(tHalHandle hal, cds_message.bodyptr = req_msg; cds_message.type = WMA_RESET_PASSPOINT_LIST_REQ; status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); cdf_mem_free(req_msg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); return status; @@ -13077,11 +13077,11 @@ CDF_STATUS sme_reset_passpoint_list(tHalHandle hal, * * Return: eHalStatus */ -CDF_STATUS +QDF_STATUS sme_set_ssid_hotlist(tHalHandle hal, struct sir_set_ssid_hotlist_request *request) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); cds_msg_t cds_message; struct sir_set_ssid_hotlist_request *set_req; @@ -13089,41 +13089,41 @@ sme_set_ssid_hotlist(tHalHandle hal, set_req = cdf_mem_malloc(sizeof(*set_req)); if (!set_req) { sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } *set_req = *request; status = sme_acquire_global_lock(&mac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* Serialize the req through MC thread */ cds_message.bodyptr = set_req; cds_message.type = WMA_EXTSCAN_SET_SSID_HOTLIST_REQ; status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); sme_release_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(set_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } } else { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); cdf_mem_free(set_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; } -CDF_STATUS sme_ext_scan_register_callback(tHalHandle hHal, +QDF_STATUS sme_ext_scan_register_callback(tHalHandle hHal, void (*pExtScanIndCb)(void *, const uint16_t, void *)) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pMac->sme.pExtScanIndCb = pExtScanIndCb; sme_release_global_lock(&pMac->sme); } @@ -13138,13 +13138,13 @@ CDF_STATUS sme_ext_scan_register_callback(tHalHandle hHal, \brief SME API to clear Link Layer Statistics \param hHal \param pclearStatsReq: Link Layer clear stats request params structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, +QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, tSirLLStatsClearReq *pclearStatsReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tSirLLStatsClearReq *clear_stats_req; @@ -13163,29 +13163,29 @@ CDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_LL_STATS_CLEAR_REQ", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *clear_stats_req = *pclearStatsReq; - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { /* Serialize the req through MC thread */ cds_message.bodyptr = clear_stats_req; cds_message.type = WMA_LINK_LAYER_STATS_CLEAR_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_CLEAR_REQ", __func__); cdf_mem_free(clear_stats_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); cdf_mem_free(clear_stats_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; @@ -13196,12 +13196,12 @@ CDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, \brief SME API to set the Link Layer Statistics \param hHal \param psetStatsReq: Link Layer set stats request params structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq) +QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tSirLLStatsSetReq *set_stats_req; @@ -13219,29 +13219,29 @@ CDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_LL_STATS_SET_REQ", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *set_stats_req = *psetStatsReq; - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { /* Serialize the req through MC thread */ cds_message.bodyptr = set_stats_req; cds_message.type = WMA_LINK_LAYER_STATS_SET_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_SET_REQ", __func__); cdf_mem_free(set_stats_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); cdf_mem_free(set_stats_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; @@ -13252,12 +13252,12 @@ CDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq \brief SME API to get the Link Layer Statistics \param hHal \param pgetStatsReq: Link Layer get stats request params structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq) +QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tSirLLStatsGetReq *get_stats_req; @@ -13275,23 +13275,23 @@ CDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_LL_STATS_GET_REQ", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *get_stats_req = *pgetStatsReq; - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { /* Serialize the req through MC thread */ cds_message.bodyptr = get_stats_req; cds_message.type = WMA_LINK_LAYER_STATS_GET_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_GET_REQ", __func__); cdf_mem_free(get_stats_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); @@ -13299,7 +13299,7 @@ CDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); cdf_mem_free(get_stats_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; @@ -13311,17 +13311,17 @@ CDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq \param hHal \param callback_routine - HDD callback which needs to be invoked after getting status notification from FW - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_link_layer_stats_ind_cb +QDF_STATUS sme_set_link_layer_stats_ind_cb (tHalHandle hHal, void (*callback_routine)(void *callbackCtx, int indType, void *pRsp) ) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pMac->sme.pLinkLayerStatsIndCallback = callback_routine; sme_release_global_lock(&pMac->sme); } else { @@ -13342,18 +13342,18 @@ CDF_STATUS sme_set_link_layer_stats_ind_cb * * This API is invoked by HDD to register its callback in SME * - * Return: CDF_STATUS + * Return: QDF_STATUS */ #ifdef WLAN_FEATURE_MEMDUMP -CDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal, +QDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal, void (*callback_routine)(void *cb_context, struct fw_dump_rsp *rsp)) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pmac = PMAC_STRUCT(hal); status = sme_acquire_global_lock(&pmac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { pmac->sme.fw_dump_callback = callback_routine; sme_release_global_lock(&pmac->sme); } else { @@ -13364,11 +13364,11 @@ CDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal, return status; } #else -CDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal, +QDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal, void (*callback_routine)(void *cb_context, struct fw_dump_rsp *rsp)) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_MEMDUMP */ @@ -13379,16 +13379,16 @@ CDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal, * * This API is invoked by HDD to unregister its callback in SME * - * Return: CDF_STATUS + * Return: QDF_STATUS */ #ifdef WLAN_FEATURE_MEMDUMP -CDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal) +QDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal) { - CDF_STATUS status; + QDF_STATUS status; tpAniSirGlobal pmac = PMAC_STRUCT(hal); status = sme_acquire_global_lock(&pmac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { pmac->sme.fw_dump_callback = NULL; sme_release_global_lock(&pmac->sme); } else { @@ -13399,9 +13399,9 @@ CDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal) return status; } #else -CDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal) +QDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_MEMDUMP */ @@ -13411,19 +13411,19 @@ CDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal) It is used at in the REG_DYNAMIC_VARIABLE macro definition of \param hHal - The handle returned by mac_open. \param nRoamOffloadEnabled - The bool to update with - \return CDF_STATUS_SUCCESS - SME update config successfully. + \return QDF_STATUS_SUCCESS - SME update config successfully. Other status means SME is failed to update. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_roam_offload_enabled(tHalHandle hHal, +QDF_STATUS sme_update_roam_offload_enabled(tHalHandle hHal, bool nRoamOffloadEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: LFR3:gRoamOffloadEnabled is changed from %d to %d", __func__, pMac->roam.configParam.isRoamOffloadEnabled, @@ -13443,20 +13443,20 @@ CDF_STATUS sme_update_roam_offload_enabled(tHalHandle hHal, \param hHal - The handle returned by mac_open. \param sessionId - Session Identifier \param nRoamKeyMgmtOffloadEnabled - The bool to update with - \return CDF_STATUS_SUCCESS - SME update config successfully. + \return QDF_STATUS_SUCCESS - SME update config successfully. Other status means SME is failed to update. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal, +QDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal, uint8_t sessionId, bool nRoamKeyMgmtOffloadEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: LFR3: KeyMgmtOffloadEnabled changed to %d", @@ -13465,7 +13465,7 @@ CDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal, sessionId, nRoamKeyMgmtOffloadEnabled); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -13480,27 +13480,27 @@ CDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal, \param hHal \param temperature context \param pCallbackfn: callback fn with response (temperature) - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_get_temperature(tHalHandle hHal, +QDF_STATUS sme_get_temperature(tHalHandle hHal, void *tempContext, void (*pCallbackfn)(int temperature, void *pContext)) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if ((NULL == pCallbackfn) && (NULL == pMac->sme.pGetTemperatureCb)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Indication Call back did not registered")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else if (NULL != pCallbackfn) { pMac->sme.pTemperatureCbContext = tempContext; pMac->sme.pGetTemperatureCb = pCallbackfn; @@ -13508,11 +13508,11 @@ CDF_STATUS sme_get_temperature(tHalHandle hHal, /* serialize the req through MC thread */ cds_message.bodyptr = NULL; cds_message.type = WMA_GET_TEMPERATURE_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Post Get Temperature msg fail")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -13524,25 +13524,25 @@ CDF_STATUS sme_get_temperature(tHalHandle hHal, \brief SME API to set scanning mac oui \param hHal \param pScanMacOui: Scanning Mac Oui (input 3 bytes) - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, tSirScanMacOui *pScanMacOui) +QDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, tSirScanMacOui *pScanMacOui) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* Serialize the req through MC thread */ cds_message.bodyptr = pScanMacOui; cds_message.type = WMA_SET_SCAN_MAC_OUI_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Msg post Set Scan Mac OUI failed")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -13555,14 +13555,14 @@ CDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, tSirScanMacOui *pScanMacOui \brief SME API to set DHCP server offload info \param hHal \param pDhcpSrvInfo : DHCP server offload info struct - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, +QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, tSirDhcpSrvOffloadInfo *pDhcpSrvInfo) { cds_msg_t cds_message; tSirDhcpSrvOffloadInfo *pSmeDhcpSrvInfo; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); pSmeDhcpSrvInfo = cdf_mem_malloc(sizeof(*pSmeDhcpSrvInfo)); @@ -13571,24 +13571,24 @@ CDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_SET_DHCP_SERVER_OFFLOAD_CMD", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *pSmeDhcpSrvInfo = *pDhcpSrvInfo; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* serialize the req through MC thread */ cds_message.type = WMA_SET_DHCP_SERVER_OFFLOAD_CMD; cds_message.bodyptr = pSmeDhcpSrvInfo; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(CDF_MODULE_ID_WMA, &cds_message))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_DHCP_SERVER_OFFLOAD_CMD to WMA!", __func__); cdf_mem_free(pSmeDhcpSrvInfo); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { @@ -13607,13 +13607,13 @@ CDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, \brief API to set the Led flashing parameters. \param hHal - The handle returned by mac_open. \param x0, x1 - led flashing parameters - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, +QDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, uint32_t x0, uint32_t x1) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tSirLedFlashingReq *ledflashing; @@ -13623,7 +13623,7 @@ CDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Not able to allocate memory for WMA_LED_TIMING_REQ")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } ledflashing->pattern_id = type; @@ -13631,13 +13631,13 @@ CDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, ledflashing->led_x1 = x1; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = ledflashing; cds_message.type = WMA_LED_FLASHING_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } return status; @@ -13648,16 +13648,16 @@ CDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, * sme_handle_dfS_chan_scan() - handle DFS channel configuration * @h_hal: corestack handler * @dfs_flag: flag indicating dfs channel enable/disable - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_handle_dfs_chan_scan(tHalHandle h_hal, uint8_t dfs_flag) +QDF_STATUS sme_handle_dfs_chan_scan(tHalHandle h_hal, uint8_t dfs_flag) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(h_hal); status = sme_acquire_global_lock(&mac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { mac->scan.fEnableDFSChnlScan = dfs_flag; @@ -13686,7 +13686,7 @@ bool sme_validate_sap_channel_switch(tHalHandle hal, uint16_t sap_ch, eCsrPhyMode sap_phy_mode, uint8_t cc_switch_mode, uint8_t session_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac = PMAC_STRUCT(hal); tCsrRoamSession *session = CSR_GET_SESSION(mac, session_id); uint16_t intf_channel = 0; @@ -13696,7 +13696,7 @@ bool sme_validate_sap_channel_switch(tHalHandle hal, session->ch_switch_in_progress = true; status = sme_acquire_global_lock(&mac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { intf_channel = csr_check_concurrent_channel_overlap(mac, sap_ch, sap_phy_mode, cc_switch_mode); @@ -13721,13 +13721,13 @@ bool sme_validate_sap_channel_switch(tHalHandle hal, * * This function configures the stats avg factor in firmware * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, uint16_t stats_avg_factor) { cds_msg_t msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); struct sir_stats_avg_factor *stats_factor; @@ -13737,12 +13737,12 @@ CDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for SIR_HAL_CONFIG_STATS_FACTOR", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } status = sme_acquire_global_lock(&mac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { stats_factor->vdev_id = session_id; stats_factor->stats_avg_factor = stats_avg_factor; @@ -13751,13 +13751,13 @@ CDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, msg.type = SIR_HAL_CONFIG_STATS_FACTOR; msg.bodyptr = stats_factor; - 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 SIR_HAL_CONFIG_STATS_FACTOR to WMA!", __func__); cdf_mem_free(stats_factor); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); } else { @@ -13778,13 +13778,13 @@ CDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, * * This function configures the guard time in firmware * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, uint32_t guard_time) { cds_msg_t msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); struct sir_guard_time_request *g_time; @@ -13794,12 +13794,12 @@ CDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for SIR_HAL_CONFIG_GUARD_TIME", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } status = sme_acquire_global_lock(&mac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { g_time->vdev_id = session_id; g_time->guard_time = guard_time; @@ -13808,13 +13808,13 @@ CDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, msg.type = SIR_HAL_CONFIG_GUARD_TIME; msg.bodyptr = g_time; - 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 SIR_HAL_CONFIG_GUARD_TIME to WMA!", __func__); cdf_mem_free(g_time); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); } else { @@ -13835,13 +13835,13 @@ CDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, * * This function configures the modulated dtim in firmware * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, +QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, uint32_t modulated_dtim) { cds_msg_t msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(h_hal); wma_cli_set_cmd_t *iwcmd; @@ -13850,12 +13850,12 @@ CDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: cdf_mem_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } status = sme_acquire_global_lock(&mac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { cdf_mem_zero((void *)iwcmd, sizeof(*iwcmd)); iwcmd->param_value = modulated_dtim; @@ -13866,13 +13866,13 @@ CDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, msg.reserved = 0; msg.bodyptr = (void *)iwcmd; - 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 GEN_PARAM_DYNAMIC_DTIM to WMA!", __func__); cdf_mem_free(iwcmd); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); } else { @@ -13893,12 +13893,12 @@ CDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, * * This function sends the start/stop logging command to WMA * - * Return: CDF_STATUS_SUCCESS on successful posting + * Return: QDF_STATUS_SUCCESS on successful posting */ -CDF_STATUS sme_wifi_start_logger(tHalHandle hal, +QDF_STATUS sme_wifi_start_logger(tHalHandle hal, struct sir_wifi_start_log start_log) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); cds_msg_t cds_message; struct sir_wifi_start_log *req_msg; @@ -13908,7 +13908,7 @@ CDF_STATUS sme_wifi_start_logger(tHalHandle hal, req_msg = cdf_mem_malloc(len); if (!req_msg) { sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(req_msg, len); @@ -13918,7 +13918,7 @@ CDF_STATUS sme_wifi_start_logger(tHalHandle hal, req_msg->ring_id = start_log.ring_id; status = sme_acquire_global_lock(&mac->sme); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed(status=%d)"), status); @@ -13930,12 +13930,12 @@ CDF_STATUS sme_wifi_start_logger(tHalHandle hal, cds_message.bodyptr = req_msg; cds_message.type = SIR_HAL_START_STOP_LOGGING; status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("vos_mq_post_message failed!(err=%d)"), status); cdf_mem_free(req_msg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); @@ -13969,13 +13969,13 @@ bool sme_neighbor_middle_of_roaming(tHalHandle hHal, uint8_t sessionId) * * Return: eHalStatus */ -CDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal mac) +QDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal mac) { - CDF_STATUS status; + QDF_STATUS status; cds_msg_t message; status = sme_acquire_global_lock(&mac->sme); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -13986,11 +13986,11 @@ CDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal mac) message.bodyptr = NULL; message.type = SIR_HAL_FLUSH_LOG_TO_FW; status = cds_mq_post_message(CDS_MQ_ID_WMA, &message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); return status; @@ -14012,7 +14012,7 @@ CDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal mac) * * Return: CDF status */ -CDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, +QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, sme_ac_enum_type ac, uint8_t tid, uint8_t pri, uint32_t srvc_int, uint32_t sus_int, @@ -14027,14 +14027,14 @@ CDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, if (!psb) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "No need to configure auto trigger:psb is 0"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } wma_handle = cds_get_context(CDF_MODULE_ID_WMA); if (!wma_handle) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma_handle is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } switch (ac) { @@ -14051,7 +14051,7 @@ CDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, access_category = UAPSD_VO; break; default: - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } uapsd_params.wmm_ac = access_category; @@ -14060,14 +14060,14 @@ CDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, uapsd_params.delay_interval = delay_interval; uapsd_params.suspend_interval = sus_int; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wma_trigger_uapsd_params(wma_handle, sessionId, &uapsd_params)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to Trigger Uapsd params for sessionId %d", sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -14079,7 +14079,7 @@ CDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, * * Return: CDF status */ -CDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, +QDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, sme_ac_enum_type ac, uint32_t sessionId) { @@ -14100,23 +14100,23 @@ CDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, access_category = UAPSD_VO; break; default: - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_handle = cds_get_context(CDF_MODULE_ID_WMA); if (!wma_handle) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma handle is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wma_disable_uapsd_per_ac(wma_handle, sessionId, access_category)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to disable uapsd for ac %d for sessionId %d", ac, sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -14130,9 +14130,9 @@ CDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, * Return: Success upon successfully changing nss else failure * */ -CDF_STATUS sme_update_nss(tHalHandle h_hal, uint8_t nss) +QDF_STATUS sme_update_nss(tHalHandle h_hal, uint8_t nss) { - CDF_STATUS status; + QDF_STATUS status; tpAniSirGlobal mac_ctx = PMAC_STRUCT(h_hal); uint32_t i, value = 0; union { @@ -14143,7 +14143,7 @@ CDF_STATUS sme_update_nss(tHalHandle h_hal, uint8_t nss) status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { mac_ctx->roam.configParam.enable2x2 = (nss == 1) ? 0 : 1; /* get the HT capability info*/ @@ -14170,16 +14170,16 @@ CDF_STATUS sme_update_nss(tHalHandle h_hal, uint8_t nss) * * This function stores the rssi threshold breached callback function. * - * Return: CDF_STATUS enumeration. + * Return: QDF_STATUS enumeration. */ -CDF_STATUS sme_set_rssi_threshold_breached_cb(tHalHandle hal, +QDF_STATUS sme_set_rssi_threshold_breached_cb(tHalHandle hal, void (*cb)(void *, struct rssi_breach_event *)) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); status = sme_acquire_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -14206,11 +14206,11 @@ CDF_STATUS sme_set_rssi_threshold_breached_cb(tHalHandle hal, bool sme_is_any_session_in_connected_state(tHalHandle h_hal) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(h_hal); - CDF_STATUS status; + QDF_STATUS status; bool ret = false; status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { ret = csr_is_any_session_in_connect_state(mac_ctx); sme_release_global_lock(&mac_ctx->sme); } @@ -14225,12 +14225,12 @@ bool sme_is_any_session_in_connected_state(tHalHandle h_hal) * This function constructs the vos message and fill in message type, * bodyptr with @input and posts it to WDA queue. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, +QDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, struct rssi_monitor_req *input) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); cds_msg_t cds_message; struct rssi_monitor_req *req_msg; @@ -14239,13 +14239,13 @@ CDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, req_msg = cdf_mem_malloc(sizeof(*req_msg)); if (!req_msg) { sms_log(mac, LOGE, FL("memory allocation failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *req_msg = *input; status = sme_acquire_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -14257,7 +14257,7 @@ CDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, cds_message.bodyptr = req_msg; cds_message.type = WMA_SET_RSSI_MONITOR_REQ; status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); @@ -14276,13 +14276,13 @@ CDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, * This API is invoked by HDD to indicate FW to start * dumping firmware memory. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ #ifdef WLAN_FEATURE_MEMDUMP -CDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) +QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg; struct fw_dump_req *send_req; @@ -14293,7 +14293,7 @@ CDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) if (!send_req) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Memory allocation failed for WDA_FW_MEM_DUMP")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(send_req, recvd_req, sizeof(*send_req)); @@ -14316,32 +14316,32 @@ CDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) seg_req.dst_addr_hi); } - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { msg.bodyptr = send_req; msg.type = WMA_FW_MEM_DUMP_REQ; msg.reserved = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (CDF_STATUS_SUCCESS != cdf_status) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_FW_MEM_DUMP")); cdf_mem_free(send_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to acquire SME Global Lock")); cdf_mem_free(send_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; } #else -CDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) +QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_MEMDUMP */ @@ -14351,12 +14351,12 @@ CDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) * @msg: PCL channel list and length structure * * Sends the command to WMA to send WMI_SOC_SET_PCL_CMDID to FW - * Return: CDF_STATUS_SUCCESS on successful posting + * Return: QDF_STATUS_SUCCESS on successful posting */ -CDF_STATUS sme_soc_set_pcl(tHalHandle hal, +QDF_STATUS sme_soc_set_pcl(tHalHandle hal, struct sir_pcl_list msg) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); cds_msg_t cds_message; struct sir_pcl_list *req_msg; @@ -14367,7 +14367,7 @@ CDF_STATUS sme_soc_set_pcl(tHalHandle hal, req_msg = cdf_mem_malloc(len); if (!req_msg) { sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(req_msg, len); @@ -14378,7 +14378,7 @@ CDF_STATUS sme_soc_set_pcl(tHalHandle hal, req_msg->pcl_len = msg.pcl_len; status = sme_acquire_global_lock(&mac->sme); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(mac, LOGE, FL("sme_AcquireGlobalLock failed!(status=%d)"), status); @@ -14390,12 +14390,12 @@ CDF_STATUS sme_soc_set_pcl(tHalHandle hal, cds_message.bodyptr = req_msg; cds_message.type = SIR_HAL_SOC_SET_PCL_TO_FW; status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("vos_mq_post_message failed!(err=%d)"), status); cdf_mem_free(req_msg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); @@ -14408,26 +14408,26 @@ CDF_STATUS sme_soc_set_pcl(tHalHandle hal, * @msg: HW mode structure containing hw mode and callback details * * Sends the command to CSR to send WMI_SOC_SET_HW_MODE_CMDID to FW - * Return: CDF_STATUS_SUCCESS on successful posting + * Return: QDF_STATUS_SUCCESS on successful posting */ -CDF_STATUS sme_soc_set_hw_mode(tHalHandle hal, +QDF_STATUS sme_soc_set_hw_mode(tHalHandle hal, struct sir_hw_mode msg) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); tSmeCmd *cmd = NULL; status = sme_acquire_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("Failed to acquire lock")); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } cmd = sme_get_command_buffer(mac); if (!cmd) { sms_log(mac, LOGE, FL("Get command buffer failed")); sme_release_global_lock(&mac->sme); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } cmd->command = e_sme_command_set_hw_mode; @@ -14440,7 +14440,7 @@ CDF_STATUS sme_soc_set_hw_mode(tHalHandle hal, csr_queue_sme_command(mac, cmd, false); sme_release_global_lock(&mac->sme); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -14472,23 +14472,23 @@ void sme_register_hw_mode_trans_cb(tHalHandle hal, * @next_action: next action to happen at policy mgr after beacon update * * Sends the command to CSR to send to PE - * Return: CDF_STATUS_SUCCESS on successful posting + * Return: QDF_STATUS_SUCCESS on successful posting */ -CDF_STATUS sme_nss_update_request(tHalHandle hHal, uint32_t vdev_id, +QDF_STATUS sme_nss_update_request(tHalHandle hHal, uint32_t vdev_id, uint8_t new_nss, void *cback, uint8_t next_action, void *hdd_context) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac = PMAC_STRUCT(hHal); tSmeCmd *cmd = NULL; status = sme_acquire_global_lock(&mac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cmd = sme_get_command_buffer(mac); if (!cmd) { sms_log(mac, LOGE, FL("Get command buffer failed")); sme_release_global_lock(&mac->sme); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } cmd->command = e_sme_command_nss_update; /* Sessionized modules may require this info */ @@ -14514,26 +14514,26 @@ CDF_STATUS sme_nss_update_request(tHalHandle hHal, uint32_t vdev_id, * Queues configuration information to CSR to configure * WLAN firmware for the dual MAC features * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_soc_set_dual_mac_config(tHalHandle hal, +QDF_STATUS sme_soc_set_dual_mac_config(tHalHandle hal, struct sir_dual_mac_config msg) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); tSmeCmd *cmd; status = sme_acquire_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("Failed to acquire lock")); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } cmd = sme_get_command_buffer(mac); if (!cmd) { sms_log(mac, LOGE, FL("Get command buffer failed")); sme_release_global_lock(&mac->sme); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } cmd->command = e_sme_command_set_dual_mac_config; @@ -14548,7 +14548,7 @@ CDF_STATUS sme_soc_set_dual_mac_config(tHalHandle hal, csr_queue_sme_command(mac, cmd, false); sme_release_global_lock(&mac->sme); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_LFR_SUBNET_DETECTION @@ -14557,14 +14557,14 @@ CDF_STATUS sme_soc_set_dual_mac_config(tHalHandle hal, * @Hal: hal handle * @gw_params: request parameters from HDD * - * Return: CDF_STATUS + * Return: QDF_STATUS * * This routine will update gateway parameters to WMA */ -CDF_STATUS sme_gateway_param_update(tHalHandle Hal, +QDF_STATUS sme_gateway_param_update(tHalHandle Hal, struct gateway_param_update_req *gw_params) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; cds_msg_t cds_message; struct gateway_param_update_req *request_buf; @@ -14572,7 +14572,7 @@ CDF_STATUS sme_gateway_param_update(tHalHandle Hal, if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for gw param update request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *request_buf = *gw_params; @@ -14580,15 +14580,15 @@ CDF_STATUS sme_gateway_param_update(tHalHandle Hal, cds_message.type = WMA_GW_PARAM_UPDATE_REQ; cds_message.reserved = 0; cds_message.bodyptr = request_buf; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_GW_PARAM_UPDATE_REQ message to HAL")); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_LFR_SUBNET_DETECTION */ @@ -14600,7 +14600,7 @@ CDF_STATUS sme_gateway_param_update(tHalHandle Hal, * * Return: CDF Status */ -CDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, +QDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, sme_peer_authorized_fp auth_cb, uint32_t vdev_id) { @@ -14610,7 +14610,7 @@ CDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, if (!wma_handle) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma handle is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_set_peer_authorized_cb(wma_handle, auth_cb); @@ -14623,16 +14623,16 @@ CDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, * @hal: HAL pointer * @fcc_constraint: true: disable, false; enable * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_disable_non_fcc_channel(tHalHandle hal, bool fcc_constraint) +QDF_STATUS sme_disable_non_fcc_channel(tHalHandle hal, bool fcc_constraint) { - CDF_STATUS status; + QDF_STATUS status; tpAniSirGlobal mac_ptr = PMAC_STRUCT(hal); status = sme_acquire_global_lock(&mac_ptr->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if (fcc_constraint != mac_ptr->scan.fcc_constraint) { mac_ptr->scan.fcc_constraint = fcc_constraint; @@ -14666,23 +14666,23 @@ void sme_setdef_dot11mode(tHalHandle hal) * @notify_id - Identifies 1 of the 4 parameters to be modified * @val New value of the parameter * - * Return: CDF_STATUS - SME update config successful. + * Return: QDF_STATUS - SME update config successful. * Other status means SME failed to update */ -CDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, +QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, uint8_t session_id, uint32_t notify_id, int32_t val) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_handle); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrNeighborRoamConfig *nr_config = NULL; tpCsrNeighborRoamControlInfo nr_info = NULL; uint32_t reason = 0; status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { nr_config = &mac_ctx->roam.configParam.neighborRoamConfig; nr_info = &mac_ctx->roam.neighborRoamInfo[session_id]; switch (notify_id) { @@ -14730,14 +14730,14 @@ CDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("invalid parameter notify_id %d"), notify_id); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; break; } sme_release_global_lock(&mac_ctx->sme); } #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD if (mac_ctx->roam.configParam.isRoamOffloadScanEnabled && - status == CDF_STATUS_SUCCESS) { + status == QDF_STATUS_SUCCESS) { csr_roam_offload_scan(mac_ctx, session_id, ROAM_SCAN_OFFLOAD_UPDATE_CFG, reason); } @@ -14822,20 +14822,20 @@ void sme_get_opclass(tHalHandle hal, uint8_t channel, uint8_t bw_offset, * @wait_time: wait timeout value * @flag: feature flag in bitmasp * - * Return: Return CDF_STATUS, otherwise appropriate failure code + * Return: Return QDF_STATUS, otherwise appropriate failure code */ -CDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, +QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, uint32_t wait_time, uint32_t flags) { cds_msg_t message; - CDF_STATUS status; + QDF_STATUS status; struct egap_conf_params *egap_params; egap_params = cdf_mem_malloc(sizeof(*egap_params)); if (NULL == egap_params) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: fail to alloc egap_params", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } egap_params->enable = enable; @@ -14846,7 +14846,7 @@ CDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, message.type = WMA_SET_EGAP_CONF_PARAMS; message.bodyptr = egap_params; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post msg to WMA!", __func__); diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c index 6861fa557f..76bf27333a 100644 --- a/core/sme/src/common/sme_ft_api.c +++ b/core/sme/src/common/sme_ft_api.c @@ -35,7 +35,7 @@ void sme_ft_open(tHalHandle hHal, uint32_t sessionId) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL != pSession) { @@ -59,7 +59,7 @@ void sme_ft_open(tHalHandle hHal, uint32_t sessionId) sme_preauth_reassoc_intvl_timer_callback, (void *)pSession->ftSmeContext.pUsrCtx); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(pMac, LOGE, FL ("Preauth Reassoc interval Timer allocation failed")); @@ -91,7 +91,7 @@ void sme_ft_close(tHalHandle hHal, uint32_t sessionId) preAuthReassocIntvlTimer); } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cdf_mc_timer_destroy(&pSession->ftSmeContext. preAuthReassocIntvlTimer)) { sms_log(pMac, LOGE, @@ -144,7 +144,7 @@ void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id, { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ptr); tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (NULL == session || NULL == ft_ies) { sms_log(mac_ctx, LOGE, FL(" ft ies or session is NULL")); @@ -152,7 +152,7 @@ void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id, } status = sme_acquire_global_lock(&mac_ctx->sme); - if (!(CDF_IS_STATUS_SUCCESS(status))) + if (!(QDF_IS_STATUS_SUCCESS(status))) return; sms_log(mac_ctx, LOG1, "FT IEs Req is received in state %d", @@ -255,15 +255,15 @@ void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id, * * To send key update indication for FT session * - * Return: CDF_STATUS + * Return: QDF_STATUS */ static -CDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id, +QDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id, tCsrRoamSetKey *ftkey_info) { tSirFTUpdateKeyInfo *msg; uint16_t msglen; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tSirKeyMaterial *keymaterial = NULL; tAniEdType ed_type; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); @@ -276,13 +276,13 @@ CDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id, if (ftkey_info->keyLength > CSR_MAX_KEY_LEN) { sms_log(mac_ctx, LOGE, FL("invalid keyLength %d"), ftkey_info->keyLength); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } msglen = sizeof(tSirFTUpdateKeyInfo); msg = cdf_mem_malloc(msglen); if (NULL == msg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(msg, msglen, 0); msg->messageType = eWNI_SME_FT_UPDATE_KEY; @@ -362,26 +362,26 @@ void sme_set_ftptk_state(tHalHandle hHal, uint32_t sessionId, bool state) pSession->ftSmeContext.setFTPTKState = state; } -CDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId, +QDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId, tCsrRoamSetKey *pFTKeyInfo) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (!pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pFTKeyInfo == NULL) { sms_log(pMac, LOGE, "%s: pFTKeyInfo is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = sme_acquire_global_lock(&pMac->sme); - if (!(CDF_IS_STATUS_SUCCESS(status))) { - return CDF_STATUS_E_FAILURE; + if (!(QDF_IS_STATUS_SUCCESS(status))) { + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, "sme_ft_update_key is received in state %d", pSession->ftSmeContext.FTState); @@ -396,10 +396,10 @@ CDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId, sms_log(pMac, LOGE, "%s: Key set failure %d", __func__, status); pSession->ftSmeContext.setFTPTKState = false; - status = CDF_STATUS_FT_PREAUTH_KEY_FAILED; + status = QDF_STATUS_FT_PREAUTH_KEY_FAILED; } else { pSession->ftSmeContext.setFTPTKState = true; - status = CDF_STATUS_FT_PREAUTH_KEY_SUCCESS; + status = QDF_STATUS_FT_PREAUTH_KEY_SUCCESS; sms_log(pMac, LOG1, "%s: Key set success", __func__); } @@ -414,7 +414,7 @@ CDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId, default: sms_log(pMac, LOGW, "%s: Unhandled state=%d", __func__, pSession->ftSmeContext.FTState); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } sme_release_global_lock(&pMac->sme); @@ -435,7 +435,7 @@ void sme_get_ft_pre_auth_response(tHalHandle hHal, uint32_t sessionId, { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (!pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); @@ -445,7 +445,7 @@ void sme_get_ft_pre_auth_response(tHalHandle hHal, uint32_t sessionId, *ft_ies_length = 0; status = sme_acquire_global_lock(&pMac->sme); - if (!(CDF_IS_STATUS_SUCCESS(status))) + if (!(QDF_IS_STATUS_SUCCESS(status))) return; /* All or nothing - proceed only if both BSSID and FT IE fit */ @@ -487,7 +487,7 @@ void sme_get_rici_es(tHalHandle hHal, uint32_t sessionId, uint8_t *ric_ies, { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (!pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); @@ -497,7 +497,7 @@ void sme_get_rici_es(tHalHandle hHal, uint32_t sessionId, uint8_t *ric_ies, *ric_ies_length = 0; status = sme_acquire_global_lock(&pMac->sme); - if (!(CDF_IS_STATUS_SUCCESS(status))) + if (!(QDF_IS_STATUS_SUCCESS(status))) return; /* All or nothing */ diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c index 8158218a07..50731edac0 100644 --- a/core/sme/src/common/sme_power_save.c +++ b/core/sme/src/common/sme_power_save.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -40,9 +40,9 @@ * @type: type * @body: body pointer * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body) +QDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body) { cds_msg_t msg; @@ -51,15 +51,15 @@ CDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body) msg.bodyptr = body; msg.bodyval = 0; - if (CDF_STATUS_SUCCESS != cds_mq_post_message( + if (QDF_STATUS_SUCCESS != cds_mq_post_message( CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Posting message %d failed", __func__, type); cdf_mem_free(body); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -67,29 +67,29 @@ CDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body) * @mac_ctx: global mac context * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx, uint32_t session_id) { struct sEnablePsParams *enable_ps_req_params; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; enable_ps_req_params = cdf_mem_malloc(sizeof(*enable_ps_req_params)); if (NULL == enable_ps_req_params) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed for enable_ps_req_params")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } enable_ps_req_params->psSetting = eSIR_ADDON_NOTHING; enable_ps_req_params->sessionid = session_id; status = sme_post_ps_msg_to_wma(WMA_ENTER_PS_REQ, enable_ps_req_params); - if (!CDF_IS_STATUS_SUCCESS(status)) - return CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(status)) + return QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Message WMA_ENTER_PS_REQ Successfully sent to WMA")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -97,30 +97,30 @@ CDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx, * @mac_ctx: global mac context * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_disable_ps_req_params(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_ps_disable_ps_req_params(tpAniSirGlobal mac_ctx, uint32_t session_id) { struct sDisablePsParams *disable_ps_req_params; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; disable_ps_req_params = cdf_mem_malloc(sizeof(*disable_ps_req_params)); if (NULL == disable_ps_req_params) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed for sDisablePsParams")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } disable_ps_req_params->psSetting = eSIR_ADDON_NOTHING; disable_ps_req_params->sessionid = session_id; status = sme_post_ps_msg_to_wma(WMA_EXIT_PS_REQ, disable_ps_req_params); - if (!CDF_IS_STATUS_SUCCESS(status)) - return CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(status)) + return QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Message WMA_EXIT_PS_REQ Successfully sent to WMA")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -128,9 +128,9 @@ CDF_STATUS sme_ps_disable_ps_req_params(tpAniSirGlobal mac_ctx, * @mac_ctx: global mac context * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, uint32_t session_id) { @@ -139,14 +139,14 @@ CDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, uint8_t uapsd_trigger_mask = 0; struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; enable_uapsd_req_params = cdf_mem_malloc(sizeof(*enable_uapsd_req_params)); if (NULL == enable_uapsd_req_params) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed for enable_uapsd_req_params")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } @@ -187,12 +187,12 @@ CDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, status = sme_post_ps_msg_to_wma(WMA_ENABLE_UAPSD_REQ, enable_uapsd_req_params); - if (!CDF_IS_STATUS_SUCCESS(status)) - return CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(status)) + return QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Msg WMA_ENABLE_UAPSD_REQ Successfully sent to WMA")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -200,31 +200,31 @@ CDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, * @mac_ctx: global mac context * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_disable_uapsd_req_params(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_ps_disable_uapsd_req_params(tpAniSirGlobal mac_ctx, uint32_t session_id) { struct sDisableUapsdParams *disable_uapsd_req_params; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; disable_uapsd_req_params = cdf_mem_malloc(sizeof(*disable_uapsd_req_params)); if (NULL == disable_uapsd_req_params) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed for disable_uapsd_req_params")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } disable_uapsd_req_params->sessionid = session_id; status = sme_post_ps_msg_to_wma(WMA_DISABLE_UAPSD_REQ, disable_uapsd_req_params); - if (!CDF_IS_STATUS_SUCCESS(status)) - return CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(status)) + return QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Message WMA_DISABLE_UAPSD_REQ Successfully sent to WMA")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -232,9 +232,9 @@ CDF_STATUS sme_ps_disable_uapsd_req_params(tpAniSirGlobal mac_ctx, * @mac_ctx: global mac context * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx, uint32_t session_id) { struct sSirHalWowlEnterParams *hal_wowl_params; @@ -249,7 +249,7 @@ CDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx, if (NULL == hal_wowl_params) { sms_log(mac_ctx, LOGP, FL("Fail to allocate memory for Enter Wowl Request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set((uint8_t *) hal_wowl_params, sizeof(*hal_wowl_params), 0); @@ -327,18 +327,18 @@ CDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx, hal_wowl_params->sessionId = sme_wowl_params->sessionId; - if (CDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_ENTER_REQ, + if (QDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_ENTER_REQ, hal_wowl_params)){ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Msg WMA_WOWL_ENTER_REQ Successfully sent to WMA")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else goto end; end: if (hal_wowl_params != NULL) cdf_mem_free(hal_wowl_params); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -346,9 +346,9 @@ end: * @mac_ctx: global mac context * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_exit_wowl_req_params(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_ps_exit_wowl_req_params(tpAniSirGlobal mac_ctx, uint32_t session_id) { struct sSirHalWowlExitParams *hal_wowl_msg; @@ -356,21 +356,21 @@ CDF_STATUS sme_ps_exit_wowl_req_params(tpAniSirGlobal mac_ctx, if (NULL == hal_wowl_msg) { sms_log(mac_ctx, LOGP, FL("Fail to allocate memory for WoWLAN Add Bcast Pattern ")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set((uint8_t *) hal_wowl_msg, sizeof(*hal_wowl_msg), 0); hal_wowl_msg->sessionId = session_id; - if (CDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_EXIT_REQ, + if (QDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_EXIT_REQ, hal_wowl_msg)){ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Msg WMA_WOWL_EXIT_REQ Successfully sent to WMA")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (hal_wowl_msg != NULL) cdf_mem_free(hal_wowl_msg); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -380,12 +380,12 @@ CDF_STATUS sme_ps_exit_wowl_req_params(tpAniSirGlobal mac_ctx, * @session_id: session id * sme_ps_cmd: power save message * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, +QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, enum sme_ps_cmd command) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (!CSR_IS_SESSION_VALID(mac_ctx, session_id)) { sms_log(mac_ctx, LOGE, "Invalid Session_id %x", session_id); @@ -416,10 +416,10 @@ CDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, default: sms_log(mac_ctx, LOGE, FL("Invalid command type %d"), command); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to enter in PS, Command: %d"), command); } @@ -435,9 +435,9 @@ CDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, *1) Sta Mode Ps should be enabled in ini file. *2) Session should be in infra mode and in connected state. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_enable_sta_ps_check(tpAniSirGlobal mac_ctx, uint32_t session_id) +QDF_STATUS sme_enable_sta_ps_check(tpAniSirGlobal mac_ctx, uint32_t session_id) { struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; @@ -445,16 +445,16 @@ CDF_STATUS sme_enable_sta_ps_check(tpAniSirGlobal mac_ctx, uint32_t session_id) if (!ps_global_info->ps_enabled) { sms_log(mac_ctx, LOG1, "Cannot initiate PS. PS is disabled in ini"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Check whether the given session is Infra and in Connected State */ if (!csr_is_conn_state_connected_infra(mac_ctx, session_id)) { sms_log(mac_ctx, LOGE, "Sta not infra/connected state %d", session_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -464,15 +464,15 @@ CDF_STATUS sme_enable_sta_ps_check(tpAniSirGlobal mac_ctx, uint32_t session_id) * @session_id: session id * sme_ps_cmd: power save message * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_enable_disable(tHalHandle hal_ctx, uint32_t session_id, +QDF_STATUS sme_ps_enable_disable(tHalHandle hal_ctx, uint32_t session_id, enum sme_ps_cmd command) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); status = sme_enable_sta_ps_check(mac_ctx, session_id); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) return status; status = sme_ps_process_command(mac_ctx, session_id, command); return status; @@ -483,19 +483,19 @@ CDF_STATUS sme_ps_enable_disable(tHalHandle hal_ctx, uint32_t session_id, * @hal_ctx: global hal_handle * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_uapsd_enable(tHalHandle hal_ctx, uint32_t session_id) +QDF_STATUS sme_ps_uapsd_enable(tHalHandle hal_ctx, uint32_t session_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); status = sme_enable_sta_ps_check(mac_ctx, session_id); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) return status; status = sme_ps_process_command(mac_ctx, session_id, SME_PS_UAPSD_ENABLE); - if (status == CDF_STATUS_SUCCESS) + if (status == QDF_STATUS_SUCCESS) sme_offload_qos_process_into_uapsd_mode(mac_ctx, session_id); return status; @@ -506,19 +506,19 @@ CDF_STATUS sme_ps_uapsd_enable(tHalHandle hal_ctx, uint32_t session_id) * @hal_ctx: global hal_handle * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_uapsd_disable(tHalHandle hal_ctx, uint32_t session_id) +QDF_STATUS sme_ps_uapsd_disable(tHalHandle hal_ctx, uint32_t session_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); status = sme_enable_sta_ps_check(mac_ctx, session_id); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) return status; status = sme_ps_process_command(mac_ctx, session_id, SME_PS_UAPSD_DISABLE); - if (status == CDF_STATUS_SUCCESS) + if (status == QDF_STATUS_SUCCESS) sme_offload_qos_process_out_of_uapsd_mode(mac_ctx, session_id); return status; @@ -530,7 +530,7 @@ CDF_STATUS sme_ps_uapsd_disable(tHalHandle hal_ctx, uint32_t session_id) * @ts_info: tspec info. * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ void sme_set_tspec_uapsd_mask_per_session(tpAniSirGlobal mac_ctx, tSirMacTSInfo *ts_info, @@ -616,13 +616,13 @@ void sme_set_tspec_uapsd_mask_per_session(tpAniSirGlobal mac_ctx, * @uapsd_start_ind_cb: uapsd start indiation cb * @callback_context: callback context * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_start_uapsd(tHalHandle hal_ctx, uint32_t session_id, +QDF_STATUS sme_ps_start_uapsd(tHalHandle hal_ctx, uint32_t session_id, uapsd_start_indication_cb uapsd_start_ind_cb, void *callback_context) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; status = sme_ps_uapsd_enable(hal_ctx, session_id); return status; } @@ -773,7 +773,7 @@ void sme_set_pno_channel_prediction(tpSirPNOScanReq request_buf, request_buf->stationary_thresh, request_buf->channel_prediction_full_scan); } -CDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, +QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, tpSirPNOScanReq request, uint8_t session_id, preferred_network_found_ind_cb callback_routine, @@ -788,7 +788,7 @@ CDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, if (NULL == session) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: session is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: SSID = 0x%08x%08x%08x%08x%08x%08x%08x%08x, 0x%08x%08x%08x%08x%08x%08x%08x%08x", __func__, @@ -812,14 +812,14 @@ CDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, if (!session) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: session is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirPNOScanReq)); if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for PNO request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(request_buf, request, sizeof(tSirPNOScanReq)); @@ -931,12 +931,12 @@ CDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, msg.type = WMA_SET_PNO_REQ; msg.reserved = 0; msg.bodyptr = request_buf; - 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, FL("Not able to post WMA_SET_PNO_REQ message to WMA")); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Cache the Preferred Network Found Indication callback information */ @@ -947,7 +947,7 @@ CDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "-%s", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_SCAN_PNO */ @@ -956,11 +956,11 @@ CDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, * @hal_ctx - The handle returned by mac_open. * @request - Pointer to the offload request. * - * Return CDF_STATUS - * CDF_STATUS_E_FAILURE Cannot set the offload. - * CDF_STATUS_SUCCESS Request accepted. + * Return QDF_STATUS + * QDF_STATUS_E_FAILURE Cannot set the offload. + * QDF_STATUS_SUCCESS Request accepted. */ -CDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, +QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, tpSirHostOffloadReq request, uint8_t session_id) { @@ -979,14 +979,14 @@ CDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, if (NULL == session) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: SESSION not Found", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirHostOffloadReq)); if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for host offload request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_copy_macaddr(&request->bssid, &session->connectedProfile.bssid); @@ -996,15 +996,15 @@ CDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, msg.type = WMA_SET_HOST_OFFLOAD; msg.reserved = 0; msg.bodyptr = request_buf; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_HOST_OFFLOAD msg to WMA")); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_NS_OFFLOAD @@ -1013,11 +1013,11 @@ CDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, * @hal_ctx - The handle returned by mac_open. * @request - Pointer to the offload request. * - * Return CDF_STATUS - * CDF_STATUS_E_FAILURE Cannot set the offload. - * CDF_STATUS_SUCCESS Request accepted. + * Return QDF_STATUS + * QDF_STATUS_E_FAILURE Cannot set the offload. + * QDF_STATUS_SUCCESS Request accepted. */ -CDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, +QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, tpSirHostOffloadReq request, uint8_t session_id) { @@ -1028,7 +1028,7 @@ CDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, if (NULL == session) { sms_log(mac_ctx, LOGE, FL("Session not found ")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_copy_macaddr(&request->bssid, &session->connectedProfile.bssid); @@ -1037,22 +1037,22 @@ CDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for NS offload request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *request_buf = *request; msg.type = WMA_SET_NS_OFFLOAD; msg.reserved = 0; msg.bodyptr = request_buf; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post SIR_HAL_SET_HOST_OFFLOAD message to HAL")); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_NS_OFFLOAD */ @@ -1075,26 +1075,26 @@ CDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, tSirRetStatus sme_post_pe_message(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) { - CDF_STATUS cdf_status; - cdf_status = cds_mq_post_message(CDS_MQ_ID_PE, (cds_msg_t *) msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + QDF_STATUS qdf_status; + qdf_status = cds_mq_post_message(CDS_MQ_ID_PE, (cds_msg_t *) msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(mac_ctx, LOGP, FL("cds_mq_post_message failed with status code %d"), - cdf_status); + qdf_status); return eSIR_FAILURE; } return eSIR_SUCCESS; } -CDF_STATUS sme_ps_enable_auto_ps_timer(tHalHandle hal_ctx, +QDF_STATUS sme_ps_enable_auto_ps_timer(tHalHandle hal_ctx, uint32_t session_id, bool is_reassoc) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint32_t timer_value; if (is_reassoc) @@ -1105,23 +1105,23 @@ CDF_STATUS sme_ps_enable_auto_ps_timer(tHalHandle hal_ctx, sms_log(mac_ctx, LOGE, FL("Start auto_ps_timer for %d is_reassoc:%d "), timer_value, is_reassoc); - cdf_status = cdf_mc_timer_start(&ps_param->auto_ps_enable_timer, + qdf_status = cdf_mc_timer_start(&ps_param->auto_ps_enable_timer, timer_value); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { - if (CDF_STATUS_E_ALREADY == cdf_status) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + if (QDF_STATUS_E_ALREADY == qdf_status) { /* Consider this ok since the timer is already started*/ sms_log(mac_ctx, LOGW, FL("auto_ps_timer is already started")); } else { sms_log(mac_ctx, LOGP, FL("Cannot start auto_ps_timer")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_ps_disable_auto_ps_timer(tHalHandle hal_ctx, +QDF_STATUS sme_ps_disable_auto_ps_timer(tHalHandle hal_ctx, uint32_t session_id) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); @@ -1138,11 +1138,11 @@ CDF_STATUS sme_ps_disable_auto_ps_timer(tHalHandle hal_ctx, session_id); cdf_mc_timer_stop(&ps_param->auto_ps_enable_timer); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_ps_open(tHalHandle hal_ctx) +QDF_STATUS sme_ps_open(tHalHandle hal_ctx) { uint32_t i; @@ -1151,17 +1151,17 @@ CDF_STATUS sme_ps_open(tHalHandle hal_ctx) sms_log(mac_ctx, LOG1, FL("Enter")); for (i = 0; i < MAX_SME_SESSIONS; i++) { - if (CDF_STATUS_SUCCESS != sme_ps_open_per_session(hal_ctx, i)) { + if (QDF_STATUS_SUCCESS != sme_ps_open_per_session(hal_ctx, i)) { sms_log(mac_ctx, LOGE, FL("PMC Init Failed for session %d"), i); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_ps_open_per_session(tHalHandle hal_ctx, uint32_t session_id) +QDF_STATUS sme_ps_open_per_session(tHalHandle hal_ctx, uint32_t session_id) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; @@ -1171,16 +1171,16 @@ CDF_STATUS sme_ps_open_per_session(tHalHandle hal_ctx, uint32_t session_id) sms_log(mac_ctx, LOG1, FL("Enter")); /* Allocate a timer to enable ps automatically */ - if (!CDF_IS_STATUS_SUCCESS(cdf_mc_timer_init( + if (!QDF_IS_STATUS_SUCCESS(cdf_mc_timer_init( &ps_param->auto_ps_enable_timer, CDF_TIMER_TYPE_SW, sme_auto_ps_entry_timer_expired, ps_param))) { sms_log(mac_ctx, LOGE, FL("Cannot allocate timer for auto ps entry")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -1189,25 +1189,25 @@ void sme_auto_ps_entry_timer_expired(void *data) struct ps_params *ps_params = (struct ps_params *)data; tpAniSirGlobal mac_ctx = (tpAniSirGlobal)ps_params->mac_ctx; uint32_t session_id = ps_params->session_id; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_enable_sta_ps_check(mac_ctx, session_id); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { sme_ps_enable_disable((tHalHandle)mac_ctx, session_id, SME_PS_ENABLE); } else { status = cdf_mc_timer_start(&ps_params->auto_ps_enable_timer, AUTO_PS_ENTRY_TIMER_DEFAULT_VALUE); - if (!CDF_IS_STATUS_SUCCESS(status) - && (CDF_STATUS_E_ALREADY != status)) { + if (!QDF_IS_STATUS_SUCCESS(status) + && (QDF_STATUS_E_ALREADY != status)) { sms_log(mac_ctx, LOGP, FL("Cannot start traffic timer")); } } } -CDF_STATUS sme_ps_close(tHalHandle hal_ctx) +QDF_STATUS sme_ps_close(tHalHandle hal_ctx) { uint32_t i; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); @@ -1216,16 +1216,16 @@ CDF_STATUS sme_ps_close(tHalHandle hal_ctx) for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) sme_ps_close_per_session(hal_ctx, i); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_ps_close_per_session(tHalHandle hal_ctx, uint32_t session_id) +QDF_STATUS sme_ps_close_per_session(tHalHandle hal_ctx, uint32_t session_id) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; /* * Stop the auto ps entry timer if running @@ -1235,14 +1235,14 @@ CDF_STATUS sme_ps_close_per_session(tHalHandle hal_ctx, uint32_t session_id) &ps_param->auto_ps_enable_timer)) { cdf_mc_timer_stop(&ps_param->auto_ps_enable_timer); } - cdf_status = + qdf_status = cdf_mc_timer_destroy(&ps_param->auto_ps_enable_timer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) sms_log(mac_ctx, LOGE, FL("Cannot deallocate suto PS timer")); - return cdf_status; + return qdf_status; } -CDF_STATUS sme_is_auto_ps_timer_running(tHalHandle hal_ctx, +QDF_STATUS sme_is_auto_ps_timer_running(tHalHandle hal_ctx, uint32_t session_id) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index b3a1175699..15913d61f4 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -171,7 +171,7 @@ static void init_config_param(tpAniSirGlobal pMac); static bool csr_roam_process_results(tpAniSirGlobal pMac, tSmeCmd *pCommand, eCsrRoamCompleteResult Result, void *Context); -static CDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, +static QDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, bool *pfSameIbss); static void csr_roam_update_connected_profile_from_new_bss(tpAniSirGlobal pMac, @@ -189,30 +189,30 @@ static ePhyChanBondState csr_get_cb_mode_from_ies(tpAniSirGlobal pMac, static void csr_roaming_state_config_cnf_processor(tpAniSirGlobal pMac, uint32_t result); -CDF_STATUS csr_roam_open(tpAniSirGlobal pMac); -CDF_STATUS csr_roam_close(tpAniSirGlobal pMac); +QDF_STATUS csr_roam_open(tpAniSirGlobal pMac); +QDF_STATUS csr_roam_close(tpAniSirGlobal pMac); void csr_roamMICErrorTimerHandler(void *pv); void csr_roamTKIPCounterMeasureTimerHandler(void *pv); bool csr_roam_is_same_profile_keys(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pConnProfile, tCsrRoamProfile *pProfile2); -static CDF_STATUS csr_roam_start_roaming_timer(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_start_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t interval); -static CDF_STATUS csr_roam_stop_roaming_timer(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_stop_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId); static void csr_roam_roaming_timer_handler(void *pv); -CDF_STATUS csr_roam_start_wait_for_key_timer(tpAniSirGlobal pMac, uint32_t interval); -CDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac); +QDF_STATUS csr_roam_start_wait_for_key_timer(tpAniSirGlobal pMac, uint32_t interval); +QDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac); static void csr_roam_wait_for_key_time_out_handler(void *pv); -static CDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo); -static CDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, +static QDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo); +static QDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo); -static CDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal pMac, tCsrRoamConnectedInfo * pConnectedInfo); -CDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, struct cdf_mac_addr peer_macaddr, uint8_t numKeys, tAniEdType edType, bool fUnicast, @@ -220,7 +220,7 @@ CDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, uint32_t session uint8_t keyId, uint8_t keyLength, uint8_t *pKey, uint8_t paeRole, uint8_t *pKeyRsc); -static CDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, @@ -230,7 +230,7 @@ void csr_roamStatsGlobalClassDTimerHandler(void *pv); static void csr_roam_link_up(tpAniSirGlobal pMac, struct cdf_mac_addr bssid); static void csr_roam_link_down(tpAniSirGlobal pMac, uint32_t sessionId); void csr_roam_vcc_trigger(tpAniSirGlobal pMac); -CDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal pMac, uint32_t statsMask, +QDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal pMac, uint32_t statsMask, uint8_t staId, uint8_t sessionId); /* pStaEntry is no longer invalid upon the return of this function. @@ -240,7 +240,7 @@ static eCsrCfgDot11Mode csr_roam_get_phy_mode_band_for_bss(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, uint8_t operationChn, eCsrBand *pBand); -static CDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc); tCsrStatsClientReqInfo *csr_roam_insert_entry_into_list(tpAniSirGlobal pMac, tDblLinkList *pStaList, @@ -261,21 +261,21 @@ tListElem *csr_roam_check_client_req_list(tpAniSirGlobal pMac, uint32_t statsMas void csr_roam_remove_entry_from_pe_stats_req_list(tpAniSirGlobal pMac, tCsrPeStatsReqInfo *pPeStaEntry); tListElem *csr_roam_find_in_pe_stats_req_list(tpAniSirGlobal pMac, uint32_t statsMask); -CDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac); +QDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac); static uint32_t csr_find_ibss_session(tpAniSirGlobal pMac); static uint32_t csr_find_session_by_type(tpAniSirGlobal, enum tCDF_ADAPTER_MODE); static bool csr_is_conn_allow_2g_band(tpAniSirGlobal pMac, uint32_t chnl); static bool csr_is_conn_allow_5g_band(tpAniSirGlobal pMac, uint32_t chnl); -static CDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, +static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc); static void csr_init_session(tpAniSirGlobal pMac, uint32_t sessionId); -static CDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamSetKey *pSetKey, uint32_t roamId); -static CDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc); void csr_roam_reissue_roam_command(tpAniSirGlobal pMac); static void csr_ser_des_unpack_diassoc_rsp(uint8_t *pBuf, @@ -301,9 +301,9 @@ static void csr_roam_de_init_globals(tpAniSirGlobal pMac) return; } -CDF_STATUS csr_open(tpAniSirGlobal pMac) +QDF_STATUS csr_open(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t i; do { @@ -314,21 +314,21 @@ CDF_STATUS csr_open(tpAniSirGlobal pMac) init_config_param(pMac); status = csr_scan_open(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) break; status = csr_roam_open(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) break; pMac->roam.nextRoamId = 1; /* Must not be 0 */ - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_ll_open(pMac->hHdd, &pMac->roam.statsClientReqList))) break; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_ll_open(pMac->hHdd, &pMac->roam.peStatsReqList))) break; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_ll_open(pMac->hHdd, &pMac->roam.roamCmdPendingList))) break; @@ -337,9 +337,9 @@ CDF_STATUS csr_open(tpAniSirGlobal pMac) return status; } -CDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2) +QDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2) { - CDF_STATUS status; + QDF_STATUS status; v_REGDOMAIN_t reg_id; enum country_src source = SOURCE_DRIVER; @@ -353,15 +353,15 @@ CDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2) status = csr_get_regulatory_domain_for_country(mac, mac->scan.countryCodeDefault, ®_id, source); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(mac, LOGE, FL("csr_get_regulatory_domain_for_country failed")); return status; } - if (cds_set_reg_domain(mac, reg_id) != CDF_STATUS_SUCCESS) { + if (cds_set_reg_domain(mac, reg_id) != QDF_STATUS_SUCCESS) { sms_log(mac, LOGE, FL("cds_set_reg_domain failed")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mac->scan.domainIdDefault = reg_id; mac->scan.domainIdCurrent = mac->scan.domainIdDefault; @@ -374,29 +374,29 @@ CDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2) return status; } -CDF_STATUS csr_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) +QDF_STATUS csr_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); v_REGDOMAIN_t regId; uint8_t cntryCodeLength; if (NULL == apCntryCode) { sms_log(pMac, LOGE, FL(" Invalid country Code Pointer")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, FL(" country Code %.2s"), apCntryCode); cntryCodeLength = WNI_CFG_COUNTRY_CODE_LEN; status = csr_get_regulatory_domain_for_country(pMac, apCntryCode, ®Id, SOURCE_USERSPACE); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL(" fail to get regId for country Code %.2s"), apCntryCode); return status; } status = wma_set_reg_domain(hHal, regId); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL(" fail to get regId for country Code %.2s"), apCntryCode); @@ -421,9 +421,9 @@ CDF_STATUS csr_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) return status; } -CDF_STATUS csr_set_channels(tHalHandle hHal, tCsrConfigParam *pParam) +QDF_STATUS csr_set_channels(tHalHandle hHal, tCsrConfigParam *pParam) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint8_t index = 0; cdf_mem_copy(pParam->Csr11dinfo.countryCode, @@ -444,9 +444,9 @@ CDF_STATUS csr_set_channels(tHalHandle hHal, tCsrConfigParam *pParam) return status; } -CDF_STATUS csr_close(tpAniSirGlobal pMac) +QDF_STATUS csr_close(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; csr_roam_close(pMac); csr_scan_close(pMac); @@ -673,7 +673,7 @@ scan_list_sort_error: cdf_mem_free(chan_list_non_greedy); } -CDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) +QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) { tSirUpdateChanList *pChanList; tCsrScanStruct *pScan = &pMac->scan; @@ -700,7 +700,7 @@ CDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) if (!pChanList) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "Failed to allocate memory for tSirUpdateChanList"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pChanList, bufLen); @@ -765,19 +765,19 @@ CDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) msg.bodyptr = pChanList; pChanList->numChan = num_channel; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Failed to post msg to WMA", __func__); cdf_mem_free(pChanList); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_start(tpAniSirGlobal pMac) +QDF_STATUS csr_start(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t i; do { @@ -787,7 +787,7 @@ CDF_STATUS csr_start(tpAniSirGlobal pMac) csr_roam_state_change(pMac, eCSR_ROAMING_STATE_IDLE, i); status = csr_roam_start(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) break; pMac->roam.sPendingCommands = 0; @@ -799,7 +799,7 @@ CDF_STATUS csr_start(tpAniSirGlobal pMac) pMac->roam.tlStatsReqInfo.timerRunning = false; /* init the link quality indication also */ pMac->roam.vccLinkQuality = eCSR_ROAM_LINK_QUAL_MIN_IND; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGW, " csr_start: Couldn't Init HO control blk "); break; @@ -812,7 +812,7 @@ CDF_STATUS csr_start(tpAniSirGlobal pMac) return status; } -CDF_STATUS csr_stop(tpAniSirGlobal pMac, tHalStopType stopType) +QDF_STATUS csr_stop(tpAniSirGlobal pMac, tHalStopType stopType) { uint32_t sessionId; @@ -847,12 +847,12 @@ CDF_STATUS csr_stop(tpAniSirGlobal pMac, tHalStopType stopType) b_roam_scan_offload_started = false; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_ready(tpAniSirGlobal pMac) +QDF_STATUS csr_ready(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* If the gScanAgingTime is set to '0' then scan results aging timeout based on timer feature is not enabled */ @@ -860,7 +860,7 @@ CDF_STATUS csr_ready(tpAniSirGlobal pMac) csr_scan_start_result_cfg_aging_timer(pMac); } status = csr_apply_channel_and_power_list(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_apply_channel_and_power_list failed during csr_ready with status=%d", status); @@ -902,9 +902,9 @@ void csr_set_global_cfgs(tpAniSirGlobal pMac) csr_set_default_dot11_mode(pMac); } -CDF_STATUS csr_roam_open(tpAniSirGlobal pMac) +QDF_STATUS csr_roam_open(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t i; tCsrRoamSession *pSession; do { @@ -922,7 +922,7 @@ CDF_STATUS csr_roam_open(tpAniSirGlobal pMac) CDF_TIMER_TYPE_SW, csr_roam_wait_for_key_time_out_handler, &pMac->roam.WaitForKeyTimerInfo); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("cannot allocate memory for WaitForKey time out timer")); @@ -932,17 +932,17 @@ CDF_STATUS csr_roam_open(tpAniSirGlobal pMac) cdf_mc_timer_init(&pMac->roam.tlStatsReqInfo.hTlStatsTimer, CDF_TIMER_TYPE_SW, csr_roam_tl_stats_timer_handler, pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("cannot allocate memory for summary Statistics timer")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } while (0); return status; } -CDF_STATUS csr_roam_close(tpAniSirGlobal pMac) +QDF_STATUS csr_roam_close(tpAniSirGlobal pMac) { uint32_t sessionId; for (sessionId = 0; sessionId < CSR_ROAM_SESSION_MAX; sessionId++) { @@ -952,13 +952,13 @@ CDF_STATUS csr_roam_close(tpAniSirGlobal pMac) cdf_mc_timer_destroy(&pMac->roam.hTimerWaitForKey); cdf_mc_timer_stop(&pMac->roam.tlStatsReqInfo.hTlStatsTimer); cdf_mc_timer_destroy(&pMac->roam.tlStatsReqInfo.hTlStatsTimer); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_roam_start(tpAniSirGlobal pMac) +QDF_STATUS csr_roam_start(tpAniSirGlobal pMac) { (void)pMac; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void csr_roam_stop(tpAniSirGlobal pMac, uint32_t sessionId) @@ -968,32 +968,32 @@ void csr_roam_stop(tpAniSirGlobal pMac, uint32_t sessionId) csr_roam_dereg_statistics_req(pMac); } -CDF_STATUS csr_roam_get_connect_state(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_connect_state(tpAniSirGlobal pMac, uint32_t sessionId, eCsrConnectState *pState) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; if (CSR_IS_SESSION_VALID(pMac, sessionId) && (NULL != pState)) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; *pState = pMac->roam.roamSession[sessionId].connectState; } return status; } -CDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamConnectedProfile *pProfile) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t size = 0; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tCsrRoamConnectedProfile *connected_prof; if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!pProfile) { sms_log(pMac, LOGE, FL("profile not found")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pSession->pConnectBssDesc) { @@ -1005,9 +1005,9 @@ CDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, cdf_mem_copy(pProfile->pBssDesc, pSession->pConnectBssDesc, size); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } else { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { pProfile->pBssDesc = NULL; @@ -1057,10 +1057,10 @@ CDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_roam_get_connect_profile(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_connect_profile(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamConnectedProfile *pProfile) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if ((csr_is_conn_state_connected(pMac, sessionId)) || (csr_is_conn_state_ibss(pMac, sessionId))) { @@ -1083,11 +1083,11 @@ void csr_roam_free_connect_profile(tCsrRoamConnectedProfile *profile) profile->AuthType = eCSR_AUTH_TYPE_UNKNOWN; } -static CDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal pMac, tCsrRoamConnectedInfo * pConnectedInfo) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (pConnectedInfo->pbFrames) { cdf_mem_free(pConnectedInfo->pbFrames); pConnectedInfo->pbFrames = NULL; @@ -1383,10 +1383,10 @@ eCsrBand csr_get_current_band(tHalHandle hHal) /* This function flushes the roam scan cache */ -CDF_STATUS csr_flush_roam_scan_roam_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_flush_roam_scan_roam_channel_list(tpAniSirGlobal pMac, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; /* Free up the memory first (if required) */ @@ -1407,10 +1407,10 @@ CDF_STATUS csr_flush_roam_scan_roam_channel_list(tpAniSirGlobal pMac, /* This function flushes the roam scan cache */ -CDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(tpAniSirGlobal pMac, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -1428,12 +1428,12 @@ CDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(tpAniSirGlobal pMac, This function flushes the roam scan cache and creates fresh cache based on the input channel list */ -CDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, uint8_t sessionId, const uint8_t *pChannelList, const uint8_t numChannels) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -1447,7 +1447,7 @@ CDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL("Memory Allocation for CFG Channel List failed")); pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels = 0; - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /* Update the roam global structure */ @@ -1468,13 +1468,13 @@ CDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, * valid channels if the band is 5G, then make sure channel list contains * only 5G valid channels */ -CDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t *pChannelList, uint8_t numChannels, const eCsrBand eBand) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; uint8_t outNumChannels = 0; @@ -1531,7 +1531,7 @@ CDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "Invalid band, No operation carried out (Band %d)", eBand); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* * if roaming within band is enabled, then select only the @@ -1563,7 +1563,7 @@ CDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "Failed to allocate memory for roam scan channel list"); currChannelListInfo->numOfChannels = 0; - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(currChannelListInfo->ChannelList, ChannelList, outNumChannels); @@ -1572,17 +1572,17 @@ CDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, } #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ -CDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) +QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (CSR_IS_PHY_MODE_A_ONLY(pMac) && (eBand == eCSR_BAND_24)) { /* DOT11 mode configured to 11a only and received request to change the band to 2.4 GHz */ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "failed to set band cfg80211 = %u, band = %u", pMac->roam.configParam.uCfgDot11Mode, eBand); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if ((CSR_IS_PHY_MODE_B_ONLY(pMac) || CSR_IS_PHY_MODE_G_ONLY(pMac)) && (eBand == eCSR_BAND_5G)) { @@ -1591,7 +1591,7 @@ CDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "failed to set band dot11mode = %u, band = %u", pMac->roam.configParam.uCfgDot11Mode, eBand); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Band changed to %u (0 - ALL, 1 - 2.4 GHZ, 2 - 5GHZ)", eBand); @@ -1599,7 +1599,7 @@ CDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) pMac->roam.configParam.bandCapability = eBand; status = csr_get_channel_and_power_list(pMac); - if (CDF_STATUS_SUCCESS == status) + if (QDF_STATUS_SUCCESS == status) csr_apply_channel_and_power_list(pMac); return status; } @@ -1721,10 +1721,10 @@ uint32_t csr_convert_phy_cb_state_to_ini_value(ePhyChanBondState phyCbState) return cbIniValue; } -CDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, +QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (pParam) { pMac->roam.configParam.WMMSupportMode = pParam->WMMSupportMode; @@ -2110,13 +2110,13 @@ CDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) +QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) { int i; tCsrConfig *cfg_params = &pMac->roam.configParam; if (!pParam) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; pParam->WMMSupportMode = cfg_params->WMMSupportMode; pParam->Is11eSupportEnabled = cfg_params->Is11eSupportEnabled; @@ -2272,13 +2272,13 @@ CDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pMac->roam.configParam.early_stop_scan_min_threshold; pParam->early_stop_scan_max_threshold = pMac->roam.configParam.early_stop_scan_max_threshold; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand, +QDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand, bool *pfRestartNeeded) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); bool fRestartNeeded = false; eCsrPhyMode newPhyMode = eCSR_DOT11_MODE_AUTO; @@ -2349,7 +2349,7 @@ CDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand, } } /* Done validating */ - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; /* Now we need to check whether a restart is needed. */ if (eBand != pMac->roam.configParam.eBand) { fRestartNeeded = true; @@ -2360,7 +2360,7 @@ CDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand, goto end; } end: - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pMac->roam.configParam.eBand = eBand; pMac->roam.configParam.phyMode = newPhyMode; if (pfRestartNeeded) @@ -2437,21 +2437,21 @@ void csr_prune_channel_list_for_mode(tpAniSirGlobal mac_ctx, } #define INFRA_AP_DEFAULT_CHANNEL 6 -CDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum) +QDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum) { uint8_t index = 0; - CDF_STATUS status = CDF_STATUS_E_NOSUPPORT; + QDF_STATUS status = QDF_STATUS_E_NOSUPPORT; /* regulatory check */ for (index = 0; index < pMac->scan.base_channels.numChannels; index++) { if (pMac->scan.base_channels.channelList[index] == chnNum) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } } - if (status == CDF_STATUS_SUCCESS) { + if (status == QDF_STATUS_SUCCESS) { /* dfs nol */ for (index = 0; index < @@ -2466,13 +2466,13 @@ CDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum) CDF_TRACE_LEVEL_ERROR, FL("channel %d is in dfs nol"), chnNum); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } } } - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("channel %d is not available"), chnNum); } @@ -2480,25 +2480,25 @@ CDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum) return status; } -CDF_STATUS csr_get_channel_and_power_list(tpAniSirGlobal pMac) +QDF_STATUS csr_get_channel_and_power_list(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t num20MHzChannelsFound = 0; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t Index = 0; uint8_t num40MHzChannelsFound = 0; /* TODO: this interface changed to include the 40MHz channel list */ /* this needs to be tied into the adapter structure somehow and referenced appropriately for CB operation */ /* Read the scan channel list (including the power limit) from EEPROM */ - cdf_status = + qdf_status = cds_get_channel_list_with_power(pMac->scan.defaultPowerTable, &num20MHzChannelsFound, pMac->scan.defaultPowerTable40MHz, &num40MHzChannelsFound); - if ((CDF_STATUS_SUCCESS != cdf_status) || (num20MHzChannelsFound == 0)) { + if ((QDF_STATUS_SUCCESS != qdf_status) || (num20MHzChannelsFound == 0)) { sms_log(pMac, LOGE, FL("failed to get channels ")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { if (num20MHzChannelsFound > WNI_CFG_VALID_CHANNEL_LIST_LEN) { num20MHzChannelsFound = WNI_CFG_VALID_CHANNEL_LIST_LEN; @@ -2526,9 +2526,9 @@ CDF_STATUS csr_get_channel_and_power_list(tpAniSirGlobal pMac) return status; } -CDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal pMac) +QDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; csr_prune_channel_list_for_mode(pMac, &pMac->scan.base_channels); csr_save_channel_power_for_band(pMac, false); @@ -2542,19 +2542,19 @@ CDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal pMac) return status; } -CDF_STATUS csr_change_config_params(tpAniSirGlobal pMac, +QDF_STATUS csr_change_config_params(tpAniSirGlobal pMac, tCsrUpdateConfigParam *pUpdateConfigParam) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tCsr11dinfo *ps11dinfo = NULL; ps11dinfo = &pUpdateConfigParam->Csr11dinfo; status = csr_init11d_info(pMac, ps11dinfo); return status; } -static CDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) +static QDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint8_t index; uint32_t count = 0; tSirMacChanInfo *pChanInfo; @@ -2575,7 +2575,7 @@ static CDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) ps11dinfo->Channels.numChannels); } else { /* No change */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* legacy maintenance */ @@ -2619,7 +2619,7 @@ static CDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) cdf_mem_free(pChanInfoStart); } /* Only apply them to CFG when not in STOP state. Otherwise they will be applied later */ - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { for (index = 0; index < CSR_ROAM_SESSION_MAX; index++) { if ((CSR_IS_SESSION_VALID(pMac, index)) && CSR_IS_ROAM_STOP(pMac, index)) { @@ -2640,7 +2640,7 @@ static CDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) } /* Initialize the Channel + Power List in the local cache and in the CFG */ -CDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) +QDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) { uint8_t index; uint32_t count = 0; @@ -2648,7 +2648,7 @@ CDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, tCsr11dinfo *ps11din tSirMacChanInfo *pChanInfoStart; if (!ps11dinfo || !pMac) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pChanInfo = @@ -2681,7 +2681,7 @@ CDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, tCsr11dinfo *ps11din cdf_mem_free(pChanInfoStart); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* pCommand may be NULL */ @@ -2695,7 +2695,7 @@ void csr_roam_remove_duplicate_command(tpAniSirGlobal pMac, uint32_t sessionId, tDblLinkList localList; cdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!CDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return; } @@ -2808,11 +2808,11 @@ static void csr_roam_populate_channels(tDot11fBeaconIEs *beacon_ies, } } -CDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus u1, eCsrRoamResult u2) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR uint32_t rssi = 0; WLAN_HOST_DIAG_EVENT_DEF(connectionStatus, @@ -2825,13 +2825,13 @@ CDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { sms_log(pMac, LOGE, "Session ID:%d is not valid", sessionId); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession = CSR_GET_SESSION(pMac, sessionId); if (false == pSession->sessionActive) { sms_log(pMac, LOG1, "%s Session is not Active", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG4, "Received RoamCmdStatus %d with Roam Result %d", u1, @@ -3019,18 +3019,18 @@ bool csr_roam_is_handoff_in_progress(tpAniSirGlobal pMac, uint8_t sessionId) return csr_neighbor_roam_is_handoff_in_progress(pMac, sessionId); } -CDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamSubState NewSubstate, bool fMICFailure) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; uint16_t reasonCode; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (fMICFailure) { @@ -3069,7 +3069,7 @@ CDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, status = csr_send_mb_disassoc_req_msg(pMac, sessionId, bssId.bytes, reasonCode); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_roam_link_down(pMac, sessionId); #ifndef WLAN_MDM_CODE_REDUCTION_OPT /* no need to tell QoS that we are disassociating, it will be taken care off in assoc req for HO */ @@ -3094,21 +3094,21 @@ CDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, \param sessionId - session Id for Soft AP \param pPeerMacAddr - MAC of associated station to delete \param reason - reason code, be one of the tSirMacReasonCodes - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, uint32_t sessionId, const uint8_t *pPeerMacAddr, uint32_t reason) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; do { pCommand = csr_get_command_buffer(pMac); if (!pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; break; } pCommand->command = eSmeCommandRoam; @@ -3117,7 +3117,7 @@ CDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, cdf_mem_copy(pCommand->u.roamCmd.peerMac, pPeerMacAddr, 6); pCommand->u.roamCmd.reason = (tSirMacReasonCodes) reason; status = csr_queue_sme_command(pMac, pCommand, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); csr_release_command_roam(pMac, pCommand); @@ -3134,20 +3134,20 @@ CDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, * * CSR function that HDD calls to delete a associated station * - * Return: CDF_STATUS_SUCCESS on success or another CDF_STATUS_* on error + * Return: QDF_STATUS_SUCCESS on success or another CDF_STATUS_* on error */ -CDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, uint32_t sessionId, struct tagCsrDelStaParams *pDelStaParams) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; do { pCommand = csr_get_command_buffer(pMac); if (!pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; break; } pCommand->command = eSmeCommandRoam; @@ -3159,7 +3159,7 @@ CDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, pCommand->u.roamCmd.reason = (tSirMacReasonCodes)pDelStaParams->reason_code; status = csr_queue_sme_command(pMac, pCommand, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); csr_release_command_roam(pMac, pCommand); @@ -3169,20 +3169,20 @@ CDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, return status; } -static CDF_STATUS +static QDF_STATUS csr_send_mb_tkip_counter_measures_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, bool bEnable, struct cdf_mac_addr *bssId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeTkipCntrMeasReq *pMsg; do { pMsg = cdf_mem_malloc(sizeof(tSirSmeTkipCntrMeasReq)); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; cdf_mem_set(pMsg, sizeof(tSirSmeTkipCntrMeasReq), 0); pMsg->messageType = eWNI_SME_TKIP_CNTR_MEAS_REQ; @@ -3196,11 +3196,11 @@ csr_send_mb_tkip_counter_measures_req_msg(tpAniSirGlobal pMac, return status; } -CDF_STATUS +QDF_STATUS csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId, bool bEnable) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { @@ -3225,12 +3225,12 @@ csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS +QDF_STATUS csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, CDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { @@ -3258,12 +3258,12 @@ csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS +QDF_STATUS csr_roam_get_wps_session_overlap(tpAniSirGlobal pMac, uint32_t sessionId, void *pUsrContext, void *pfnSapEventCallback, struct cdf_mac_addr pRemoveMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -3290,16 +3290,16 @@ csr_roam_get_wps_session_overlap(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamSubState NewSubstate) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pSession->pConnectBssDesc) { @@ -3313,7 +3313,7 @@ CDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal pMac, uint32_t sessionId, status = csr_send_mb_deauth_req_msg(pMac, sessionId, bssId.bytes, eSIR_MAC_DEAUTH_LEAVING_BSS_REASON); - if (CDF_IS_STATUS_SUCCESS(status)) + if (QDF_IS_STATUS_SUCCESS(status)) csr_roam_link_down(pMac, sessionId); else { sms_log(pMac, LOGE, @@ -3326,16 +3326,16 @@ CDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_save_connected_bss_desc(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_save_connected_bss_desc(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDesc) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); uint32_t size; if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* If no BSS description was found in this connection (happens with start IBSS), then */ /* nix the BSS description that we keep around for the connected BSS) and get out... */ @@ -3355,14 +3355,14 @@ CDF_STATUS csr_roam_save_connected_bss_desc(tpAniSirGlobal pMac, uint32_t sessio pSession->pConnectBssDesc = cdf_mem_malloc(size); } if (NULL == pSession->pConnectBssDesc) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else cdf_mem_copy(pSession->pConnectBssDesc, pBssDesc, size); } return status; } -CDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc, tBssConfigParam *pBssConfig, @@ -3371,7 +3371,7 @@ CDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, eCsrCfgDot11Mode cfgDot11Mode; CDF_ASSERT(pIes != NULL); if (pIes == NULL) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; cdf_mem_copy(&pBssConfig->BssCap, &pBssDesc->capabilityInfo, sizeof(tSirMacCapabilityInfo)); @@ -3390,7 +3390,7 @@ CDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, if (pProfile->SSIDs.numOfSSIDs == 0) { sms_log(pMac, LOGW, FL("BSS desc and profile doesn't have SSID")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } if (CDS_IS_CHANNEL_5GHZ(pBssDesc->channelId)) @@ -3484,17 +3484,17 @@ CDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, pBssConfig->cbMode = csr_get_cb_mode_from_ies(pMac, pBssDesc->channelId, pIes); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS csr_roam_prepare_bss_config_from_profile(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_prepare_bss_config_from_profile(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tBssConfigParam * pBssConfig, tSirBssDescription * pBssDesc) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t operationChannel = 0; uint8_t qAPisEnabled = false; /* SSID */ @@ -3506,7 +3506,7 @@ static CDF_STATUS csr_roam_prepare_bss_config_from_profile(tpAniSirGlobal pMac, sizeof(tSirMacSSid)); } else { /* SSID must present */ - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Settomg up the capabilities */ if (csr_is_bss_type_ibss(pProfile->BSSType)) { @@ -3536,7 +3536,7 @@ static CDF_STATUS csr_roam_prepare_bss_config_from_profile(tpAniSirGlobal pMac, qAPisEnabled = true; } else if (csr_roam_get_qos_info_from_bss(pMac, pBssDesc) == - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { qAPisEnabled = true; } else { qAPisEnabled = false; @@ -3594,14 +3594,14 @@ static CDF_STATUS csr_roam_prepare_bss_config_from_profile(tpAniSirGlobal pMac, return status; } -static CDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tDot11fBeaconIEs *pIes = NULL; do { - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies( pMac, pBssDesc, &pIes))) { /* err msg */ @@ -3611,7 +3611,7 @@ static CDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, } /* check if the AP is QAP & it supports APSD */ if (CSR_IS_QOS_BSS(pIes)) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } while (0); @@ -3800,10 +3800,10 @@ static void csr_set_cfg_ssid(tpAniSirGlobal pMac, tSirMacSSid *pSSID) cfg_set_str(pMac, WNI_CFG_SSID, (uint8_t *) pSSID->ssId, len); } -CDF_STATUS csr_set_qos_to_cfg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_set_qos_to_cfg(tpAniSirGlobal pMac, uint32_t sessionId, eCsrMediaAccessType qosType) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t QoSEnabled; uint32_t WmeEnabled; /* set the CFG enable/disable variables based on the qosType being configured... */ @@ -3840,14 +3840,14 @@ CDF_STATUS csr_set_qos_to_cfg(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -static CDF_STATUS csr_get_rate_set(tpAniSirGlobal pMac, +static QDF_STATUS csr_get_rate_set(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, eCsrPhyMode phyMode, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes, tSirMacRateSet *pOpRateSet, tSirMacRateSet *pExRateSet) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; int i; eCsrCfgDot11Mode cfgDot11Mode; uint8_t *pDstRate; @@ -3909,7 +3909,7 @@ static CDF_STATUS csr_get_rate_set(tpAniSirGlobal pMac, } } if (pOpRateSet->numRates > 0 || pExRateSet->numRates > 0) - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; return status; } @@ -4199,7 +4199,7 @@ ePhyChanBondState csr_get_htcb_state_from_vhtcb_state(ePhyChanBondState aniCBMod #endif /* pIes may be NULL */ -CDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc, tBssConfigParam *pBssConfig, @@ -4277,37 +4277,37 @@ CDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal pMac, uint32_t sessionId, pBssConfig->uJoinTimeOut); /* Any roaming related changes should be above this line */ if (pSession && pSession->roam_synch_in_progress) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; /* Make this the last CFG to set. The callback will trigger a join_req */ /* Join time out */ csr_roam_substate_change(pMac, eCSR_ROAM_SUBSTATE_CONFIG, sessionId); csr_roam_ccm_cfg_set_callback(pMac, status); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_roam_stop_network(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_stop_network(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes) { - CDF_STATUS status; + QDF_STATUS status; tBssConfigParam *pBssConfig; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pBssConfig = cdf_mem_malloc(sizeof(tBssConfigParam)); if (NULL == pBssConfig) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pBssConfig, sizeof(tBssConfigParam), 0); status = csr_roam_prepare_bss_config(pMac, pProfile, pBssDesc, pBssConfig, pIes); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { eCsrRoamSubState substate; substate = eCSR_ROAM_SUBSTATE_DISCONNECT_CONTINUE_ROAMING; pSession->bssParams.uCfgDot11Mode = pBssConfig->uCfgDot11Mode; @@ -4386,7 +4386,7 @@ static eCsrJoinState csr_roam_state_for_same_profile(tpAniSirGlobal mac_ctx, uint32_t session_id, tDot11fBeaconIEs *ies_local, tSirBssDescription *bss_descr) { - CDF_STATUS status; + QDF_STATUS status; tBssConfigParam bssConfig; if (csr_roam_is_same_profile_keys(mac_ctx, &session->connectedProfile, profile)) @@ -4395,7 +4395,7 @@ static eCsrJoinState csr_roam_state_for_same_profile(tpAniSirGlobal mac_ctx, cdf_mem_set(&bssConfig, sizeof(bssConfig), 0); status = csr_roam_prepare_bss_config(mac_ctx, profile, bss_descr, &bssConfig, ies_local); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { session->bssParams.uCfgDot11Mode = bssConfig.uCfgDot11Mode; session->bssParams.cbMode = @@ -4404,7 +4404,7 @@ static eCsrJoinState csr_roam_state_for_same_profile(tpAniSirGlobal mac_ctx, status = csr_roam_set_bss_config_cfg(mac_ctx, session_id, profile, bss_descr, &bssConfig, ies_local, false); - if (CDF_IS_STATUS_SUCCESS(status)) + if (QDF_IS_STATUS_SUCCESS(status)) return eCsrContinueRoaming; } @@ -4427,7 +4427,7 @@ eCsrJoinState csr_roam_join(tpAniSirGlobal pMac, uint32_t sessionId, } if (!pIesLocal && - !CDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies(pMac, + !QDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies(pMac, pBssDesc, &pIesLocal))) { sms_log(pMac, LOGE, FL("fail to parse IEs")); return eCsrStopRoaming; @@ -4462,7 +4462,7 @@ eCsrJoinState csr_roam_join(tpAniSirGlobal pMac, uint32_t sessionId, csr_roam_state_for_same_profile(pMac, pProfile, pSession, sessionId, pIesLocal, pBssDesc); - } else if (!CDF_IS_STATUS_SUCCESS( + } else if (!QDF_IS_STATUS_SUCCESS( csr_roam_issue_disassociate(pMac, sessionId, eCSR_ROAM_SUBSTATE_DISASSOC_REQ, @@ -4472,7 +4472,7 @@ eCsrJoinState csr_roam_join(tpAniSirGlobal pMac, uint32_t sessionId, sessionId); eRoamState = eCsrStopRoaming; } - } else if (!CDF_IS_STATUS_SUCCESS(csr_roam_stop_network(pMac, + } else if (!QDF_IS_STATUS_SUCCESS(csr_roam_stop_network(pMac, sessionId, pProfile, pBssDesc, pIesLocal))) { /* we used to pre-auth here with open auth * networks but that wasn't working so well. @@ -4480,7 +4480,7 @@ eCsrJoinState csr_roam_join(tpAniSirGlobal pMac, uint32_t sessionId, * to join the new network... */ eRoamState = eCsrStopRoaming; } - } else if (!CDF_IS_STATUS_SUCCESS(csr_roam_stop_network(pMac, sessionId, + } else if (!QDF_IS_STATUS_SUCCESS(csr_roam_stop_network(pMac, sessionId, pProfile, pBssDesc, pIesLocal))) { eRoamState = eCsrStopRoaming; @@ -4491,10 +4491,10 @@ eCsrJoinState csr_roam_join(tpAniSirGlobal pMac, uint32_t sessionId, return eRoamState; } -CDF_STATUS csr_roam_should_roam(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_should_roam(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDesc, uint32_t roamId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo roamInfo; cdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); roamInfo.pBssDesc = pBssDesc; @@ -4613,7 +4613,7 @@ static bool csr_roam_select_bss(tpAniSirGlobal mac_ctx, /* Ok to roam this */ if (!conc_channel && - CDF_IS_STATUS_SUCCESS(csr_roam_should_roam(mac_ctx, + QDF_IS_STATUS_SUCCESS(csr_roam_should_roam(mac_ctx, session_id, &result->BssDescriptor, roam_id))) { status = false; break; @@ -4649,7 +4649,7 @@ static void csr_roam_join_handle_profile(tpAniSirGlobal mac_ctx, #ifndef WLAN_MDM_CODE_REDUCTION_OPT uint8_t acm_mask = 0; #endif - CDF_STATUS status; + QDF_STATUS status; tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); tCsrRoamProfile *profile = &cmd->u.roamCmd.roamProfile; tDot11fBeaconIEs *ies_local = NULL; @@ -4688,7 +4688,7 @@ static void csr_roam_join_handle_profile(tpAniSirGlobal mac_ctx, ies_local = scan_result->Result.pvIes; if (scan_result && !ies_local && - (!CDF_IS_STATUS_SUCCESS( + (!QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies( mac_ctx, &result->BssDescriptor, @@ -4770,7 +4770,7 @@ static void csr_roam_join_handle_profile(tpAniSirGlobal mac_ctx, csr_roam_assign_default_param(mac_ctx, cmd); status = csr_roam_start_ibss(mac_ctx, session_id, profile, &same_ibss); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (same_ibss) *roam_state = eCsrStartIbssSameIbss; else @@ -4785,7 +4785,7 @@ static void csr_roam_join_handle_profile(tpAniSirGlobal mac_ctx, csr_roam_assign_default_param(mac_ctx, cmd); /* For AP WDS, we dont have any BSSDescription */ status = csr_roam_start_wds(mac_ctx, session_id, profile, NULL); - if (CDF_IS_STATUS_SUCCESS(status)) + if (QDF_IS_STATUS_SUCCESS(status)) *roam_state = eCsrContinueRoaming; else *roam_state = eCsrStopRoaming; @@ -4898,9 +4898,9 @@ end: return roam_state; } -static CDF_STATUS csr_roam(tpAniSirGlobal pMac, tSmeCmd *pCommand) +static QDF_STATUS csr_roam(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; eCsrJoinState RoamState; eCsrRoamSubState substate; uint32_t sessionId = pCommand->sessionId; @@ -4918,7 +4918,7 @@ static CDF_STATUS csr_roam(tpAniSirGlobal pMac, tSmeCmd *pCommand) substate = eCSR_ROAM_SUBSTATE_DISASSOC_NOTHING_TO_JOIN; status = csr_roam_issue_disassociate(pMac, sessionId, substate, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGW, FL("fail issuing disassoc status = %d"), status); @@ -4931,7 +4931,7 @@ static CDF_STATUS csr_roam(tpAniSirGlobal pMac, tSmeCmd *pCommand) } else if (csr_is_conn_state_ibss(pMac, sessionId)) { status = csr_roam_issue_stop_bss(pMac, sessionId, eCSR_ROAM_SUBSTATE_STOP_BSS_REQ); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGW, FL("fail issuing stop bss status = %d"), status); @@ -4946,7 +4946,7 @@ static CDF_STATUS csr_roam(tpAniSirGlobal pMac, tSmeCmd *pCommand) substate = eCSR_ROAM_SUBSTATE_STOP_BSS_REQ; status = csr_roam_issue_stop_bss(pMac, sessionId, substate); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGW, FL("fail issuing stop bss status = %d"), status); @@ -4979,27 +4979,27 @@ static CDF_STATUS csr_roam(tpAniSirGlobal pMac, tSmeCmd *pCommand) return status; } -CDF_STATUS csr_process_ft_reassoc_roam_command(tpAniSirGlobal pMac, +QDF_STATUS csr_process_ft_reassoc_roam_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { uint32_t sessionId; tCsrRoamSession *pSession; tCsrScanResult *pScanResult = NULL; tSirBssDescription *pBssDesc = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; sessionId = pCommand->sessionId; pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (CSR_IS_ROAMING(pSession) && pSession->fCancelRoaming) { /* the roaming is cancelled. Simply complete the command */ sms_log(pMac, LOG1, FL("Roam command canceled")); csr_roam_complete(pMac, eCsrNothingToJoin, NULL); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pCommand->u.roamCmd.pRoamBssEntry) { pScanResult = @@ -5010,7 +5010,7 @@ CDF_STATUS csr_process_ft_reassoc_roam_command(tpAniSirGlobal pMac, /* the roaming is cancelled. Simply complete the command */ sms_log(pMac, LOG1, FL("Roam command canceled")); csr_roam_complete(pMac, eCsrNothingToJoin, NULL); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = csr_roam_issue_reassociate(pMac, sessionId, pBssDesc, (tDot11fBeaconIEs *) (pScanResult-> @@ -5029,19 +5029,19 @@ CDF_STATUS csr_process_ft_reassoc_roam_command(tpAniSirGlobal pMac, * * This function will trigger reassociate. * - * Return: CDF_STATUS for success or failure. + * Return: QDF_STATUS for success or failure. */ -static CDF_STATUS csr_roam_trigger_reassociate(tpAniSirGlobal mac_ctx, +static QDF_STATUS csr_roam_trigger_reassociate(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, tCsrRoamInfo *roam_info, tCsrRoamSession *session_ptr, uint32_t session_id) { tDot11fBeaconIEs *pIes = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (session_ptr->pConnectBssDesc) { status = csr_get_parsed_bss_description_ies(mac_ctx, session_ptr->pConnectBssDesc, &pIes); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("fail to parse IEs")); } else { roam_info->reasonCode = @@ -5063,7 +5063,7 @@ static CDF_STATUS csr_roam_trigger_reassociate(tpAniSirGlobal mac_ctx, status = csr_roam_issue_reassociate(mac_ctx, session_id, session_ptr->pConnectBssDesc, pIes, &cmd->u.roamCmd.roamProfile); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("failed status %d"), status); csr_release_command_roam(mac_ctx, cmd); @@ -5075,21 +5075,21 @@ static CDF_STATUS csr_roam_trigger_reassociate(tpAniSirGlobal mac_ctx, } else { sms_log(mac_ctx, LOGE, FL ("reassoc to same AP failed as connected BSS is NULL")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; } -CDF_STATUS csr_roam_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) +QDF_STATUS csr_roam_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo roamInfo; uint32_t sessionId = pCommand->sessionId; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, FL("Roam Reason : %d, sessionId: %d"), pCommand->u.roamCmd.roamReason, sessionId); @@ -5100,7 +5100,7 @@ CDF_STATUS csr_roam_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) sms_log(pMac, LOGE, FL("Ignore eCsrForcedDisassoc cmd on roam state" " %d"), eCSR_ROAMING_STATE_IDLE); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = csr_roam_process_disassoc_deauth(pMac, pCommand, @@ -5198,7 +5198,7 @@ CDF_STATUS csr_roam_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) * (if we need to..) */ status = csr_roam(pMac, pCommand); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(pMac, LOGW, FL("csr_roam() failed with status = 0x%08X"), status); @@ -5323,7 +5323,7 @@ extern uint8_t csr_wpa_oui[][CSR_WPA_OUI_SIZE]; * * Return: none. */ -static CDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, +static QDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, tCsrRoamSession *session_ptr, eCsrAuthType auth_type, tDot11fBeaconIEs *ie_ptr, @@ -5357,7 +5357,7 @@ static CDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, /* nIeLen doesn't count EID and length fields */ session_ptr->pWpaRsnRspIE = cdf_mem_malloc(nIeLen + 2); if (NULL == session_ptr->pWpaRsnRspIE) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(session_ptr->pWpaRsnRspIE, nIeLen + 2, 0); @@ -5410,7 +5410,7 @@ static CDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, * compiler; nIeLen doesn't count EID & length fields */ session_ptr->pWpaRsnRspIE = cdf_mem_malloc(nIeLen + 2); if (NULL == session_ptr->pWpaRsnRspIE) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; session_ptr->pWpaRsnRspIE[0] = DOT11F_EID_WPA; session_ptr->pWpaRsnRspIE[1] = (uint8_t) nIeLen; pIeBuf = session_ptr->pWpaRsnRspIE + 2; @@ -5445,7 +5445,7 @@ static CDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, session_ptr->pWapiRspIE = cdf_mem_malloc(nIeLen + 2); if (NULL == session_ptr->pWapiRspIE) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; session_ptr->pWapiRspIE[0] = DOT11F_EID_WAPI; session_ptr->pWapiRspIE[1] = (uint8_t) nIeLen; pIeBuf = session_ptr->pWapiRspIE + 2; @@ -5492,22 +5492,22 @@ static CDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, } } #endif /* FEATURE_WLAN_WAPI */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS csr_roam_save_security_rsp_ie(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_save_security_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, eCsrAuthType authType, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tDot11fBeaconIEs *pIesLocal = pIes; if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if ((eCSR_AUTH_TYPE_WPA == authType) || @@ -5525,7 +5525,7 @@ static CDF_STATUS csr_roam_save_security_rsp_ie(tpAniSirGlobal pMac, (eCSR_AUTH_TYPE_RSN_8021X_SHA256 == authType) #endif /* FEATURE_WLAN_WAPI */ ) { - if (!pIesLocal && !CDF_IS_STATUS_SUCCESS + if (!pIesLocal && !QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies(pMac, pSirBssDesc, &pIesLocal))) sms_log(pMac, LOGE, FL(" cannot parse IEs")); @@ -5671,7 +5671,7 @@ void csr_roam_synch_clean_up (tpAniSirGlobal mac, uint8_t session_id) msg.type = WMA_ROAM_OFFLOAD_SYNCH_FAIL; msg.reserved = 0; msg.bodyptr = roam_offload_failed; - if (!CDF_IS_STATUS_SUCCESS(cds_mq_post_message(CDF_MODULE_ID_WMA, + if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s: Unable to post WMA_ROAM_OFFLOAD_SYNCH_FAIL to WMA", @@ -5726,7 +5726,7 @@ static void csr_roam_process_results_default(tpAniSirGlobal mac_ctx, uint32_t session_id = cmd->sessionId; tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); tCsrRoamInfo roam_info; - CDF_STATUS status; + QDF_STATUS status; sms_log(mac_ctx, LOGW, FL("receives no association indication")); sms_log(mac_ctx, LOG1, FL("Assoc ref count %d"), @@ -5770,7 +5770,7 @@ static void csr_roam_process_results_default(tpAniSirGlobal mac_ctx, */ if (csr_roam_is_handoff_in_progress(mac_ctx, session_id)) { csr_neighbor_roam_indicate_connect(mac_ctx, - (uint8_t)session_id, CDF_STATUS_E_FAILURE); + (uint8_t)session_id, QDF_STATUS_E_FAILURE); } if (session->bRefAssocStartCnt > 0) { session->bRefAssocStartCnt--; @@ -5933,7 +5933,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, eCsrRoamResult roam_result; tDot11fBeaconIEs *ies_ptr = NULL; tSirMacAddr bcast_mac = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; - CDF_STATUS status; + QDF_STATUS status; host_log_ibss_pkt_type *ibss_log; uint32_t bi; #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH @@ -5951,7 +5951,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, * started Ibss. */ sms_log(mac_ctx, LOG2, FL("receives start BSS ok indication")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; start_bss_rsp = (tSirSmeStartBssRsp *) context; cdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); if (CSR_IS_IBSS(profile)) @@ -5964,7 +5964,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, csr_roam_state_change(mac_ctx, eCSR_ROAMING_STATE_JOINED, session_id); bss_desc = &start_bss_rsp->bssDescription; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies(mac_ctx, bss_desc, &ies_ptr))) { sms_log(mac_ctx, LOGW, FL("cannot parse IBSS IEs")); @@ -6232,7 +6232,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, * Issue the set Context request to LIM to establish * the Unicast STA context */ - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( csr_roam_issue_set_context_req(mac_ctx, session_id, profile->negotiatedUCEncryptionType, @@ -6298,7 +6298,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, * This time should be long enough for the rest * of the process plus setting key */ - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_roam_start_wait_for_key_timer( mac_ctx, key_timeout_interval)) ) { @@ -6662,11 +6662,11 @@ static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, return release_cmd; } -CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, tCsrRoamProfile *pDstProfile, tCsrRoamProfile *pSrcProfile) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t size = 0; cdf_mem_set(pDstProfile, sizeof(tCsrRoamProfile), 0); @@ -6674,7 +6674,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, size = sizeof(struct cdf_mac_addr) * pSrcProfile->BSSIDs.numOfBSSIDs; pDstProfile->BSSIDs.bssid = cdf_mem_malloc(size); if (NULL == pDstProfile->BSSIDs.bssid) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->BSSIDs.numOfBSSIDs = @@ -6686,7 +6686,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, size = sizeof(tCsrSSIDInfo) * pSrcProfile->SSIDs.numOfSSIDs; pDstProfile->SSIDs.SSIDList = cdf_mem_malloc(size); if (NULL == pDstProfile->SSIDs.SSIDList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->SSIDs.numOfSSIDs = @@ -6698,7 +6698,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, pDstProfile->pWPAReqIE = cdf_mem_malloc(pSrcProfile->nWPAReqIELength); if (NULL == pDstProfile->pWPAReqIE) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->nWPAReqIELength = @@ -6710,7 +6710,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, pDstProfile->pRSNReqIE = cdf_mem_malloc(pSrcProfile->nRSNReqIELength); if (NULL == pDstProfile->pRSNReqIE) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->nRSNReqIELength = @@ -6723,7 +6723,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, pDstProfile->pWAPIReqIE = cdf_mem_malloc(pSrcProfile->nWAPIReqIELength); if (NULL == pDstProfile->pWAPIReqIE) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->nWAPIReqIELength = @@ -6736,7 +6736,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, pDstProfile->pAddIEScan = cdf_mem_malloc(pSrcProfile->nAddIEScanLength); if (NULL == pDstProfile->pAddIEScan) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->nAddIEScanLength = @@ -6748,7 +6748,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, pDstProfile->pAddIEAssoc = cdf_mem_malloc(pSrcProfile->nAddIEAssocLength); if (NULL == pDstProfile->pAddIEAssoc) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->nAddIEAssocLength = @@ -6761,7 +6761,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, cdf_mem_malloc(pSrcProfile->ChannelInfo. numOfChannels); if (NULL == pDstProfile->ChannelInfo.ChannelList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->ChannelInfo.numOfChannels = @@ -6833,7 +6833,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, cdf_mem_copy(&pDstProfile->addIeParams, &pSrcProfile->addIeParams, sizeof(tSirAddIeParams)); end: - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_release_profile(pMac, pDstProfile); pDstProfile = NULL; } @@ -6841,10 +6841,10 @@ end: return status; } -CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pDstProfile) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamConnectedProfile *pSrcProfile = &pMac->roam.roamSession[sessionId].connectedProfile; @@ -6852,7 +6852,7 @@ CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, pDstProfile->BSSIDs.bssid = cdf_mem_malloc(sizeof(struct cdf_mac_addr)); if (NULL == pDstProfile->BSSIDs.bssid) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("failed to allocate memory for BSSID " MAC_ADDRESS_STR), @@ -6866,7 +6866,7 @@ CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, pDstProfile->SSIDs.SSIDList = cdf_mem_malloc(sizeof(tCsrSSIDInfo)); if (NULL == pDstProfile->SSIDs.SSIDList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("failed to allocate memory for SSID " MAC_ADDRESS_STR), @@ -6885,7 +6885,7 @@ CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, pDstProfile->pAddIEAssoc = cdf_mem_malloc(pSrcProfile->nAddIEAssocLength); if (NULL == pDstProfile->pAddIEAssoc) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("failed to allocate mem for additional ie")); goto end; @@ -6896,7 +6896,7 @@ CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, } pDstProfile->ChannelInfo.ChannelList = cdf_mem_malloc(1); if (NULL == pDstProfile->ChannelInfo.ChannelList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->ChannelInfo.numOfChannels = 1; @@ -6930,7 +6930,7 @@ CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, #endif end: - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_release_profile(pMac, pDstProfile); pDstProfile = NULL; } @@ -6938,19 +6938,19 @@ end: return status; } -CDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tScanResultHandle hBSSList, eCsrRoamReason reason, uint32_t roamId, bool fImediate, bool fClearScan) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; pCommand = csr_get_command_buffer(pMac); if (NULL == pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } else { if (fClearScan) { csr_scan_abort_mac_scan_not_for_connect(pMac, sessionId); @@ -6975,7 +6975,7 @@ CDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, csr_roam_copy_profile(pMac, &pCommand->u.roamCmd.roamProfile, pProfile); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pCommand->u.roamCmd.fReleaseProfile = true; } } @@ -6992,7 +6992,7 @@ CDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, FL("CSR PERSONA=%d"), pCommand->u.roamCmd.roamProfile.csrPersona); status = csr_queue_sme_command(pMac, pCommand, fImediate); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); csr_release_command_roam(pMac, pCommand); @@ -7002,19 +7002,19 @@ CDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tCsrRoamModifyProfileFields *pMmodProfileFields, eCsrRoamReason reason, uint32_t roamId, bool fImediate) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; pCommand = csr_get_command_buffer(pMac); if (NULL == pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } else { csr_scan_abort_mac_scan_not_for_connect(pMac, sessionId); if (pProfile) { @@ -7035,7 +7035,7 @@ CDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, pCommand->u.roamCmd.roamProfile.uapsd_mask = pMmodProfileFields->uapsd_mask; } - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pCommand->u.roamCmd.fReleaseProfile = true; } pCommand->command = eSmeCommandRoam; @@ -7050,7 +7050,7 @@ CDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, csr_roam_remove_duplicate_command(pMac, sessionId, pCommand, reason); status = csr_queue_sme_command(pMac, pCommand, fImediate); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); csr_roam_completion(pMac, sessionId, NULL, pCommand, @@ -7061,17 +7061,17 @@ CDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal pMac, uint32_t sessionId, tpSirBssDescription pBssDescription, eCsrRoamReason reason, bool fImmediate) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; pCommand = csr_get_command_buffer(pMac); if (NULL == pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } else { if (pBssDescription) { /* copy over the parameters we need later */ @@ -7082,7 +7082,7 @@ CDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal pMac, uint32_t sessionId, /* in this case we are using this field for the "next" BSS */ pCommand->u.roamCmd.pLastRoamBss = pBssDescription; status = csr_queue_sme_command(pMac, pCommand, fImmediate); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL (" fail to enqueue preauth command, status = %d"), @@ -7091,13 +7091,13 @@ CDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal pMac, uint32_t sessionId, } } else { /* Return failure */ - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } } return status; } -CDF_STATUS csr_dequeue_roam_command(tpAniSirGlobal pMac, eCsrRoamReason reason) +QDF_STATUS csr_dequeue_roam_command(tpAniSirGlobal pMac, eCsrRoamReason reason) { tListElem *pEntry; tSmeCmd *pCommand; @@ -7134,14 +7134,14 @@ CDF_STATUS csr_dequeue_roam_command(tpAniSirGlobal pMac, eCsrRoamReason reason) FL("pEntry NULL for eWNI_SME_FT_PRE_AUTH_RSP")); } sme_process_pending_queue(pMac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, uint32_t *pRoamId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tScanResultHandle hBSSList; tCsrScanResultFilter *pScanFilter; uint32_t roamId = 0; @@ -7153,12 +7153,12 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, sms_log(pMac, LOGE, FL("session does not exist for given sessionId:%d"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (NULL == pProfile) { sms_log(pMac, LOGP, FL("No profile specified")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Initialize the count before proceeding with the Join requests */ pSession->join_bssid_count = 0; @@ -7196,7 +7196,7 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, #endif pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } @@ -7216,7 +7216,7 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, roamId = GET_NEXT_ROAM_ID(&pMac->roam); if (pRoamId) *pRoamId = roamId; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pScanFilter); goto end; } @@ -7235,7 +7235,7 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, /* This can be started right away */ status = csr_roam_issue_connect(pMac, sessionId, pProfile, NULL, eCsrHddIssued, roamId, false, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("CSR failed to issue start BSS cmd with status = 0x%08X"), status); @@ -7252,7 +7252,7 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, status = csr_scan_get_result(pMac, pScanFilter, &hBSSList); sms_log(pMac, LOG1, FL("******* csr_scan_get_result Status ****** %d"), status); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* check if set hw mode needs to be done */ if ((pMac->policy_manager_enabled) && ((pScanFilter->csrPersona == CDF_STA_MODE) || @@ -7261,14 +7261,14 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, &first_ap_profile); status = cds_handle_conc_multiport(sessionId, first_ap_profile.channelId); - if ((CDF_IS_STATUS_SUCCESS(status)) && + if ((QDF_IS_STATUS_SUCCESS(status)) && (!csr_wait_for_connection_update(pMac, true))) { sms_log(pMac, LOG1, FL("conn update error")); csr_scan_result_purge(pMac, hBSSList); fCallCallback = true; goto error; - } else if (status == CDF_STATUS_E_FAILURE) { + } else if (status == QDF_STATUS_E_FAILURE) { sms_log(pMac, LOG1, FL("conn update error")); csr_scan_result_purge(pMac, hBSSList); fCallCallback = true; @@ -7278,7 +7278,7 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, status = csr_roam_issue_connect(pMac, sessionId, pProfile, hBSSList, eCsrHddIssued, roamId, false, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("CSR failed to issue connect cmd with status = 0x%08X"), status); @@ -7291,7 +7291,7 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, status = csr_roam_issue_connect(pMac, sessionId, pProfile, NULL, eCsrHddIssued, roamId, false, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("CSR failed to issue startIBSS cmd with status = 0x%08X"), status); @@ -7301,7 +7301,7 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, /* scan for this SSID */ status = csr_scan_for_ssid(pMac, sessionId, pProfile, roamId, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("CSR failed to issue SSID scan cmd with status = 0x%08X"), status); @@ -7343,20 +7343,20 @@ end: * * Return: status of operation */ -CDF_STATUS +QDF_STATUS csr_roam_reassoc(tpAniSirGlobal mac_ctx, uint32_t session_id, tCsrRoamProfile *profile, tCsrRoamModifyProfileFields mod_fields, uint32_t *roam_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; bool fCallCallback = true; uint32_t roamId = 0; tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); if (NULL == profile) { sms_log(mac_ctx, LOGP, FL("No profile specified")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(mac_ctx, LOG1, FL("called BSSType = %s (%d) authtype = %d encryType = %d"), @@ -7413,9 +7413,9 @@ csr_roam_reassoc(tpAniSirGlobal mac_ctx, uint32_t session_id, return status; } -CDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tScanResultHandle hBSSList = NULL; tCsrScanResultFilter *pScanFilter = NULL; uint32_t roamId; @@ -7424,7 +7424,7 @@ CDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pSession->pCurRoamProfile) { @@ -7433,27 +7433,27 @@ CDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) * will be free inside csr_roam_issue_connect */ pProfile = cdf_mem_malloc(sizeof(tCsrRoamProfile)); if (NULL == pProfile) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } cdf_mem_set(pProfile, sizeof(tCsrRoamProfile), 0); status = csr_roam_copy_profile(pMac, pProfile, pSession->pCurRoamProfile); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); status = csr_roam_prepare_filter_from_profile(pMac, pProfile, pScanFilter); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; roamId = GET_NEXT_ROAM_ID(&pMac->roam); status = csr_scan_get_result(pMac, pScanFilter, &hBSSList); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* we want to put the last connected BSS to the * very beginning, if possible */ csr_move_bss_to_head_from_bssid(pMac, @@ -7461,7 +7461,7 @@ CDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) status = csr_roam_issue_connect(pMac, sessionId, pProfile, hBSSList, eCsrHddIssued, roamId, false, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_scan_result_purge(pMac, hBSSList); goto end; } @@ -7469,7 +7469,7 @@ CDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) /* scan for this SSID only incase AP suppresses SSID */ status = csr_scan_for_ssid(pMac, sessionId, pProfile, roamId, true); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; } } /* We have a profile */ @@ -7489,23 +7489,23 @@ end: return status; } -CDF_STATUS csr_roam_reconnect(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_roam_reconnect(tpAniSirGlobal pMac, uint32_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (csr_is_conn_state_connected(pMac, sessionId)) { status = csr_roam_issue_disassociate_cmd(pMac, sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_join_last_profile(pMac, sessionId); } } return status; } -CDF_STATUS csr_roam_connect_to_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_roam_connect_to_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; sms_log(pMac, LOGW, FL("is called")); csr_roam_cancel_roaming(pMac, sessionId); csr_roam_remove_duplicate_command(pMac, sessionId, NULL, eCsrHddIssued); @@ -7515,10 +7515,10 @@ CDF_STATUS csr_roam_connect_to_last_profile(tpAniSirGlobal pMac, uint32_t sessio return status; } -CDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pCommand, +QDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pCommand, bool fDisassoc, bool fMICFailure) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; bool fComplete = false; eCsrRoamSubState NewSubstate; uint32_t sessionId = pCommand->sessionId; @@ -7538,7 +7538,7 @@ CDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pComma status = csr_roam_issue_stop_bss(pMac, sessionId, eCSR_ROAM_SUBSTATE_STOP_BSS_REQ); - fComplete = (!CDF_IS_STATUS_SUCCESS(status)); + fComplete = (!QDF_IS_STATUS_SUCCESS(status)); } else if (csr_is_conn_state_infra(pMac, sessionId)) { /* * in Infrastructure, we need to disassociate from the @@ -7596,18 +7596,18 @@ CDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pComma csr_roam_issue_deauth(pMac, sessionId, eCSR_ROAM_SUBSTATE_DEAUTH_REQ); } - fComplete = (!CDF_IS_STATUS_SUCCESS(status)); + fComplete = (!QDF_IS_STATUS_SUCCESS(status)); } else { /* we got a dis-assoc request while not connected to any peer */ /* just complete the command */ fComplete = true; - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } if (fComplete) { csr_roam_complete(pMac, eCsrNothingToJoin, NULL); } - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (csr_is_conn_state_infra(pMac, sessionId)) { /* Set the state to disconnect here */ pMac->roam.roamSession[sessionId].connectState = @@ -7626,10 +7626,10 @@ CDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pComma * @sme_cmd: pointer to sme command being prepared * * Function to prepare internal sme disconnect command - * Return: CDF_STATUS_SUCCESS on success else CDF_STATUS_E_RESOURCES on failure + * Return: QDF_STATUS_SUCCESS on success else QDF_STATUS_E_RESOURCES on failure */ -CDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, +QDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, uint32_t session_id, tSmeCmd **sme_cmd) { tSmeCmd *command; @@ -7637,7 +7637,7 @@ CDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, command = csr_get_command_buffer(mac); if (!command) { sms_log(mac, LOGE, FL("fail to get command buffer")); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } command->command = eSmeCommandRoam; @@ -7645,19 +7645,19 @@ CDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, command->u.roamCmd.roamReason = eCsrForcedDisassoc; *sme_cmd = command; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamDisconnectReason reason) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; do { pCommand = csr_get_command_buffer(pMac); if (!pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; break; } /* Change the substate in case it is wait-for-key */ @@ -7706,7 +7706,7 @@ CDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t session break; } status = csr_queue_sme_command(pMac, pCommand, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); csr_release_command_roam(pMac, pCommand); @@ -7715,10 +7715,10 @@ CDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t session return status; } -CDF_STATUS csr_roam_issue_stop_bss_cmd(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_stop_bss_cmd(tpAniSirGlobal pMac, uint32_t sessionId, bool fHighPriority) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; pCommand = csr_get_command_buffer(pMac); if (NULL != pCommand) { @@ -7732,27 +7732,27 @@ CDF_STATUS csr_roam_issue_stop_bss_cmd(tpAniSirGlobal pMac, uint32_t sessionId, pCommand->sessionId = (uint8_t) sessionId; pCommand->u.roamCmd.roamReason = eCsrStopBss; status = csr_queue_sme_command(pMac, pCommand, fHighPriority); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); csr_release_command_roam(pMac, pCommand); } } else { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } return status; } -CDF_STATUS csr_roam_disconnect_internal(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_disconnect_internal(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamDisconnectReason reason) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #ifdef FEATURE_WLAN_BTAMP_UT_RF /* Stop the retry */ @@ -7771,7 +7771,7 @@ CDF_STATUS csr_roam_disconnect_internal(tpAniSirGlobal pMac, uint32_t sessionId, pMac->roam.roamSession[sessionId].connectState = eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTING; csr_scan_abort_scan_for_ssid(pMac, sessionId); - status = CDF_STATUS_CMD_NOT_QUEUED; + status = QDF_STATUS_CMD_NOT_QUEUED; sms_log(pMac, LOG1, FL (" Disconnect cmd not queued, Roam command is not present" @@ -7780,14 +7780,14 @@ CDF_STATUS csr_roam_disconnect_internal(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_disconnect(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_disconnect(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamDisconnectReason reason) { tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } csr_roam_cancel_roaming(pMac, sessionId); @@ -7797,13 +7797,13 @@ CDF_STATUS csr_roam_disconnect(tpAniSirGlobal pMac, uint32_t sessionId, return csr_roam_disconnect_internal(pMac, sessionId, reason); } -CDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tDot11fBeaconIEs *pIesTemp = pIes; uint8_t index; tCsrRoamSession *pSession = NULL; @@ -7813,7 +7813,7 @@ CDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, if (NULL == pSession) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pConnectProfile = &pSession->connectedProfile; if (pConnectProfile->pAddIEAssoc) { @@ -7841,13 +7841,13 @@ CDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, pConnectProfile->pAddIEAssoc = cdf_mem_malloc(pProfile->nAddIEAssocLength); if (NULL == pConnectProfile->pAddIEAssoc) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to allocate memory for IE")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pConnectProfile->nAddIEAssocLength = pProfile->nAddIEAssocLength; @@ -7880,14 +7880,14 @@ CDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, } #ifdef FEATURE_WLAN_ESE if ((csr_is_profile_ese(pProfile) || - (CDF_IS_STATUS_SUCCESS(status) && (pIesTemp->ESEVersion.present) + (QDF_IS_STATUS_SUCCESS(status) && (pIesTemp->ESEVersion.present) && (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM))) && (pMac->roam.configParam.isEseIniFeatureEnabled)) { pConnectProfile->isESEAssoc = 1; } #endif /* save ssid */ - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (pIesTemp->SSID.present) { pConnectProfile->SSID.length = pIesTemp->SSID.num_ssid; cdf_mem_copy(pConnectProfile->SSID.ssId, @@ -7921,7 +7921,7 @@ CDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, pConnectProfile->qosConnection = pMac->roam.roamSession[sessionId].fWMMConnection; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_free_connect_bss_desc(pMac, sessionId); } for (index = 0; index < pProfile->SSIDs.numOfSSIDs; index++) { @@ -8031,7 +8031,7 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac, /* Should indicate neighbor roam algorithm about the connect failure here */ csr_neighbor_roam_indicate_connect(pMac, pSmeJoinRsp->sessionId, - CDF_STATUS_E_FAILURE); + QDF_STATUS_E_FAILURE); } /* * if userspace has issued disconnection, @@ -8070,12 +8070,12 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac, } /*else: ( eSIR_SME_SUCCESS == pSmeJoinRsp->statusCode ) */ } -CDF_STATUS csr_roam_issue_join(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_join(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrRoamProfile *pProfile, uint32_t roamId) { - CDF_STATUS status; + QDF_STATUS status; sms_log(pMac, LOG1, "Attempting to Join Bssid= " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pSirBssDesc->bssId)); @@ -8088,7 +8088,7 @@ CDF_STATUS csr_roam_issue_join(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -static CDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, @@ -8161,7 +8161,7 @@ void csr_roam_reissue_roam_command(tpAniSirGlobal pMac) eCSR_ROAM_INFRA_IND, eCSR_ROAM_RESULT_INFRA_DISASSOCIATED); - if (!CDF_IS_STATUS_SUCCESS(csr_roam_issue_stop_bss(pMac, sessionId, + if (!QDF_IS_STATUS_SUCCESS(csr_roam_issue_stop_bss(pMac, sessionId, eCSR_ROAM_SUBSTATE_STOP_BSS_REQ))) { sms_log(pMac, LOGE, FL("Failed to reissue stop_bss command for WDS")); @@ -8273,9 +8273,9 @@ bool csr_is_scan_for_roam_command_active(tpAniSirGlobal pMac) return fRet; } -CDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand = NULL; bool fHighPriority = true; bool fRemoveCmd = false; @@ -8286,7 +8286,7 @@ CDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionI pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link); if (!pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } if (eSmeCommandRoam == pCommand->command) { if (pCommand->u.roamCmd.roamReason == @@ -8311,7 +8311,7 @@ CDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionI sms_log(pMac, LOGE, FL (" fail to get command buffer as expected based on previous connect roam command")); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } do { /* Change the substate in case it is wait-for-key */ @@ -8324,7 +8324,7 @@ CDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionI pCommand->sessionId = (uint8_t) sessionId; pCommand->u.roamCmd.roamReason = eCsrSmeIssuedFTReassoc; status = csr_queue_sme_command(pMac, pCommand, fHighPriority); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); csr_release_command_roam(pMac, pCommand); @@ -8346,7 +8346,7 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, uint32_t session_id; tCsrRoamSession *session; tDot11fBeaconIEs *local_ies = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (NULL == entry) { sms_log(mac_ctx, LOGE, FL("CFG_CNF with active list empty")); @@ -8415,7 +8415,7 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, } if (csr_is_bss_type_ibss(cmd->u.roamCmd.roamProfile.BSSType) || CSR_IS_INFRA_AP(&cmd->u.roamCmd.roamProfile)) { - if (!CDF_IS_STATUS_SUCCESS(csr_roam_issue_start_bss(mac_ctx, + if (!QDF_IS_STATUS_SUCCESS(csr_roam_issue_start_bss(mac_ctx, session_id, &session->bssParams, &cmd->u.roamCmd.roamProfile, bss_desc, @@ -8450,7 +8450,7 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, if (!local_ies) { status = csr_get_parsed_bss_description_ies(mac_ctx, bss_desc, &local_ies); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return; } @@ -8471,13 +8471,13 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, bss_desc, local_ies, &cmd->u.roamCmd.roamProfile, cmd->u.roamCmd.roamId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { /* try something else */ csr_roam(mac_ctx, cmd); } } } else { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; /* * We need to come with other way to figure out that this is * because of HO in BMP The below API will be only available for @@ -8518,7 +8518,7 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, &cmd->u.roamCmd.roamProfile, cmd->u.roamCmd.roamId); } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { /* try something else */ csr_roam(mac_ctx, cmd); } @@ -8595,7 +8595,7 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(tpAniSirGlobal pMac, /* roaming. Note that we will attempt to Join the AP instead of a Reassoc since we may have attempted a */ /* 'Reassoc to self', which AP's that don't support Reassoc will force a Disassoc. */ /* The disassoc rsp message will remove the command from active list */ - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_roam_issue_disassociate (pMac, pSmeJoinRsp->sessionId, eCSR_ROAM_SUBSTATE_DISASSOC_REASSOC_FAILURE, false))) { @@ -8694,7 +8694,7 @@ csr_post_roam_failure(tpAniSirGlobal mac_ctx, tCsrScanResultFilter *scan_filter, tCsrRoamProfile *cur_roam_profile) { - CDF_STATUS status; + QDF_STATUS status; if (scan_filter) { csr_free_scan_filter(mac_ctx, scan_filter); @@ -8719,7 +8719,7 @@ csr_post_roam_failure(tpAniSirGlobal mac_ctx, */ status = csr_roam_issue_disassociate(mac_ctx, session_id, eCSR_ROAM_SUBSTATE_DISASSOC_REASSOC_FAILURE, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("csr_roam_issue_disassociate failed, status %d"), status); @@ -8743,7 +8743,7 @@ csr_check_profile_in_scan_cache(tpAniSirGlobal mac_ctx, tpCsrNeighborRoamControlInfo neighbor_roam_info, tScanResultHandle *hBSSList) { - CDF_STATUS status; + QDF_STATUS status; *scan_filter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == *scan_filter) { sms_log(mac_ctx, LOGE, FL("alloc for ScanFilter failed.")); @@ -8754,14 +8754,14 @@ csr_check_profile_in_scan_cache(tpAniSirGlobal mac_ctx, status = csr_roam_prepare_filter_from_profile(mac_ctx, &neighbor_roam_info->csrNeighborRoamProfile, *scan_filter); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("failed to prepare scan filter, status %d"), status); return false; } status = csr_scan_get_result(mac_ctx, *scan_filter, hBSSList); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("csr_scan_get_result failed, status %d"), status); @@ -8778,7 +8778,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, tCsrScanResultFilter *pScanFilter = NULL; uint32_t roamId = 0; tCsrRoamProfile *pCurRoamProfile = NULL; - CDF_STATUS status; + QDF_STATUS status; uint32_t sessionId; tCsrRoamSession *pSession; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL; @@ -8865,7 +8865,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, pCurRoamProfile, hBSSList, eCsrSmeIssuedAssocToSimilarAP, roamId, true, false); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(pMac, LOGE, FL("issue_connect failed. status %d"), status); @@ -9091,7 +9091,7 @@ void csr_roam_joined_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) tCsrRoamInfo roamInfo; tCsrRoamInfo *pRoamInfo = NULL; uint32_t sessionId; - CDF_STATUS status; + QDF_STATUS status; sms_log(pMac, LOG1, FL ("ASSOCIATION confirmation can be given to upper layer ")); @@ -9163,7 +9163,7 @@ void csr_roam_joined_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) } } -CDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, uint32_t sessionId, eCsrEncryptionType EncryptType, tSirBssDescription *pBssDescription, @@ -9173,7 +9173,7 @@ CDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, uint8_t keyId, uint16_t keyLength, uint8_t *pKey, uint8_t paeRole) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tAniEdType edType; if (eCSR_ENCRYPT_TYPE_UNKNOWN == EncryptType) { @@ -9220,7 +9220,7 @@ CDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, * * Return: status of operation */ -static CDF_STATUS +static QDF_STATUS csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, tCsrRoamSetKey *set_key, tSmeCmd *set_key_cmd, bool *enqueue_cmd) @@ -9235,7 +9235,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, FL("Invalid WEP40 keylength [= %d]"), set_key->keyLength); *enqueue_cmd = false; - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_WEP40_KEY_LEN; @@ -9253,7 +9253,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, FL("Invalid WEP104 keylength [= %d]"), set_key->keyLength); *enqueue_cmd = false; - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_WEP104_KEY_LEN; @@ -9268,7 +9268,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, FL("Invalid TKIP keylength [= %d]"), set_key->keyLength); *enqueue_cmd = false; - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_TKIP_KEY_LEN; cdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, @@ -9281,7 +9281,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, FL("Invalid AES/CCMP keylength [= %d]"), set_key->keyLength); *enqueue_cmd = false; - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_AES_KEY_LEN; cdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, @@ -9295,7 +9295,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, FL("Invalid WAPI keylength [= %d]"), set_key->keyLength); *enqueue_cmd = false; - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_WAPI_KEY_LEN; cdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, @@ -9307,7 +9307,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, sms_log(mac_ctx, LOGW, FL("pCurRoamProfile is NULL.")); *enqueue_cmd = false; - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } *enqueue_cmd = true; break; @@ -9320,7 +9320,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, sms_log(mac_ctx, LOGW, FL("Invalid KRK keylength [= %d]"), set_key->keyLength); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } cdf_mem_copy(session->eseCckmInfo.krk, set_key->Key, CSR_KRK_KEY_LEN); @@ -9335,7 +9335,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, sms_log(mac_ctx, LOGW, FL("LFR3:Invalid BTK keylength [= %d]"), set_key->keyLength); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } cdf_mem_copy(session->eseCckmInfo.btk, set_key->Key, SIR_BTK_KEY_LEN); @@ -9350,7 +9350,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, FL("Invalid AES/CCMP keylength [= %d]"), set_key->keyLength); *enqueue_cmd = false; - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_AES_KEY_LEN; cdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, @@ -9361,18 +9361,18 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, default: /* for open security also we want to enqueue command */ *enqueue_cmd = true; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* end of switch */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamSetKey *pSetKey, uint32_t roamId) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; bool enqueue_cmd = true; tSmeCmd *pCommand = NULL; #if defined(FEATURE_WLAN_ESE) || defined (FEATURE_WLAN_WAPI) @@ -9380,14 +9380,14 @@ static CDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, if (NULL == pSession) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #endif /* FEATURE_WLAN_ESE */ pCommand = csr_get_command_buffer(pMac); if (NULL == pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } cdf_mem_zero(pCommand, sizeof(tSmeCmd)); pCommand->command = eSmeCommandSetKey; @@ -9421,7 +9421,7 @@ static CDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, */ status = csr_queue_sme_command(pMac, pCommand, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("fail to send message status = %d"), status); /* update to false so that command can be freed */ @@ -9441,9 +9441,9 @@ static CDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) +QDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status; + QDF_STATUS status; uint8_t numKeys = (pCommand->u.setKeyCmd.keyLength) ? 1 : 0; tAniEdType edType = csr_translate_encrypt_type_to_ed_type(pCommand->u.setKeyCmd.encType); @@ -9457,7 +9457,7 @@ CDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pComma if (NULL == pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (eSIR_ED_NONE != edType) { @@ -9522,9 +9522,9 @@ CDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pComma } else { sms_log(pMac, LOGW, FL(" cannot process not connected")); /* Set this status so the error handling take care of the case. */ - status = CDF_STATUS_CSR_WRONG_STATE; + status = QDF_STATUS_CSR_WRONG_STATE; } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" error status %d"), status); csr_roam_call_callback(pMac, sessionId, NULL, pCommand->u.setKeyCmd.roamId, @@ -9549,13 +9549,13 @@ CDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pComma return status; } -CDF_STATUS csr_roam_set_key(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_set_key(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamSetKey *pSetKey, uint32_t roamId) { - CDF_STATUS status; + QDF_STATUS status; if (!csr_is_set_key_allowed(pMac, sessionId)) { - status = CDF_STATUS_CSR_WRONG_STATE; + status = QDF_STATUS_CSR_WRONG_STATE; } else { status = csr_roam_issue_set_key_command(pMac, sessionId, pSetKey, roamId); @@ -9568,12 +9568,12 @@ CDF_STATUS csr_roam_set_key(tpAniSirGlobal pMac, uint32_t sessionId, Upon successful return, caller MUST call csr_free_scan_filter on pScanFilter when it is done with the filter. */ -CDF_STATUS +QDF_STATUS csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, tCsrRoamProfile *profile, tCsrScanResultFilter *scan_fltr) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t size = 0; uint8_t idx = 0; tCsrChannelInfo *fltr_ch_info = &scan_fltr->ChannelInfo; @@ -9587,7 +9587,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, size = sizeof(struct cdf_mac_addr) * profile->BSSIDs.numOfBSSIDs; scan_fltr->BSSIDs.bssid = cdf_mem_malloc(size); if (NULL == scan_fltr->BSSIDs.bssid) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_filter; } scan_fltr->BSSIDs.numOfBSSIDs = profile->BSSIDs.numOfBSSIDs; @@ -9608,10 +9608,10 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, scan_fltr->SSIDs.numOfSSIDs; scan_fltr->SSIDs.SSIDList = cdf_mem_malloc(size); if (NULL == scan_fltr->SSIDs.SSIDList) - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_filter; for (i = 0; i < roam_params->num_ssid_allowed_list; @@ -9631,7 +9631,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, profile->SSIDs.numOfSSIDs; scan_fltr->SSIDs.SSIDList = cdf_mem_malloc(size); if (NULL == scan_fltr->SSIDs.SSIDList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_filter; } cdf_mem_copy(scan_fltr->SSIDs.SSIDList, @@ -9649,7 +9649,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, cdf_mem_malloc(sizeof(*(fltr_ch_info->ChannelList)) * profile_ch_info->numOfChannels); if (NULL == fltr_ch_info->ChannelList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_filter; } @@ -9668,7 +9668,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, } } else { sms_log(mac_ctx, LOGE, FL("Channel list empty")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto free_filter; } scan_fltr->uapsd_mask = profile->uapsd_mask; @@ -9716,7 +9716,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, scan_fltr->csrPersona = profile->csrPersona; free_filter: - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) csr_free_scan_filter(mac_ctx, scan_fltr); return status; @@ -9758,7 +9758,7 @@ bool csr_roam_issue_wm_status_change(tpAniSirGlobal pMac, uint32_t sessionId, sizeof(pCommand->u.wmStatusChangeCmd.u. DeauthIndMsg)); } - if (CDF_IS_STATUS_SUCCESS + if (QDF_IS_STATUS_SUCCESS (csr_queue_sme_command(pMac, pCommand, true))) { fCommandQueued = true; } else { @@ -9772,7 +9772,7 @@ bool csr_roam_issue_wm_status_change(tpAniSirGlobal pMac, uint32_t sessionId, return fCommandQueued; } -static CDF_STATUS csr_send_snr_request(void *pGetRssiReq) +static QDF_STATUS csr_send_snr_request(void *pGetRssiReq) { void *wma_handle; @@ -9780,29 +9780,29 @@ static CDF_STATUS csr_send_snr_request(void *pGetRssiReq) if (!wma_handle) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma_handle is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wma_send_snr_request(wma_handle, pGetRssiReq)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to Trigger wma stats request"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* dont send success, otherwise call back * will released with out values */ - return CDF_STATUS_E_BUSY; + return QDF_STATUS_E_BUSY; } static void csr_update_rssi(tpAniSirGlobal pMac, void *pMsg) { int8_t rssi = 0; tAniGetRssiReq *pGetRssiReq = (tAniGetRssiReq *) pMsg; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; if (pGetRssiReq) { if (NULL != pGetRssiReq->p_cds_context) { - cdf_status = csr_send_snr_request(pGetRssiReq); + qdf_status = csr_send_snr_request(pGetRssiReq); } else { sms_log(pMac, LOGE, FL("pGetRssiReq->p_cds_context is NULL")); @@ -9810,7 +9810,7 @@ static void csr_update_rssi(tpAniSirGlobal pMac, void *pMsg) } if (NULL != pGetRssiReq->rssiCallback) { - if (cdf_status != CDF_STATUS_E_BUSY) + if (qdf_status != QDF_STATUS_E_BUSY) ((tCsrRssiCallback) (pGetRssiReq->rssiCallback)) (rssi, pGetRssiReq->staId, pGetRssiReq->pDevContext); @@ -9835,7 +9835,7 @@ static void csr_update_snr(tpAniSirGlobal pMac, void *pMsg) tAniGetSnrReq *pGetSnrReq = (tAniGetSnrReq *) pMsg; if (pGetSnrReq) { - if (CDF_STATUS_SUCCESS != wma_get_snr(pGetSnrReq)) { + if (QDF_STATUS_SUCCESS != wma_get_snr(pGetSnrReq)) { sms_log(pMac, LOGE, FL("Error in wma_get_snr")); return; } @@ -9917,22 +9917,22 @@ void csr_send_ese_adjacent_ap_rep_ind(tpAniSirGlobal pMac, tCsrRoamSession *pSes } #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ -static CDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac, +static QDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac, struct cdf_mac_addr *bssId) { tpSirResetAPCapsChange pMsg; uint16_t len; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* Create the message and send to lim */ len = sizeof(tSirResetAPCapsChange); pMsg = cdf_mem_malloc(len); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(pMsg, sizeof(tSirResetAPCapsChange), 0); pMsg->messageType = eWNI_SME_RESET_AP_CAPS_CHANGED; pMsg->length = len; @@ -9952,7 +9952,7 @@ csr_roam_chk_lnk_assoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tSirSmeAssocInd *pAssocInd; tCsrRoamInfo roam_info; @@ -9962,7 +9962,7 @@ csr_roam_chk_lnk_assoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) pAssocInd = (tSirSmeAssocInd *) msg_ptr; status = csr_roam_get_session_id_from_bssid(mac_ctx, (struct cdf_mac_addr *) pAssocInd->bssId, &sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOG1, FL("Couldn't find session_id for given BSSID")); return; @@ -10017,7 +10017,7 @@ csr_roam_chk_lnk_assoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) status = csr_roam_call_callback(mac_ctx, sessionId, roam_info_ptr, 0, eCSR_ROAM_INFRA_IND, eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) /* Refused due to Mac filtering */ roam_info_ptr->statusCode = eSIR_SME_ASSOC_REFUSED; } @@ -10041,7 +10041,7 @@ csr_roam_chk_lnk_disassoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tSirSmeDisassocInd *pDisassocInd; tSmeCmd cmd; @@ -10056,7 +10056,7 @@ csr_roam_chk_lnk_disassoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) cdf_mem_set(&roam_info, sizeof(roam_info), 0); status = csr_roam_get_session_id_from_bssid(mac_ctx, &pDisassocInd->bssid, &sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("Session Id not found for BSSID " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pDisassocInd->bssid.bytes)); @@ -10140,7 +10140,7 @@ csr_roam_chk_lnk_deauth_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tSirSmeDeauthInd *pDeauthInd; tCsrRoamInfo roam_info; @@ -10151,7 +10151,7 @@ csr_roam_chk_lnk_deauth_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) status = csr_roam_get_session_id_from_bssid(mac_ctx, &pDeauthInd->bssid, &sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return; /* If we are in neighbor preauth done state then on receiving * disassoc or deauth we dont roam instead we just disassoc @@ -10210,7 +10210,7 @@ csr_roam_chk_lnk_swt_ch_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tpSirSmeSwitchChannelInd pSwitchChnInd; /* in case of STA, the SWITCH_CHANNEL originates from its AP */ @@ -10221,7 +10221,7 @@ csr_roam_chk_lnk_swt_ch_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) */ status = csr_roam_get_session_id_from_bssid(mac_ctx, &pSwitchChnInd->bssid, &sessionId); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { session = CSR_GET_SESSION(mac_ctx, sessionId); if (!session) { sms_log(mac_ctx, LOGE, @@ -10242,7 +10242,7 @@ csr_roam_chk_lnk_deauth_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tSirSmeDeauthRsp *pDeauthRsp = (tSirSmeDeauthRsp *) msg_ptr; tCsrRoamInfo roam_info; @@ -10272,7 +10272,7 @@ csr_roam_chk_lnk_disassoc_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tCsrRoamInfo roam_info; /* @@ -10334,7 +10334,7 @@ static void csr_roam_chk_lnk_mic_fail_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tCsrRoamInfo roam_info; tpSirSmeMicFailureInd pMicInd = (tpSirSmeMicFailureInd) msg_ptr; @@ -10343,7 +10343,7 @@ csr_roam_chk_lnk_mic_fail_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) cdf_mem_set(&roam_info, sizeof(roam_info), 0); status = csr_roam_get_session_id_from_bssid(mac_ctx, &pMicInd->bssId, &sessionId); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); roam_info.u.pMICFailureInfo = &pMicInd->info; roam_info_ptr = &roam_info; @@ -10363,7 +10363,7 @@ static void csr_roam_chk_lnk_pbs_probe_req_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo roam_info; tpSirSmeProbeReqInd pProbeReqInd = (tpSirSmeProbeReqInd) msg_ptr; @@ -10372,7 +10372,7 @@ csr_roam_chk_lnk_pbs_probe_req_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) status = csr_roam_get_session_id_from_bssid(mac_ctx, &pProbeReqInd->bssid, &sessionId); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); roam_info.u.pWPSPBCProbeReq = &pProbeReqInd->WPSPBCProbeReq; csr_roam_call_callback(mac_ctx, sessionId, &roam_info, @@ -10415,7 +10415,7 @@ csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx, { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tSirSmeWmStatusChangeNtf *pStatusChangeMsg; tCsrRoamInfo roam_info; @@ -10522,7 +10522,7 @@ csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx, FL("CSR handling eSIR_SME_AP_CAPS_CHANGED")); status = csr_roam_get_session_id_from_bssid(mac_ctx, &pApNewCaps->bssId, &sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) break; if (eCSR_ROAMING_STATE_JOINED == mac_ctx->roam.curState[sessionId] @@ -10573,7 +10573,7 @@ csr_roam_chk_lnk_ibss_new_peer_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tSmeIbssPeerInd *pIbssPeerInd = (tSmeIbssPeerInd *) msg_ptr; tCsrRoamInfo roam_info; @@ -10613,9 +10613,9 @@ csr_roam_chk_lnk_ibss_new_peer_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) roam_info.pbFrames = cdf_mem_malloc((pIbssPeerInd->mesgLen - sizeof(tSmeIbssPeerInd))); if (NULL == roam_info.pbFrames) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; } else { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; roam_info.nBeaconLength = pIbssPeerInd->mesgLen - sizeof(tSmeIbssPeerInd); cdf_mem_copy(roam_info.pbFrames, @@ -10629,13 +10629,13 @@ csr_roam_chk_lnk_ibss_new_peer_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) roam_info.pBssDesc = cdf_mem_malloc( session->pConnectBssDesc->length); if (NULL == roam_info.pBssDesc) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; if (roam_info.pbFrames) cdf_mem_free(roam_info.pbFrames); if (roam_info.pBssDesc) cdf_mem_free(roam_info.pBssDesc); } else { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; cdf_mem_copy(roam_info.pBssDesc, session->pConnectBssDesc, session->pConnectBssDesc->length); @@ -10749,7 +10749,7 @@ csr_roam_chk_lnk_set_ctx_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tSmeCmd *cmd; tCsrRoamInfo roam_info; @@ -10972,10 +10972,10 @@ void csr_call_roaming_completion_callback(tpAniSirGlobal pMac, } } -CDF_STATUS csr_roam_start_roaming(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_start_roaming(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamingReason roamingReason) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (CSR_IS_LOSTLINK_ROAMING(roamingReason) && (false == pMac->roam.roamSession[sessionId].fCancelRoaming)) { status = csr_scan_request_lost_link1(pMac, sessionId); @@ -11026,7 +11026,7 @@ bool csr_roam_complete_roaming(tpAniSirGlobal pMac, uint32_t sessionId, pSession->roamingReason = eCsrNotRoaming; } else { pSession->roamResult = roamResult; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_roam_start_roaming_timer (pMac, sessionId, CDF_MC_TIMER_TO_SEC_UNIT))) { csr_call_roaming_completion_callback(pMac, pSession, NULL, @@ -11083,7 +11083,7 @@ void csr_roam_roaming_timer_handler(void *pv) } if (false == pSession->fCancelRoaming) { - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_roam_start_roaming (pMac, sessionId, pSession->roamingReason))) { csr_call_roaming_completion_callback(pMac, pSession, NULL, @@ -11094,15 +11094,15 @@ void csr_roam_roaming_timer_handler(void *pv) } } -CDF_STATUS csr_roam_start_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_start_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t interval) { - CDF_STATUS status; + QDF_STATUS status; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, " csrScanStartRoamingTimer"); @@ -11113,7 +11113,7 @@ CDF_STATUS csr_roam_start_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_stop_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_roam_stop_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId) { return cdf_mc_timer_stop (&pMac->roam.roamSession[sessionId].hTimerRoaming); @@ -11124,7 +11124,7 @@ void csr_roam_wait_for_key_time_out_handler(void *pv) tCsrTimerInfo *pInfo = (tCsrTimerInfo *) pv; tpAniSirGlobal pMac = pInfo->pMac; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, pInfo->sessionId); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (pSession == NULL) { sms_log(pMac, LOGE, "%s: session not found", __func__); @@ -11165,7 +11165,7 @@ void csr_roam_wait_for_key_time_out_handler(void *pv) pSession->connectedProfile.bssid); sme_process_pending_queue(pMac); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_roam_disconnect(pMac, pInfo->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); sme_release_global_lock(&pMac->sme); @@ -11177,9 +11177,9 @@ void csr_roam_wait_for_key_time_out_handler(void *pv) } -CDF_STATUS csr_roam_start_wait_for_key_timer(tpAniSirGlobal pMac, uint32_t interval) +QDF_STATUS csr_roam_start_wait_for_key_timer(tpAniSirGlobal pMac, uint32_t interval) { - CDF_STATUS status; + QDF_STATUS status; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[pMac->roam.WaitForKeyTimerInfo. sessionId]; @@ -11203,7 +11203,7 @@ CDF_STATUS csr_roam_start_wait_for_key_timer(tpAniSirGlobal pMac, uint32_t inter return status; } -CDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac) +QDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[pMac->roam.WaitForKeyTimerInfo. @@ -11270,10 +11270,10 @@ void csr_roam_completion(tpAniSirGlobal pMac, uint32_t sessionId, } } -CDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t type, tSirSmeRsp *pSirMsg) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeDeauthInd *pDeauthIndMsg = NULL; tSirSmeDisassocInd *pDisassocIndMsg = NULL; eCsrRoamResult result = eCSR_ROAM_RESULT_LOSTLINK; @@ -11284,7 +11284,7 @@ CDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Only need to roam for infra station. In this case P2P client will roam as well */ fToRoam = CSR_IS_INFRASTRUCTURE(&pSession->connectedProfile); @@ -11332,7 +11332,7 @@ CDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, } else if (eWNI_SME_DEAUTH_IND == type) { status = csr_send_mb_deauth_cnf_msg(pMac, pDeauthIndMsg); } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { /* If fail to send confirmation to PE, not to trigger roaming */ fToRoam = false; } @@ -11374,7 +11374,7 @@ CDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, (eWNI_SME_DEAUTH_IND == type) ? eCsrLostlinkRoamingDeauth : eCsrLostlinkRoamingDisassoc); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); /* For IBSS, we need to give some more info to HDD */ if (csr_is_bss_type_ibss @@ -11428,17 +11428,17 @@ CDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_lost_link_afterhandoff_failure(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_lost_link_afterhandoff_failure(tpAniSirGlobal pMac, uint32_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry = NULL; tSmeCmd *pCommand = NULL; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession->fCancelRoaming = false; @@ -11448,7 +11448,7 @@ CDF_STATUS csr_roam_lost_link_afterhandoff_failure(tpAniSirGlobal pMac, if (pMac->roam.configParam.nRoamingTime) { status = csr_roam_start_roaming(pMac, sessionId, pSession->roamingReason); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* * before starting the lost link logic release * the roam command for handoff @@ -11475,7 +11475,7 @@ CDF_STATUS csr_roam_lost_link_afterhandoff_failure(tpAniSirGlobal pMac, } } else { /* We are told not to roam, indicate lostlink */ - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; @@ -11514,7 +11514,7 @@ void csr_roam_wm_status_change_complete(tpAniSirGlobal pMac) void csr_roam_process_wm_status_change_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tSirSmeRsp *pSirSmeMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, pCommand->sessionId); @@ -11776,15 +11776,15 @@ csr_roam_get_phy_mode_band_for_bss(tpAniSirGlobal mac_ctx, return cfg_dot11_mode; } -CDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamSubState NewSubstate) { - CDF_STATUS status; + QDF_STATUS status; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR { @@ -11802,7 +11802,7 @@ CDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal pMac, uint32_t sessionId, /* attempt to stop the Bss (reason code is ignored...) */ status = csr_send_mb_stop_bss_req_msg(pMac, sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGW, FL("csr_send_mb_stop_bss_req_msg failed with status %d"), status); @@ -11811,7 +11811,7 @@ CDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal pMac, uint32_t sessionId, } /* pNumChan is a caller allocated space with the sizeof pChannels */ -CDF_STATUS csr_get_cfg_valid_channels(tpAniSirGlobal pMac, uint8_t *pChannels, +QDF_STATUS csr_get_cfg_valid_channels(tpAniSirGlobal pMac, uint8_t *pChannels, uint32_t *pNumChan) { uint8_t num_chan_temp = 0; @@ -11820,7 +11820,7 @@ CDF_STATUS csr_get_cfg_valid_channels(tpAniSirGlobal pMac, uint8_t *pChannels, if (!IS_SIR_STATUS_SUCCESS(wlan_cfg_get_str(pMac, WNI_CFG_VALID_CHANNEL_LIST, (uint8_t *) pChannels, pNumChan))) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; for (i = 0; i < *pNumChan; i++) { if (!cds_is_dsrc_channel(cds_chan_to_freq(pChannels[i]))) { @@ -11830,7 +11830,7 @@ CDF_STATUS csr_get_cfg_valid_channels(tpAniSirGlobal pMac, uint8_t *pChannels, } *pNumChan = num_chan_temp; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel) @@ -11839,7 +11839,7 @@ int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel) uint16_t cfgId = 0; int8_t maxTxPwr = 0; uint8_t *pCountryInfo = NULL; - CDF_STATUS status; + QDF_STATUS status; uint8_t count = 0; uint8_t firstChannel; uint8_t maxChannels; @@ -11855,10 +11855,10 @@ int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel) pCountryInfo = cdf_mem_malloc(cfgLength); if (NULL == pCountryInfo) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (status != CDF_STATUS_SUCCESS) { + status = QDF_STATUS_SUCCESS; + if (status != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("%s: failed to allocate memory, status = %d"), __FUNCTION__, status); @@ -11893,7 +11893,7 @@ bool csr_roam_is_channel_valid(tpAniSirGlobal pMac, uint8_t channel) uint32_t idxValidChannels; uint32_t len = sizeof(pMac->roam.validChannelList); - if (CDF_IS_STATUS_SUCCESS + if (QDF_IS_STATUS_SUCCESS (csr_get_cfg_valid_channels(pMac, pMac->roam.validChannelList, &len))) { for (idxValidChannels = 0; (idxValidChannels < len); idxValidChannels++) { @@ -12049,7 +12049,7 @@ bool csr_is_same_profile(tpAniSirGlobal pMac, uint32_t i; bool fCheck = false; tCsrScanResultFilter *pScanFilter = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (!(pProfile1 && pProfile2)) return fCheck; @@ -12060,7 +12060,7 @@ bool csr_is_same_profile(tpAniSirGlobal pMac, cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); status = csr_roam_prepare_filter_from_profile(pMac, pProfile2, pScanFilter); - if (!(CDF_IS_STATUS_SUCCESS(status))) + if (!(QDF_IS_STATUS_SUCCESS(status))) goto free_scan_filter; for (i = 0; i < pScanFilter->SSIDs.numOfSSIDs; i++) { @@ -12158,7 +12158,7 @@ uint8_t csr_roam_get_ibss_start_channel_number50(tpAniSirGlobal pMac) } if (0 == channel && - CDF_IS_STATUS_SUCCESS(csr_get_cfg_valid_channels + QDF_IS_STATUS_SUCCESS(csr_get_cfg_valid_channels (pMac, (uint8_t *) pMac->roam.validChannelList, &len))) { @@ -12218,7 +12218,7 @@ uint8_t csr_roam_get_ibss_start_channel_number24(tpAniSirGlobal pMac) if (0 == channel && - CDF_IS_STATUS_SUCCESS(csr_get_cfg_valid_channels + QDF_IS_STATUS_SUCCESS(csr_get_cfg_valid_channels (pMac, (uint8_t *) pMac->roam.validChannelList, &len))) { @@ -12504,12 +12504,12 @@ static void csr_roam_determine_max_rate_for_ad_hoc(tpAniSirGlobal pMac, return; } -CDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamStartBssParams *pParam, tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc, uint32_t roamId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; eCsrBand eBand; /* Set the roaming substate to 'Start BSS attempt'... */ csr_roam_substate_change(pMac, eCSR_ROAM_SUBSTATE_START_BSS_REQ, @@ -12555,7 +12555,7 @@ CDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, pParam->ssidHidden = pProfile->SSIDs.SSIDList[0].ssidHidden; if (CSR_IS_INFRA_AP(pProfile) && (pParam->operationChn != 0)) { if (csr_is_valid_channel(pMac, pParam->operationChn) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { pParam->operationChn = INFRA_AP_DEFAULT_CHANNEL; } } @@ -12670,11 +12670,11 @@ static void csr_roam_prepare_bss_params(tpAniSirGlobal pMac, uint32_t sessionId, } } -static CDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, +static QDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, bool *pfSameIbss) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; bool fSameIbss = false; if (csr_is_conn_state_ibss(pMac, sessionId)) { @@ -12700,10 +12700,10 @@ static CDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, pBssConfig = cdf_mem_malloc(sizeof(tBssConfigParam)); if (NULL == pBssConfig) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(pBssConfig, sizeof(tBssConfigParam), 0); /* there is no Bss description before we start an IBSS so we need to adopt */ /* all Bss configuration parameters from the Profile. */ @@ -12711,7 +12711,7 @@ static CDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, csr_roam_prepare_bss_config_from_profile(pMac, pProfile, pBssConfig, NULL); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* save dotMode */ pMac->roam.roamSession[sessionId].bssParams. uCfgDot11Mode = pBssConfig->uCfgDot11Mode; @@ -12759,17 +12759,17 @@ static void csr_roam_update_connected_profile_from_new_bss(tpAniSirGlobal pMac, } #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS csr_roam_set_psk_pmk(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_set_psk_pmk(tpAniSirGlobal pMac, uint32_t sessionId, uint8_t *pPSK_PMK, size_t pmk_len) { tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(pSession->psk_pmk, pPSK_PMK, sizeof(pSession->psk_pmk)); pSession->pmk_len = pmk_len; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ @@ -12797,7 +12797,7 @@ csr_roam_diag_set_pmkid(tCsrRoamSession *pSession) } #endif /* FEATURE_WLAN_DIAG_SUPPORT_CSR */ -CDF_STATUS +QDF_STATUS csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, tPmkidCacheInfo *pPMKIDCache, uint32_t numItems, bool update_entire_cache) @@ -12808,13 +12808,13 @@ csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOGW, FL("numItems = %d"), numItems); if (numItems > CSR_MAX_PMKID_ALLOWED) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR csr_roam_diag_set_pmkid(pSession); @@ -12827,7 +12827,7 @@ csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, sizeof(tPmkidCacheInfo) * numItems); pSession->curr_cache_idx = (uint16_t)numItems; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } for (i = 0; i < numItems; i++) { @@ -12855,10 +12855,10 @@ csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, if (pSession->NumPmkidCache > CSR_MAX_PMKID_ALLOWED) pSession->NumPmkidCache = CSR_MAX_PMKID_ALLOWED; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, uint32_t sessionId, const uint8_t *pBSSId, bool flush_cache) @@ -12871,13 +12871,13 @@ CDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Check if there are no entries to delete */ if (0 == pSession->NumPmkidCache) { sms_log(pMac, LOG1, FL("No entries to delete/Flush")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (flush_cache) { @@ -12886,7 +12886,7 @@ CDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, sizeof(tPmkidCacheInfo) * CSR_MAX_PMKID_ALLOWED); pSession->NumPmkidCache = 0; pSession->curr_cache_idx = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* !flush_cache - so look up in the cache */ @@ -12905,7 +12905,7 @@ CDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, if (Index == CSR_MAX_PMKID_ALLOWED && !fMatchFound) { sms_log(pMac, LOG1, FL("No such PMKSA entry exists" MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pBSSId)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* Match Found, Readjust the other entries */ @@ -12935,7 +12935,7 @@ CDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, /* Decrement the count since an entry has been deleted */ pSession->NumPmkidCache--; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } uint32_t csr_roam_get_num_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId) @@ -12943,7 +12943,7 @@ uint32_t csr_roam_get_num_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId) return pMac->roam.roamSession[sessionId].NumPmkidCache; } -CDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pNum, tPmkidCacheInfo *pPmkidCache) { tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -12952,21 +12952,21 @@ CDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!pNum || !pPmkidCache) { sms_log(pMac, LOGE, FL("Either pNum or pPmkidCache is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pSession->NumPmkidCache == 0) { *pNum = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (*pNum < pSession->NumPmkidCache) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pSession->NumPmkidCache > CSR_MAX_PMKID_ALLOWED) { @@ -12990,19 +12990,19 @@ CDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, } *pNum = pSession->NumPmkidCache; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; uint32_t len; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pLen) { @@ -13012,23 +13012,23 @@ CDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, if (len >= pSession->nWpaRsnReqIeLength) { cdf_mem_copy(pBuf, pSession->pWpaRsnReqIE, pSession->nWpaRsnReqIeLength); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } } return status; } -CDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; uint32_t len; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pLen) { @@ -13038,7 +13038,7 @@ CDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, if (len >= pSession->nWpaRsnRspIeLength) { cdf_mem_copy(pBuf, pSession->pWpaRsnRspIE, pSession->nWpaRsnRspIeLength); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } } @@ -13046,16 +13046,16 @@ CDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, } #ifdef FEATURE_WLAN_WAPI -CDF_STATUS csr_roam_get_wapi_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wapi_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; uint32_t len; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pLen) { @@ -13065,23 +13065,23 @@ CDF_STATUS csr_roam_get_wapi_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, if (len >= pSession->nWapiReqIeLength) { cdf_mem_copy(pBuf, pSession->pWapiReqIE, pSession->nWapiReqIeLength); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } } return status; } -CDF_STATUS csr_roam_get_wapi_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wapi_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; uint32_t len; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pLen) { @@ -13091,7 +13091,7 @@ CDF_STATUS csr_roam_get_wapi_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, if (len >= pSession->nWapiRspIeLength) { cdf_mem_copy(pBuf, pSession->pWapiRspIE, pSession->nWapiRspIeLength); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } } @@ -13116,11 +13116,11 @@ eRoamCmdStatus csr_get_roam_complete_status(tpAniSirGlobal pMac, uint32_t sessio } /* This function remove the connected BSS from te cached scan result */ -CDF_STATUS +QDF_STATUS csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pConnProfile) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tCsrScanResultFilter *pScanFilter = NULL; tListElem *pEntry; tCsrScanResult *pResult; @@ -13136,13 +13136,13 @@ csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, */ pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); pScanFilter->BSSIDs.bssid = cdf_mem_malloc(sizeof(struct cdf_mac_addr)); if (NULL == pScanFilter->BSSIDs.bssid) { cdf_mem_free(pScanFilter); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(pScanFilter->BSSIDs.bssid, &pConnProfile->bssid, sizeof(struct cdf_mac_addr)); @@ -13154,7 +13154,7 @@ csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, if (NULL == pScanFilter->SSIDs.SSIDList) { csr_free_scan_filter(pMac, pScanFilter); cdf_mem_free(pScanFilter); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(&pScanFilter->SSIDs.SSIDList[0].SSID, &pConnProfile->SSID, sizeof(tSirMacSSid)); @@ -13213,17 +13213,17 @@ csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, return status; } -static CDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, +static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tBssConfigParam bssConfig; if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (csr_is_conn_state_ibss(pMac, sessionId)) { @@ -13244,7 +13244,7 @@ static CDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, if (csr_is_conn_state_wds(pMac, sessionId)) { CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_set(&bssConfig, sizeof(tBssConfigParam), 0); /* Assume HDD provide bssid in profile */ @@ -13255,7 +13255,7 @@ static CDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, status = csr_roam_prepare_bss_config_from_profile(pMac, pProfile, &bssConfig, pBssDesc); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Save profile for late use */ csr_free_roam_profile(pMac, sessionId); pSession->pCurRoamProfile = @@ -13303,7 +13303,7 @@ static void csr_add_supported_5Ghz_channels(tpAniSirGlobal mac_ctx, } size = sizeof(mac_ctx->roam.validChannelList); - if (CDF_IS_STATUS_SUCCESS + if (QDF_IS_STATUS_SUCCESS (csr_get_cfg_valid_channels(mac_ctx, (uint8_t *) mac_ctx->roam.validChannelList, &size))) { @@ -13335,12 +13335,12 @@ static void csr_add_supported_5Ghz_channels(tpAniSirGlobal mac_ctx, * the size of actual 'tSirBssDescription' varies, the receiving side should * keep in mind not to access the components DIRECTLY after tSirRSNie. */ -CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDescription, tCsrRoamProfile *pProfile, tDot11fBeaconIEs *pIes, uint16_t messageType) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t acm_mask = 0, uapsd_mask; uint16_t msgLen, ieLen; tSirMacRateSet OpRateSet; @@ -13361,12 +13361,12 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* To satisfy klockworks */ if (NULL == pBssDescription) { sms_log(pMac, LOGE, FL(" pBssDescription is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } do { @@ -13395,10 +13395,10 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, sizeof(uint16_t); csr_join_req = cdf_mem_malloc(msgLen); if (NULL == csr_join_req) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; cdf_mem_set(csr_join_req, msgLen, 0); csr_join_req->messageType = messageType; @@ -13457,7 +13457,7 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, &ExRateSet); ps_param->uapsd_per_ac_bit_mask = pProfile->uapsd_mask; - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* OperationalRateSet */ if (OpRateSet.numRates) { csr_join_req->operationalRateSet.numRates = @@ -13528,10 +13528,10 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, pSession->pWapiReqIE = cdf_mem_malloc(ieLen); if (NULL == pSession->pWapiReqIE) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; } pSession->nWapiReqIeLength = ieLen; @@ -13553,10 +13553,10 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, pSession->pWpaRsnReqIE = cdf_mem_malloc(ieLen); if (NULL == pSession->pWpaRsnReqIE) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; } pSession->nWpaRsnReqIeLength = ieLen; @@ -13623,10 +13623,10 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, } pSession->pAddIEScan = cdf_mem_malloc(ieLen); if (NULL == pSession->pAddIEScan) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; } pSession->nAddIEScanLength = ieLen; @@ -13653,10 +13653,10 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, } pSession->pAddIEAssoc = cdf_mem_malloc(ieLen); if (NULL == pSession->pAddIEAssoc) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; } pSession->nAddIEAssocLength = ieLen; @@ -13929,13 +13929,13 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("STA-conn on 5G isn't allowed")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } if (!CDS_IS_CHANNEL_5GHZ(pBssDescription->channelId) && (false == csr_is_conn_allow_2g_band(pMac, pBssDescription->channelId))) { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } } @@ -13951,12 +13951,12 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (!CDS_IS_CHANNEL_24GHZ(pBssDescription->channelId) && (false == csr_is_conn_allow_5g_band(pMac, pBssDescription->channelId))) { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } } status = cds_send_mb_message_to_mac(csr_join_req); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { /* * cds_send_mb_message_to_mac would've released the mem * allocated by csr_join_req. Let's make it defensive by @@ -13986,25 +13986,25 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, } while (0); /* Clean up the memory in case of any failure */ - if (!CDF_IS_STATUS_SUCCESS(status) && (NULL != csr_join_req)) + if (!QDF_IS_STATUS_SUCCESS(status) && (NULL != csr_join_req)) cdf_mem_free(csr_join_req); return status; } /* */ -CDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, tSirMacAddr bssId, uint16_t reasonCode) { tSirSmeDisassocReq *pMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!CSR_IS_SESSION_VALID(pMac, sessionId)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pMsg = cdf_mem_malloc(sizeof(tSirSmeDisassocReq)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, sizeof(tSirSmeDisassocReq), 0); pMsg->messageType = eWNI_SME_DISASSOC_REQ; @@ -14039,7 +14039,7 @@ CDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, return cds_send_mb_message_to_mac(pMsg); } -CDF_STATUS +QDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, CDF_MODULE_ID modId, struct cdf_mac_addr bssid, @@ -14047,12 +14047,12 @@ csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, void *pfnSapEventCallback, uint8_t *pAssocStasBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeGetAssocSTAsReq *pMsg; pMsg = cdf_mem_malloc(sizeof(*pMsg)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; pMsg->messageType = eWNI_SME_GET_ASSOC_STAS_REQ; cdf_copy_macaddr(&pMsg->bssid, &bssid); @@ -14067,22 +14067,22 @@ csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS +QDF_STATUS csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, uint32_t sessionId, struct cdf_mac_addr bssid, void *pUsrContext, void *pfnSapEventCallback, struct cdf_mac_addr remove_mac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeGetWPSPBCSessionsReq *pMsg; do { pMsg = cdf_mem_malloc(sizeof(tSirSmeGetWPSPBCSessionsReq)); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; cdf_mem_set(pMsg, sizeof(tSirSmeGetWPSPBCSessionsReq), 0); pMsg->messageType = eWNI_SME_GET_WPSPBC_SESSION_REQ; @@ -14097,20 +14097,20 @@ csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal pMac, uint32_t sessionId) { tpSirChangeBIParams pMsg; uint16_t len = 0; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* NO need to update the Beacon Params if update beacon parameter flag is not set */ if (!pMac->roam.roamSession[sessionId].bssParams.updatebeaconInterval) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; pMac->roam.roamSession[sessionId].bssParams.updatebeaconInterval = false; @@ -14119,10 +14119,10 @@ CDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal pMac, uint32_t sessi len = sizeof(tSirChangeBIParams); pMsg = cdf_mem_malloc(len); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(pMsg, sizeof(tSirChangeBIParams), 0); pMsg->messageType = eWNI_SME_CHNG_MCC_BEACON_INTERVAL; pMsg->length = len; @@ -14144,27 +14144,27 @@ CDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal pMac, uint32_t sessi } #ifdef QCA_HT_2040_COEX -CDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal pMac, uint32_t sessionId, ePhyChanBondState cbMode, bool obssEnabled) { tpSirSetHT2040Mode pMsg; uint16_t len = 0; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Create the message and send to lim */ len = sizeof(tSirSetHT2040Mode); pMsg = cdf_mem_malloc(len); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(pMsg, sizeof(tSirSetHT2040Mode), 0); pMsg->messageType = eWNI_SME_SET_HT_2040_MODE; pMsg->length = len; @@ -14184,18 +14184,18 @@ CDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal pMac, uint32_t sessionId, } #endif -CDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, tSirMacAddr bssId, uint16_t reasonCode) { tSirSmeDeauthReq *pMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!CSR_IS_SESSION_VALID(pMac, sessionId)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pMsg = cdf_mem_malloc(sizeof(tSirSmeDeauthReq)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, sizeof(tSirSmeDeauthReq), 0); pMsg->messageType = eWNI_SME_DEAUTH_REQ; @@ -14220,18 +14220,18 @@ CDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, return cds_send_mb_message_to_mac(pMsg); } -CDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeDisassocInd pDisassocInd) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeDisassocCnf *pMsg; do { pMsg = cdf_mem_malloc(sizeof(tSirSmeDisassocCnf)); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; cdf_mem_set(pMsg, sizeof(tSirSmeDisassocCnf), 0); pMsg->messageType = eWNI_SME_DISASSOC_CNF; @@ -14239,15 +14239,15 @@ CDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, pMsg->length = sizeof(tSirSmeDisassocCnf); cdf_copy_macaddr(&pMsg->peer_macaddr, &pDisassocInd->peer_macaddr); - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pMsg); break; } cdf_copy_macaddr(&pMsg->bssid, &pDisassocInd->bssid); - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pMsg); break; } @@ -14257,33 +14257,33 @@ CDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal pMac, tpSirSmeDeauthInd pDeauthInd) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeDeauthCnf *pMsg; do { pMsg = cdf_mem_malloc(sizeof(tSirSmeDeauthCnf)); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; cdf_mem_set(pMsg, sizeof(tSirSmeDeauthCnf), 0); pMsg->messageType = eWNI_SME_DEAUTH_CNF; pMsg->statusCode = eSIR_SME_SUCCESS; pMsg->length = sizeof(tSirSmeDeauthCnf); cdf_copy_macaddr(&pMsg->bssid, &pDeauthInd->bssid); - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pMsg); break; } cdf_copy_macaddr(&pMsg->peer_macaddr, &pDeauthInd->peer_macaddr); - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pMsg); break; } @@ -14292,10 +14292,10 @@ CDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, - CDF_STATUS Halstatus) +QDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, + QDF_STATUS Halstatus) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeAssocCnf *pMsg; sms_log(pMac, LOG1, @@ -14304,11 +14304,11 @@ CDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocIn do { pMsg = cdf_mem_malloc(sizeof(tSirSmeAssocCnf)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, sizeof(tSirSmeAssocCnf), 0); pMsg->messageType = eWNI_SME_ASSOC_CNF; pMsg->length = sizeof(tSirSmeAssocCnf); - if (CDF_IS_STATUS_SUCCESS(Halstatus)) + if (QDF_IS_STATUS_SUCCESS(Halstatus)) pMsg->statusCode = eSIR_SME_SUCCESS; else pMsg->statusCode = eSIR_SME_ASSOC_REFUSED; @@ -14331,9 +14331,9 @@ CDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocIn return status; } -CDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, - CDF_STATUS Halstatus, + QDF_STATUS Halstatus, uint8_t sessionId) { tSirMsgQ msgQ; @@ -14344,7 +14344,7 @@ CDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, do { pMsg = cdf_mem_malloc(sizeof(tSirSmeAssocIndToUpperLayerCnf)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, sizeof(tSirSmeAssocIndToUpperLayerCnf), 0); pMsg->messageType = eWNI_SME_UPPER_LAYER_ASSOC_CNF; @@ -14353,7 +14353,7 @@ CDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, pMsg->sessionId = sessionId; pBuf = (uint8_t *) &pMsg->statusCode; - if (CDF_IS_STATUS_SUCCESS(Halstatus)) + if (QDF_IS_STATUS_SUCCESS(Halstatus)) statusCode = eSIR_SME_SUCCESS; else statusCode = eSIR_SME_ASSOC_REFUSED; @@ -14409,10 +14409,10 @@ CDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, msgQ.bodyval = 0; sys_process_mmh_msg(pMac, &msgQ); } while (0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, struct cdf_mac_addr peer_macaddr, uint8_t numKeys, @@ -14424,7 +14424,7 @@ CDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, { tSirSmeSetContextReq *pMsg; uint16_t msgLen; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); sms_log(pMac, LOG1, FL("keylength is %d, Encry type is : %d"), keyLength, edType); @@ -14440,7 +14440,7 @@ CDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, pMsg = cdf_mem_malloc(msgLen); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, msgLen, 0); pMsg->messageType = eWNI_SME_SETCONTEXT_REQ; pMsg->length = msgLen; @@ -14486,7 +14486,7 @@ CDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamBssType bssType, tCsrRoamStartBssParams *pParam, tSirBssDescription *pBssDesc) @@ -14497,14 +14497,14 @@ CDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession->joinFailStatusCode.statusCode = eSIR_SME_SUCCESS; pSession->joinFailStatusCode.reasonCode = 0; pMsg = cdf_mem_malloc(sizeof(tSirSmeStartBssReq)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, sizeof(tSirSmeStartBssReq), 0); pMsg->messageType = eWNI_SME_START_BSS_REQ; @@ -14523,7 +14523,7 @@ CDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId wTmp = WNI_CFG_BEACON_INTERVAL_STADEF; if (csr_isconcurrentsession_valid(pMac, sessionId, pParam->bssPersona) - == CDF_STATUS_SUCCESS) { + == QDF_STATUS_SUCCESS) { csr_validate_mcc_beacon_interval(pMac, pParam->operationChn, &wTmp, @@ -14535,7 +14535,7 @@ CDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId sms_log(pMac, LOGE, FL("****Start BSS failed persona already exists***")); cdf_mem_free(pMsg); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMsg->beaconInterval = wTmp; pMsg->dot11mode = @@ -14578,7 +14578,7 @@ CDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId if (pParam->nRSNIELength > sizeof(pMsg->rsnIE.rsnIEdata)) { cdf_mem_free(pMsg); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } pMsg->rsnIE.length = pParam->nRSNIELength; cdf_mem_copy(pMsg->rsnIE.rsnIEdata, @@ -14603,19 +14603,19 @@ CDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId return cds_send_mb_message_to_mac(pMsg); } -CDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId) { tSirSmeStopBssReq *pMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMsg = cdf_mem_malloc(sizeof(tSirSmeStopBssReq)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, sizeof(tSirSmeStopBssReq), 0); pMsg->messageType = eWNI_SME_STOP_BSS_REQ; pMsg->sessionId = sessionId; @@ -14626,11 +14626,11 @@ CDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId) return cds_send_mb_message_to_mac(pMsg); } -CDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamModifyProfileFields *pModProfileFields, uint32_t *pRoamId, bool fForce) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t roamId = 0; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if ((csr_is_conn_state_connected(pMac, sessionId)) && @@ -14652,10 +14652,10 @@ CDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -static CDF_STATUS csr_roam_session_opened(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_session_opened(tpAniSirGlobal pMac, uint32_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo roamInfo; cdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); status = csr_roam_call_callback(pMac, sessionId, &roamInfo, 0, @@ -14664,34 +14664,34 @@ static CDF_STATUS csr_roam_session_opened(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) +QDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) { tListElem *pEntry = NULL; tSmeCmd *pCommand = NULL; struct add_sta_self_params *rsp; struct send_extcap_ie *msg; - CDF_STATUS status; + QDF_STATUS status; if (pMsg == NULL) { sms_log(pMac, LOGE, "in %s msg ptr is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pEntry = csr_ll_peek_head(&pMac->sme.smeCmdActiveList, LL_ACCESS_LOCK); if (!pEntry) { sms_log(pMac, LOGE, "in %s NO commands are ACTIVE ...", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link); if (eSmeCommandAddStaSession != pCommand->command) { sms_log(pMac, LOGE, "in %s Cmd not in active list ...", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } rsp = (struct add_sta_self_params *) pMsg; sms_log(pMac, LOG1, "Add Sta self rsp status = %d", rsp->status); - if (CDF_STATUS_SUCCESS == rsp->status && + if (QDF_STATUS_SUCCESS == rsp->status && (WMI_VDEV_TYPE_STA == rsp->type || (WMI_VDEV_TYPE_AP == rsp->type && WMI_UNIFIED_VDEV_SUBTYPE_P2P_DEVICE == rsp->sub_type))) { @@ -14699,7 +14699,7 @@ CDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) msg = cdf_mem_malloc(sizeof(*msg)); if (NULL == msg) { sms_log(pMac, LOGE, FL("Memory allocation failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(msg, sizeof(*msg), 0); @@ -14707,7 +14707,7 @@ CDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) msg->session_id = rsp->session_id; msg->length = sizeof(*msg); status = cds_send_mb_message_to_mac(msg); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(pMac, LOGE, FL("Failed to send down the set IE req ")); } @@ -14720,18 +14720,18 @@ CDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) csr_release_command(pMac, pCommand); } sme_process_pending_queue(pMac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_issue_add_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_issue_add_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessionId, tSirMacAddr sessionMacAddr, uint32_t type, uint32_t subType) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; pCommand = csr_get_command_buffer(pMac); if (NULL == pCommand) { - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } else { pCommand->command = eSmeCommandAddStaSession; pCommand->sessionId = (uint8_t) sessionId; @@ -14742,7 +14742,7 @@ CDF_STATUS csr_issue_add_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessi pCommand->u.addStaSessionCmd.type = type; pCommand->u.addStaSessionCmd.subType = subType; status = csr_queue_sme_command(pMac, pCommand, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { /* Should be panic?? */ sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); @@ -14751,14 +14751,14 @@ CDF_STATUS csr_issue_add_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessi return status; } -CDF_STATUS csr_process_add_sta_session_command(tpAniSirGlobal pMac, +QDF_STATUS csr_process_add_sta_session_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { tAddStaForSessionCmd *pAddStaReq = &pCommand->u.addStaSessionCmd; uint8_t sessionId = pCommand->sessionId; struct add_sta_self_params *add_sta_self_req; - CDF_STATUS status = CDF_STATUS_E_NOMEM; + QDF_STATUS status = QDF_STATUS_E_NOMEM; tSirMsgQ msg; add_sta_self_req = cdf_mem_malloc(sizeof(struct add_sta_self_params)); @@ -14788,7 +14788,7 @@ CDF_STATUS csr_process_add_sta_session_command(tpAniSirGlobal pMac, MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msg.type)); status = wma_post_ctrl_msg(pMac, &msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { lim_log(pMac, LOGP, FL("wma_post_ctrl_msg failed")); cdf_mem_free(add_sta_self_req); add_sta_self_req = NULL; @@ -14796,13 +14796,13 @@ CDF_STATUS csr_process_add_sta_session_command(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, csr_roam_completeCallback callback, void *pContext, uint8_t *pSelfMacAddr, uint8_t *pbSessionId, uint32_t type, uint32_t subType) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t i, value = 0; union { uint16_t nCfgValue16; @@ -14821,7 +14821,7 @@ CDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, i); break; } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; pSession->sessionActive = true; pSession->sessionId = (uint8_t) i; @@ -14838,7 +14838,7 @@ CDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, CDF_TIMER_TYPE_SW, csr_roam_roaming_timer_handler, &pSession->roamingTimerInfo); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("cannot allocate memory for Roaming timer")); @@ -14859,7 +14859,7 @@ CDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, csr_roam_join_retry_timer_handler, &pSession-> joinRetryTimerInfo); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("cannot allocate memory for join retry timer")); @@ -14885,14 +14885,14 @@ CDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, sms_log(pMac, LOGE, "%s: Reached max interfaces: %d! Session creation will fail", __func__, pMac->sme.max_intf_count); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } return status; } -CDF_STATUS csr_process_del_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) +QDF_STATUS csr_process_del_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tListElem *pEntry = NULL; tSmeCmd *pCommand = NULL; struct del_sta_self_params *rsp; @@ -14919,13 +14919,13 @@ CDF_STATUS csr_process_del_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) csr_cleanup_session(pMac, sessionId); if (pCommand->u.delStaSessionCmd.callback) { status = sme_release_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(pMac, LOG1, FL("Failed to Release Lock")); else { pCommand->u.delStaSessionCmd. callback(pCommand->u.delStaSessionCmd.pContext); status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, FL("Failed to get Lock")); return status; } @@ -14938,21 +14938,21 @@ CDF_STATUS csr_process_del_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) csr_release_command(pMac, pCommand); } sme_process_pending_queue(pMac); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; return status; } -CDF_STATUS csr_issue_del_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_issue_del_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessionId, tSirMacAddr sessionMacAddr, csr_roamSessionCloseCallback callback, void *pContext) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; pCommand = csr_get_command_buffer(pMac); if (NULL == pCommand) { - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } else { pCommand->command = eSmeCommandDelStaSession; pCommand->sessionId = (uint8_t) sessionId; @@ -14961,7 +14961,7 @@ CDF_STATUS csr_issue_del_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessi cdf_mem_copy(pCommand->u.delStaSessionCmd.selfMacAddr, sessionMacAddr, sizeof(tSirMacAddr)); status = csr_queue_sme_command(pMac, pCommand, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { /* Should be panic?? */ sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); @@ -14970,17 +14970,17 @@ CDF_STATUS csr_issue_del_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessi return status; } -CDF_STATUS csr_process_del_sta_session_command(tpAniSirGlobal pMac, +QDF_STATUS csr_process_del_sta_session_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { struct del_sta_self_params *del_sta_self_req; tSirMsgQ msg; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; del_sta_self_req = cdf_mem_malloc(sizeof(struct del_sta_self_params)); if (NULL == del_sta_self_req) { lim_log(pMac, LOGP, FL(" mem alloc failed for tDelStaSelfParams")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(del_sta_self_req->self_mac_addr, @@ -14997,7 +14997,7 @@ CDF_STATUS csr_process_del_sta_session_command(tpAniSirGlobal pMac, FL("sending WMA_DEL_STA_SELF_REQ")); MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msg.type)); status = wma_post_ctrl_msg(pMac, &msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGP, FL("wma_post_ctrl_msg failed")); cdf_mem_free(del_sta_self_req); } @@ -15012,7 +15012,7 @@ static void purge_csr_session_cmd_list(tpAniSirGlobal pMac, uint32_t sessionId) tDblLinkList localList; cdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!CDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return; } @@ -15065,12 +15065,12 @@ void csr_cleanup_session(tpAniSirGlobal pMac, uint32_t sessionId) } } -CDF_STATUS csr_roam_close_session(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_close_session(tpAniSirGlobal pMac, uint32_t sessionId, bool fSync, csr_roamSessionCloseCallback callback, void *pContext) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (CSR_IS_SESSION_VALID(pMac, sessionId)) { tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (fSync) { @@ -15088,7 +15088,7 @@ CDF_STATUS csr_roam_close_session(tpAniSirGlobal pMac, uint32_t sessionId, callback, pContext); } } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } return status; } @@ -15147,11 +15147,11 @@ static void csr_init_session(tpAniSirGlobal pMac, uint32_t sessionId) pSession->nAddIEAssocLength = 0; } -CDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, struct cdf_mac_addr *bssid, uint32_t *pSessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t i; for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) { if (CSR_IS_SESSION_VALID(pMac, i)) { @@ -15159,7 +15159,7 @@ CDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, &pMac->roam.roamSession[i].connectedProfile. bssid)) { /* Found it */ - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; *pSessionId = i; break; } @@ -15217,7 +15217,7 @@ static void csr_roam_link_up(tpAniSirGlobal pMac, struct cdf_mac_addr bssid) csr_roam_get_session_id_from_bssid(pMac, &bssid, &sessionId); csr_neighbor_roam_indicate_connect(pMac, sessionId, - CDF_STATUS_SUCCESS); + QDF_STATUS_SUCCESS); } static void csr_roam_link_down(tpAniSirGlobal pMac, uint32_t sessionId) @@ -15264,7 +15264,7 @@ static void csr_roam_link_down(tpAniSirGlobal pMac, uint32_t sessionId) void csr_roam_tl_stats_timer_handler(void *pv) { tpAniSirGlobal pMac = PMAC_STRUCT(pv); - CDF_STATUS status; + QDF_STATUS status; pMac->roam.tlStatsReqInfo.timerRunning = false; sms_log(pMac, LOG1, @@ -15279,7 +15279,7 @@ void csr_roam_tl_stats_timer_handler(void *pv) hTlStatsTimer, pMac->roam.tlStatsReqInfo. periodicity); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("csr_roam_tl_stats_timer_handler:cannot start TlStatsTimer timer")); @@ -15293,18 +15293,18 @@ void csr_roam_tl_stats_timer_handler(void *pv) void csr_roam_pe_stats_timer_handler(void *pv) { tCsrPeStatsReqInfo *pPeStatsReqListEntry = (tCsrPeStatsReqInfo *) pv; - CDF_STATUS status; + QDF_STATUS status; tpAniSirGlobal pMac = pPeStatsReqListEntry->pMac; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; pPeStatsReqListEntry->timerRunning = false; if (pPeStatsReqListEntry->timerStopFailed == true) { /* If we entered here, meaning the timer could not be successfully */ /* stopped in csr_roam_remove_entry_from_pe_stats_req_list(). So do it here. */ /* Destroy the timer */ - cdf_status = + qdf_status = cdf_mc_timer_destroy(&pPeStatsReqListEntry->hPeStatsTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(pMac, LOGE, FL ("csr_roam_pe_stats_timer_handler:failed to destroy hPeStatsTimer timer")); @@ -15322,7 +15322,7 @@ void csr_roam_pe_stats_timer_handler(void *pv) pPeStatsReqListEntry->staId, pPeStatsReqListEntry-> sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("csr_roam_pe_stats_timer_handler:failed to send down stats req to PE")); @@ -15343,12 +15343,12 @@ void csr_roam_pe_stats_timer_handler(void *pv) statsReqPeriodicityInPS; } /* start timer */ - cdf_status = + qdf_status = cdf_mc_timer_start(&pPeStatsReqListEntry-> hPeStatsTimer, pPeStatsReqListEntry-> periodicity); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(pMac, LOGE, FL ("csr_roam_pe_stats_timer_handler:cannot start hPeStatsTimer timer")); @@ -15371,15 +15371,15 @@ void csr_roam_stats_client_timer_handler(void *pv) } } -CDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal pMac, uint32_t statsMask, +QDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal pMac, uint32_t statsMask, uint8_t staId, uint8_t sessionId) { tAniGetPEStatsReq *pMsg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; pMsg = cdf_mem_malloc(sizeof(tAniGetPEStatsReq)); if (NULL == pMsg) { sms_log(pMac, LOGE, FL("Failed to allocate mem for stats req ")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /* need to initiate a stats request to PE */ pMsg->msgType = eWNI_SME_GET_STATISTICS_REQ; @@ -15388,7 +15388,7 @@ CDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal pMac, uint32_t statsMask, pMsg->statsMask = statsMask; pMsg->sessionId = sessionId; status = cds_send_mb_message_to_mac(pMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, FL("Failed to send down the stats req ")); } return status; @@ -15755,13 +15755,13 @@ tCsrPeStatsReqInfo *csr_roam_insert_entry_into_pe_stats_req_list(tpAniSirGlobal return pNewStaEntry; } -CDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, +QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, tCsrRssiCallback callback, uint8_t staId, struct cdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t msg; uint32_t sessionId; @@ -15769,17 +15769,17 @@ CDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, sms_log(pMac, LOG2, FL("called")); status = csr_roam_get_session_id_from_bssid(pMac, &bssId, &sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { callback(lastRSSI, staId, pContext); sms_log(pMac, LOGE, FL("Failed to get SessionId")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMsg = cdf_mem_malloc(sizeof(tAniGetRssiReq)); if (NULL == pMsg) { sms_log(pMac, LOGE, " csr_get_rssi: failed to allocate mem for req "); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMsg->msgType = eWNI_SME_GET_RSSI_REQ; @@ -15797,20 +15797,20 @@ CDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, msg.type = eWNI_SME_GET_RSSI_REQ; msg.bodyptr = pMsg; msg.reserved = 0; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(pMac, LOGE, " csr_get_rssi failed to post msg to self "); cdf_mem_free((void *)pMsg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG2, FL("returned")); return status; } -CDF_STATUS csr_get_snr(tpAniSirGlobal pMac, +QDF_STATUS csr_get_snr(tpAniSirGlobal pMac, tCsrSnrCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t msg; uint32_t sessionId; @@ -15822,7 +15822,7 @@ CDF_STATUS csr_get_snr(tpAniSirGlobal pMac, if (NULL == pMsg) { sms_log(pMac, LOGE, "%s: failed to allocate mem for req", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } csr_roam_get_session_id_from_bssid(pMac, &bssId, &sessionId); @@ -15837,10 +15837,10 @@ CDF_STATUS csr_get_snr(tpAniSirGlobal pMac, msg.bodyptr = pMsg; msg.reserved = 0; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(pMac, LOGE, "%s failed to post msg to self", __func__); cdf_mem_free((void *)pMsg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG2, FL("returned")); @@ -15848,19 +15848,19 @@ CDF_STATUS csr_get_snr(tpAniSirGlobal pMac, } #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, +QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, tCsrTsmStatsCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tAniGetTsmStatsReq *pMsg = NULL; pMsg = cdf_mem_malloc(sizeof(tAniGetTsmStatsReq)); if (!pMsg) { sms_log(pMac, LOGE, "csr_get_tsm_stats: failed to allocate mem for req"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /* need to initiate a stats request to PE */ pMsg->msgType = eWNI_SME_GET_TSM_STATS_REQ; @@ -15872,11 +15872,11 @@ CDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, pMsg->pDevContext = pContext; pMsg->p_cds_context = p_cds_context; status = cds_send_mb_message_to_mac(pMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, " csr_get_tsm_stats: failed to send down the rssi req"); /* pMsg is freed by cds_send_mb_message_to_mac */ - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; } @@ -15889,11 +15889,11 @@ CDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, * * Return: status of operation */ -static CDF_STATUS +static QDF_STATUS csr_deregister_client_request(tpAniSirGlobal mac_ctx, tCsrStatsClientReqInfo *sta_entry) { - CDF_STATUS status; + QDF_STATUS status; tListElem *entry = NULL; tCsrStatsClientReqInfo *ptr_sta_entry = NULL; @@ -15902,7 +15902,7 @@ csr_deregister_client_request(tpAniSirGlobal mac_ctx, if (!entry) { sms_log(mac_ctx, LOGW, FL("callback is empty in the request & couldn't find any existing request in statsClientReqList")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* clean up & return */ ptr_sta_entry = GET_BASE_ADDR(entry, tCsrStatsClientReqInfo, link); @@ -15919,7 +15919,7 @@ csr_deregister_client_request(tpAniSirGlobal mac_ctx, if (mac_ctx->roam.tlStatsReqInfo.timerRunning) { status = cdf_mc_timer_stop( &mac_ctx->roam.tlStatsReqInfo.hTlStatsTimer); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("cannot stop TlStatsTimer timer")); return status; @@ -15931,12 +15931,12 @@ csr_deregister_client_request(tpAniSirGlobal mac_ctx, cdf_mc_timer_stop(&ptr_sta_entry->timer); /* Destroy the cdf timer... */ status = cdf_mc_timer_destroy(&ptr_sta_entry->timer); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(mac_ctx, LOGE, FL("failed to destroy Client req timer")); csr_roam_remove_stat_list_entry(mac_ctx, entry); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -15947,19 +15947,19 @@ csr_deregister_client_request(tpAniSirGlobal mac_ctx, * * Return: status of operation */ -static CDF_STATUS +static QDF_STATUS csr_insert_stats_request_to_list(tpAniSirGlobal mac_ctx, tCsrStatsClientReqInfo *sta_entry, uint32_t periodicity) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrStatsClientReqInfo *ptr_sta_entry = csr_roam_insert_entry_into_list( mac_ctx, &mac_ctx->roam.statsClientReqList, sta_entry); if (!ptr_sta_entry) { sms_log(mac_ctx, LOGW, FL("Failed to insert req in statsClientReqList")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Init & start timer if needed */ ptr_sta_entry->periodicity = periodicity; @@ -15968,17 +15968,17 @@ csr_insert_stats_request_to_list(tpAniSirGlobal mac_ctx, CDF_TIMER_TYPE_SW, csr_roam_stats_client_timer_handler, ptr_sta_entry); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("cannot init StatsClient timer")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = cdf_mc_timer_start(&ptr_sta_entry->timer, ptr_sta_entry->periodicity); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("cannot start StatsClient timer")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } return status; @@ -15993,18 +15993,18 @@ csr_insert_stats_request_to_list(tpAniSirGlobal mac_ctx, * * Return: status of operation */ -static CDF_STATUS +static QDF_STATUS csr_get_statistics_from_tl(tpAniSirGlobal mac_ctx, bool cache, uint8_t staId, uint32_t periodicity) { - CDF_STATUS status; + QDF_STATUS status; if (cache && mac_ctx->roam.tlStatsReqInfo.numClient) { sms_log(mac_ctx, LOGE, FL("Looking for cached stats from TL")); mac_ctx->roam.tlStatsReqInfo.numClient++; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* update periodicity */ @@ -16028,19 +16028,19 @@ csr_get_statistics_from_tl(tpAniSirGlobal mac_ctx, status = cdf_mc_timer_start( &mac_ctx->roam.tlStatsReqInfo.hTlStatsTimer, mac_ctx->roam.tlStatsReqInfo.periodicity); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("cannot start TlStatsTimer timer")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mac_ctx->roam.tlStatsReqInfo.timerRunning = true; } } mac_ctx->roam.tlStatsReqInfo.numClient++; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, +QDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requesterId, uint32_t statsMask, tCsrStatsCallback callback, @@ -16053,22 +16053,22 @@ CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, tCsrStatsClientReqInfo staEntry; tCsrPeStatsReqInfo *pPeStaEntry = NULL; bool found = false; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; bool insertInClientList = false; uint32_t temp_mask = 0; if (csr_is_all_session_disconnected(pMac)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (csr_neighbor_middle_of_roaming(pMac, sessionId)) { sms_log(pMac, LOG1, FL("in the middle of roaming states")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if ((!statsMask) && (!callback)) { sms_log(pMac, LOGW, FL("statsMask & callback empty in the request")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* for the search list method for deregister */ staEntry.requesterId = requesterId; @@ -16081,7 +16081,7 @@ CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, /* return the cached stats */ csr_roam_report_statistics(pMac, statsMask, callback, staId, pContext); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* add the request in the client req list */ staEntry.callback = callback; @@ -16104,7 +16104,7 @@ CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, staId, sessionId); if (!pPeStaEntry) /* bail out, maxed out on num of req for PE */ - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; else staEntry.pPeStaEntry = pPeStaEntry; } @@ -16116,7 +16116,7 @@ CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, if (temp_mask) { status = csr_get_statistics_from_tl(pMac, cache, staId, periodicity); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; } insertInClientList = true; @@ -16128,7 +16128,7 @@ CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, /* send down a req */ status = csr_send_mb_stats_req_msg(pMac, temp_mask, staId, sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(pMac, LOGE, FL("failed to send down stats req")); /* @@ -16143,14 +16143,14 @@ CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, /* return the stats */ csr_roam_report_statistics(pMac, statsMask, callback, staId, pContext); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } if (insertInClientList) return csr_insert_stats_request_to_list(pMac, &staEntry, periodicity); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static tSirRetStatus @@ -16270,17 +16270,17 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac, } #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS csr_roam_set_key_mgmt_offload(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_set_key_mgmt_offload(tpAniSirGlobal pMac, uint32_t sessionId, bool nRoamKeyMgmtOffloadEnabled) { tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession->RoamKeyMgmtOffloadEnabled = nRoamKeyMgmtOffloadEnabled; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -16368,7 +16368,7 @@ csr_check_band_channel_match(eCsrBand band, uint8_t channel) * * Return: result of operation */ -static CDF_STATUS +static QDF_STATUS csr_fetch_ch_lst_from_ini(tpAniSirGlobal mac_ctx, tpCsrNeighborRoamControlInfo roam_info, tSirRoamOffloadScanReq *req_buf) @@ -16387,7 +16387,7 @@ csr_fetch_ch_lst_from_ini(tpAniSirGlobal mac_ctx, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Invalid band(%d), roam scan offload req aborted"), band); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } for (i = 0; i < roam_info->cfgParams.channelInfo.numOfChannels; i++) { @@ -16406,7 +16406,7 @@ csr_fetch_ch_lst_from_ini(tpAniSirGlobal mac_ctx, } req_buf->ConnectedNetwork.ChannelCount = num_channels; req_buf->ChannelCacheType = CHANNEL_LIST_STATIC; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -16519,11 +16519,11 @@ csr_fetch_ch_lst_from_received_list(tpAniSirGlobal mac_ctx, * * Return: void */ -static CDF_STATUS +static QDF_STATUS csr_fetch_valid_ch_lst(tpAniSirGlobal mac_ctx, tSirRoamOffloadScanReq *req_buf) { - CDF_STATUS status; + QDF_STATUS status; uint32_t host_channels = 0; uint8_t *ch_lst = NULL; uint8_t i = 0, num_channels = 0; @@ -16532,7 +16532,7 @@ csr_fetch_valid_ch_lst(tpAniSirGlobal mac_ctx, status = csr_get_cfg_valid_channels(mac_ctx, mac_ctx->roam.validChannelList, &host_channels); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to get the valid channel list")); return status; @@ -16572,7 +16572,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, tpCsrNeighborRoamControlInfo roam_info) { - CDF_STATUS status; + QDF_STATUS status; uint8_t i, j, dot11_mode; bool ese_neighbor_list_recvd = false; uint8_t ch_cache_str[128] = { 0 }; @@ -16683,7 +16683,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, if (roam_info->cfgParams.channelInfo.numOfChannels) { status = csr_fetch_ch_lst_from_ini(mac_ctx, roam_info, req_buf); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(req_buf); return NULL; } @@ -16719,7 +16719,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, /* Maintain the Valid Channels List */ status = csr_fetch_valid_ch_lst(mac_ctx, req_buf); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(req_buf); return NULL; } @@ -16913,14 +16913,14 @@ bool csr_is_RSO_cmd_allowed(tpAniSirGlobal mac_ctx, uint8_t command, * * Return: result of operation */ -CDF_STATUS +QDF_STATUS csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, uint8_t command, uint8_t reason) { uint8_t *state = NULL; cds_msg_t msg; tSirRoamOffloadScanReq *req_buf; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); tpCsrNeighborRoamControlInfo roam_info = &mac_ctx->roam.neighborRoamInfo[session_id]; @@ -16932,7 +16932,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, if (NULL == session) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session is null")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->roam_synch_in_progress @@ -16943,25 +16943,25 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, * expecting any WMI commands when the roam synch is in progress */ b_roam_scan_offload_started = false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif if (0 == csr_roam_is_roam_offload_scan_enabled(mac_ctx)) { sms_log(mac_ctx, LOGE, "isRoamOffloadScanEnabled not set"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!csr_is_RSO_cmd_allowed(mac_ctx, command, session_id) && reason != REASON_ROAM_SET_BLACKLIST_BSSID) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("RSO out-of-sync command %d lastSentCmd %d"), command, roam_info->last_sent_cmd); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if ((true == b_roam_scan_offload_started) && (ROAM_SCAN_OFFLOAD_START == command)) { sms_log(mac_ctx, LOGE, "Roam Scan Offload is already started"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* * The Dynamic Config Items Update may happen even if the state is in @@ -16982,7 +16982,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("Scan Command not sent to FW state=%s and cmd=%d"), state, command); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } req_buf = csr_create_roam_scan_offload_request(mac_ctx, command, @@ -16991,7 +16991,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, if (!req_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to create req packet")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } roam_params_dst = &req_buf->roam_params; roam_params_src = &mac_ctx->roam.configParam.roam_params; @@ -17085,13 +17085,13 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, msg.type = WMA_ROAM_SCAN_OFFLOAD_REQ; msg.reserved = 0; msg.bodyptr = req_buf; - 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 message to WMA", __func__); cdf_mem_free(req_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else { if (ROAM_SCAN_OFFLOAD_START == command) b_roam_scan_offload_started = true; @@ -17106,7 +17106,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, return status; } -CDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, tpSirRoamOffloadScanRsp scanOffloadRsp) { switch (scanOffloadRsp->reason) { @@ -17124,7 +17124,7 @@ CDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, "Rsp for Roam Scan Offload with reason %d", scanOffloadRsp->reason); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, @@ -17134,11 +17134,11 @@ tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, uint8_t staId, uint8_t sessionId) { bool found = false; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrPeStatsReqInfo staEntry; tCsrPeStatsReqInfo *pTempStaEntry = NULL; tListElem *pStaEntry = NULL; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; *pFound = false; pStaEntry = csr_roam_find_in_pe_stats_req_list(pMac, statsMask); @@ -17186,7 +17186,7 @@ tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, statsMask & ~(1 << eCsrGlobalClassDStats), staId, sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("csr_roam_check_pe_stats_req_list:failed to send down stats req to PE")); @@ -17197,13 +17197,13 @@ tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, if (pTempStaEntry->periodicity) { if (!found) { - cdf_status = + qdf_status = cdf_mc_timer_init(&pTempStaEntry-> hPeStatsTimer, CDF_TIMER_TYPE_SW, csr_roam_pe_stats_timer_handler, pTempStaEntry); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(pMac, LOGE, FL ("csr_roam_check_pe_stats_req_list:cannot init hPeStatsTimer timer")); @@ -17214,10 +17214,10 @@ tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, sms_log(pMac, LOG1, "csr_roam_check_pe_stats_req_list:peStatsTimer period %d", pTempStaEntry->periodicity); - cdf_status = + qdf_status = cdf_mc_timer_start(&pTempStaEntry->hPeStatsTimer, pTempStaEntry->periodicity); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(pMac, LOGE, FL ("csr_roam_check_pe_stats_req_list:cannot start hPeStatsTimer timer")); @@ -17249,7 +17249,7 @@ void csr_roam_remove_entry_from_pe_stats_req_list(tpAniSirGlobal pMac, { tListElem *pEntry; tCsrPeStatsReqInfo *pTempStaEntry; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; pEntry = csr_ll_peek_head(&pMac->roam.peStatsReqList, LL_ACCESS_LOCK); if (!pEntry) { sms_log(pMac, LOGE, FL(" List empty, no stats req for PE")); @@ -17266,18 +17266,18 @@ void csr_roam_remove_entry_from_pe_stats_req_list(tpAniSirGlobal pMac, } sms_log(pMac, LOGW, FL("Match found")); if (pTempStaEntry->timerRunning) { - cdf_status = cdf_mc_timer_stop( + qdf_status = cdf_mc_timer_stop( &pTempStaEntry->hPeStatsTimer); /* * If we are not able to stop the timer here, just * remove the entry from the linked list. Destroy the * timer object and free the memory in the timer CB */ - if (cdf_status == CDF_STATUS_SUCCESS) { + if (qdf_status == QDF_STATUS_SUCCESS) { /* the timer is successfully stopped */ pTempStaEntry->timerRunning = false; /* Destroy the timer */ - cdf_status = cdf_mc_timer_destroy( + qdf_status = cdf_mc_timer_destroy( &pTempStaEntry->hPeStatsTimer); } else { /* @@ -17287,7 +17287,7 @@ void csr_roam_remove_entry_from_pe_stats_req_list(tpAniSirGlobal pMac, */ pTempStaEntry->timerStopFailed = true; } - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(pMac, LOGE, FL("failed to stop/destroy timer")); } @@ -17394,13 +17394,13 @@ void csr_roam_report_statistics(tpAniSirGlobal pMac, uint32_t statsMask, callback(stats, pContext); } -CDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac) +QDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac) { tListElem *pEntry = NULL; tListElem *pPrevEntry = NULL; tCsrStatsClientReqInfo *pTempStaEntry = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status; pEntry = csr_ll_peek_head(&pMac->roam.statsClientReqList, LL_ACCESS_LOCK); if (!pEntry) { /* list empty */ @@ -17441,7 +17441,7 @@ CDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac) cdf_mc_timer_stop(&pMac->roam. tlStatsReqInfo. hTlStatsTimer); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("csr_roam_dereg_statistics_req:cannot stop TlStatsTimer timer")); @@ -17458,9 +17458,9 @@ CDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac) cdf_mc_timer_stop(&pTempStaEntry->timer); /* Destroy the cdf timer... */ - cdf_status = + qdf_status = cdf_mc_timer_destroy(&pTempStaEntry->timer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(pMac, LOGE, FL ("csr_roam_dereg_statistics_req:failed to destroy Client req timer")); @@ -17510,7 +17510,7 @@ void csr_release_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) } /* Return SUCCESS is the command is queued, failed */ -CDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, +QDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, bool fHighPriority) { bool fNoCmdPending; @@ -17518,13 +17518,13 @@ CDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, if (!SME_IS_START(pMac)) { sms_log(pMac, LOGE, FL("Sme in stop state")); CDF_ASSERT(0); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if ((eSmeCommandScan == pCommand->command) && pMac->scan.fDropScanCmd) { sms_log(pMac, LOGW, FL(" drop scan (scan reason %d) command"), pCommand->u.scanCmd.reason); - return CDF_STATUS_CSR_WRONG_STATE; + return QDF_STATUS_CSR_WRONG_STATE; } if ((pCommand->command == eSmeCommandScan) @@ -17537,7 +17537,7 @@ CDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, &pCommand->Link, LL_ACCESS_LOCK); /* process the command queue... */ sme_process_pending_queue(pMac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* Make sure roamCmdPendingList is not empty first */ fNoCmdPending = @@ -17554,13 +17554,13 @@ CDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, &pCommand->Link, false); } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId, tSirAPWPSIEs *pAPWPSIES) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirUpdateAPWPSIEsReq *pMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -17568,12 +17568,12 @@ CDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId, sms_log(pMac, LOGE, FL("Session does not exist for session id %d"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMsg = cdf_mem_malloc(sizeof(*pMsg)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; pMsg->messageType = eWNI_SME_UPDATE_APWPSIE_REQ; pMsg->transactionId = 0; @@ -17586,22 +17586,22 @@ CDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_update_wparsni_es(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_update_wparsni_es(tpAniSirGlobal pMac, uint32_t sessionId, tSirRSNie *pAPSirRSNie) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirUpdateAPWPARSNIEsReq *pMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL == pSession) { sms_log(pMac, LOGE, FL(" Session does not exist for session id %d"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } do { pMsg = cdf_mem_malloc(sizeof(tSirUpdateAPWPARSNIEsReq)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, sizeof(tSirUpdateAPWPARSNIEsReq), 0); pMsg->messageType = eWNI_SME_SET_APWPARSNIEs_REQ; pMsg->transactionId = 0; @@ -17615,7 +17615,7 @@ CDF_STATUS csr_roam_update_wparsni_es(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS +QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, tpSirBssDescription pBssDescription) { @@ -17628,7 +17628,7 @@ csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, sms_log(pMac, LOGE, FL("Session does not exist for session id(%d)"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } auth_req_len = sizeof(tSirFTPreAuthReq); @@ -17636,7 +17636,7 @@ csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, if (NULL == pftPreAuthReq) { sms_log(pMac, LOGE, FL("Memory allocation for FT Preauth request failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /* Save the SME Session ID here. We need it while processing the preauth response */ pSession->ftSmeContext.smeSessionId = sessionId; @@ -17648,7 +17648,7 @@ csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, if (NULL == pftPreAuthReq->pbssDescription) { sms_log(pMac, LOGE, FL("Memory allocation for FT Preauth request failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pftPreAuthReq->messageType = eWNI_SME_FT_PRE_AUTH_REQ; @@ -17691,7 +17691,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, tpSirFTPreAuthRsp pFTPreAuthRsp) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo roamInfo; eCsrAuthType conn_Auth_type; uint32_t sessionId = pFTPreAuthRsp->smeSessionId; @@ -17704,7 +17704,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, status = csr_neighbor_roam_preauth_rsp_handler(pMac, pFTPreAuthRsp->smeSessionId, pFTPreAuthRsp->status); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { /* * Bail out if pre-auth was not even processed. */ @@ -17715,7 +17715,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, } /* The below function calls/timers should be invoked only if the pre-auth is successful */ - if (CDF_STATUS_SUCCESS != (CDF_STATUS) pFTPreAuthRsp->status) + if (QDF_STATUS_SUCCESS != (QDF_STATUS) pFTPreAuthRsp->status) return; /* Implies a success */ pSession->ftSmeContext.FTState = eFT_AUTH_COMPLETE; @@ -17736,7 +17736,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, status = cdf_mc_timer_start(&pSession->ftSmeContext.preAuthReassocIntvlTimer, 60); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(pMac, LOGE, FL ("Preauth reassoc interval timer start failed to start with status %d"), @@ -17881,11 +17881,11 @@ bool csr_roam_is_sta_mode(tpAniSirGlobal pMac, uint32_t sessionId) return false; } -CDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, +QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, uint8_t sessionId, tCsrHandoffRequest *pHandoffInfo) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t msg; tAniHandoffReq *pMsg; @@ -17893,7 +17893,7 @@ CDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, if (NULL == pMsg) { sms_log(pMac, LOGE, " csr_handoff_request: failed to allocate mem for req "); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMsg->msgType = eWNI_SME_HANDOFF_REQ; pMsg->msgLen = (uint16_t) sizeof(tAniHandoffReq); @@ -17904,11 +17904,11 @@ CDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, msg.type = eWNI_SME_HANDOFF_REQ; msg.bodyptr = pMsg; msg.reserved = 0; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(pMac, LOGE, " csr_handoff_request failed to post msg to self "); cdf_mem_free((void *)pMsg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; } @@ -17925,14 +17925,14 @@ CDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, \param ccKmIeLen - length of the CCKM IE \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS csr_set_cckm_ie(tpAniSirGlobal pMac, const uint8_t sessionId, +QDF_STATUS csr_set_cckm_ie(tpAniSirGlobal pMac, const uint8_t sessionId, const uint8_t *pCckmIe, const uint8_t ccKmIeLen) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(pSession->suppCckmIeInfo.cckmIe, pCckmIe, ccKmIeLen); pSession->suppCckmIeInfo.cckmIeLen = ccKmIeLen; @@ -17948,10 +17948,10 @@ CDF_STATUS csr_set_cckm_ie(tpAniSirGlobal pMac, const uint8_t sessionId, \param pTimestamp - output TSF timestamp \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, +QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrNeighborRoamBSSInfo handoffNode; uint32_t timer_diff = 0; uint32_t timeStamp[2]; @@ -17981,20 +17981,20 @@ CDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, * This API is primarily used to post * Channel Change Req for SAP * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, struct cdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirChanChangeRequest *pMsg; tCsrRoamStartBssParams param; csr_roam_get_bss_start_parms(pMac, profile, ¶m); pMsg = cdf_mem_malloc(sizeof(tSirChanChangeRequest)); if (!pMsg) { - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set((void *)pMsg, sizeof(tSirChanChangeRequest), 0); @@ -18023,17 +18023,17 @@ CDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, * immediately after SAP CAC WAIT is * completed without any RADAR indications. */ -CDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, struct cdf_mac_addr bssid, uint8_t dfsCacWaitStatus) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirStartBeaconIndication *pMsg; pMsg = cdf_mem_malloc(sizeof(tSirStartBeaconIndication)); if (!pMsg) { - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set((void *)pMsg, sizeof(tSirStartBeaconIndication), 0); @@ -18055,27 +18055,27 @@ CDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, \param updateType - Type of buffer \- return Success or failure -----------------------------------------------------------------------------*/ -CDF_STATUS +QDF_STATUS csr_roam_modify_add_ies(tpAniSirGlobal pMac, tSirModifyIE *pModifyIE, eUpdateIEsType updateType) { tpSirModifyIEsInd pModifyAddIEInd = NULL; uint8_t *pLocalBuffer = NULL; - CDF_STATUS status; + QDF_STATUS status; /* following buffer will be freed by consumer (PE) */ pLocalBuffer = cdf_mem_malloc(pModifyIE->ieBufferlength); if (NULL == pLocalBuffer) { sms_log(pMac, LOGE, FL("Memory Allocation Failure!!!")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pModifyAddIEInd = cdf_mem_malloc(sizeof(tSirModifyIEsInd)); if (NULL == pModifyAddIEInd) { sms_log(pMac, LOGE, FL("Memory Allocation Failure!!!")); cdf_mem_free(pLocalBuffer); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /*copy the IE buffer */ @@ -18098,7 +18098,7 @@ csr_roam_modify_add_ies(tpAniSirGlobal pMac, pModifyAddIEInd->updateType = updateType; status = cds_send_mb_message_to_mac(pModifyAddIEInd); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to send eWNI_SME_UPDATE_ADDTIONAL_IES msg" "!!! status %d"), status); @@ -18119,20 +18119,20 @@ csr_roam_modify_add_ies(tpAniSirGlobal pMac, \param append - append or replace completely \- return Success or failure -----------------------------------------------------------------------------*/ -CDF_STATUS +QDF_STATUS csr_roam_update_add_ies(tpAniSirGlobal pMac, tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType) { tpSirUpdateIEsInd pUpdateAddIEs = NULL; uint8_t *pLocalBuffer = NULL; - CDF_STATUS status; + QDF_STATUS status; if (pUpdateIE->ieBufferlength != 0) { /* Following buffer will be freed by consumer (PE) */ pLocalBuffer = cdf_mem_malloc(pUpdateIE->ieBufferlength); if (NULL == pLocalBuffer) { sms_log(pMac, LOGE, FL("Memory Allocation Failure!!!")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(pLocalBuffer, pUpdateIE->pAdditionIEBuffer, pUpdateIE->ieBufferlength); @@ -18144,7 +18144,7 @@ csr_roam_update_add_ies(tpAniSirGlobal pMac, if (pLocalBuffer != NULL) { cdf_mem_free(pLocalBuffer); } - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pUpdateAddIEs, sizeof(tSirUpdateIEsInd)); @@ -18163,7 +18163,7 @@ csr_roam_update_add_ies(tpAniSirGlobal pMac, pUpdateAddIEs->updateType = updateType; status = cds_send_mb_message_to_mac(pUpdateAddIEs); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to send eWNI_SME_UPDATE_ADDTIONAL_IES msg" "!!! status %d"), status); @@ -18183,15 +18183,15 @@ csr_roam_update_add_ies(tpAniSirGlobal pMac, * * Return: success if msg posted to LIM else return failure */ -CDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, uint32_t channel, +QDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, uint32_t channel, uint8_t session_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct sir_sme_ext_cng_chan_req *msg; msg = cdf_mem_malloc(sizeof(*msg)); if (NULL == msg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_zero(msg, sizeof(*msg)); msg->message_type = eWNI_SME_EXT_CHANGE_CHANNEL; @@ -18215,17 +18215,17 @@ CDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, uint32_t channel, * * Return: success or failure **/ -CDF_STATUS +QDF_STATUS csr_roam_send_chan_sw_ie_request(tpAniSirGlobal mac_ctx, struct cdf_mac_addr bssid, uint8_t target_channel, uint8_t csa_ie_reqd, chan_params_t *ch_params) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirDfsCsaIeRequest *msg; msg = cdf_mem_malloc(sizeof(tSirDfsCsaIeRequest)); if (!msg) { - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set((void *)msg, sizeof(tSirDfsCsaIeRequest), 0); @@ -18635,19 +18635,19 @@ bool csr_store_joinreq_param(tpAniSirGlobal mac_ctx, * This function will issue station's stored join request, from this point * onwards the flow will be just like normal connect request. * - * Return: CDF_STATUS_SUCCESS or CDF_STATUS_E_FAILURE. + * Return: QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE. **/ -CDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx, uint32_t *roam_id, uint32_t session_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *sta_session; uint32_t new_roam_id; sta_session = CSR_GET_SESSION(mac_ctx, session_id); if (NULL == sta_session) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; new_roam_id = GET_NEXT_ROAM_ID(&mac_ctx->roam); *roam_id = new_roam_id; status = csr_roam_issue_connect(mac_ctx, @@ -18658,7 +18658,7 @@ CDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx, new_roam_id, sta_session->stored_roam_profile.imediate_flag, sta_session->stored_roam_profile.clear_flag); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("CSR failed issuing connect cmd with status = 0x%08X"), @@ -18682,7 +18682,7 @@ void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command) { uint32_t len; struct s_sir_set_hw_mode *cmd; - CDF_STATUS status; + QDF_STATUS status; tSirMsgQ msg; struct sir_set_hw_mode_resp *param; @@ -18712,7 +18712,7 @@ void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command) sms_log(mac, LOGE, FL("clear any pending scan command")); status = csr_scan_abort_mac_scan_not_for_connect(mac, command->u.set_hw_mode_cmd.session_id); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("Failed to clear scan cmd")); goto fail; } @@ -18734,7 +18734,7 @@ void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command) FL("Posting eWNI_SME_SET_HW_MODE_REQ to PE")); status = cds_send_mb_message_to_mac(cmd); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(mac, LOGE, FL("Posting to PE failed")); return; } @@ -18769,7 +18769,7 @@ void csr_process_set_dual_mac_config(tpAniSirGlobal mac, tSmeCmd *command) { uint32_t len; struct sir_set_dual_mac_cfg *cmd; - CDF_STATUS status; + QDF_STATUS status; tSirMsgQ msg; struct sir_dual_mac_config_resp *param; @@ -18810,7 +18810,7 @@ void csr_process_set_dual_mac_config(tpAniSirGlobal mac, tSmeCmd *command) cmd->set_dual_mac.fw_mode_config); status = cds_send_mb_message_to_mac(cmd); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(mac, LOGE, FL("Posting to PE failed")); return; } @@ -18844,7 +18844,7 @@ void csr_process_nss_update_req(tpAniSirGlobal mac, tSmeCmd *command) { uint32_t len; struct sir_nss_update_request *msg; - CDF_STATUS status; + QDF_STATUS status; tSirMsgQ msg_return; struct sir_beacon_tx_complete_rsp *param; @@ -18882,7 +18882,7 @@ void csr_process_nss_update_req(tpAniSirGlobal mac, tSmeCmd *command) FL("Posting eWNI_SME_NSS_UPDATE_REQ to PE")); status = cds_send_mb_message_to_mac(msg); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(mac, LOGE, FL("Posting to PE failed")); return; } @@ -18895,7 +18895,7 @@ fail: return; } sms_log(mac, LOGE, FL("Sending nss update fail response to SME")); - param->tx_status = CDF_STATUS_E_FAILURE; + param->tx_status = QDF_STATUS_E_FAILURE; param->session_id = command->u.nss_update_cmd.session_id; msg_return.type = eWNI_SME_NSS_UPDATE_RSP; msg_return.bodyptr = param; @@ -18946,10 +18946,10 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, sme_QosAssocInfo assoc_info; struct cdf_mac_addr bcast_mac = CDF_MAC_ADDR_BROADCAST_INITIALIZER; tpAddBssParams add_bss_params; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&mac_ctx->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("LFR3: Locking failed, bailing out")); return; } @@ -18966,7 +18966,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, return; } session->roam_synch_data = roam_synch_data; - if (!CDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies(mac_ctx, + if (!QDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies(mac_ctx, bss_desc, &ies_local))) { sms_log(mac_ctx, LOGE, FL("LFR3: fail to parse IEs")); session->roam_synch_in_progress = false; @@ -19008,7 +19008,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, if (CSR_IS_ENC_TYPE_STATIC (session->pCurRoamProfile->negotiatedUCEncryptionType) && !session->pCurRoamProfile->bWPSAssociation) { - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( csr_roam_issue_set_context_req(mac_ctx, session_id, session->pCurRoamProfile->negotiatedUCEncryptionType, @@ -19043,7 +19043,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, ps_global_info->remain_in_power_active_till_dhcp = true; mac_ctx->roam.WaitForKeyTimerInfo.sessionId = session_id; - if (!CDF_IS_STATUS_SUCCESS(csr_roam_start_wait_for_key_timer( + if (!QDF_IS_STATUS_SUCCESS(csr_roam_start_wait_for_key_timer( mac_ctx, CSR_WAIT_FOR_KEY_TIMEOUT_PERIOD)) ) { sms_log(mac_ctx, LOGE, FL diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 2486d9eb87..2c6a370345 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -91,7 +91,7 @@ static void csr_set_default_scan_timing(tpAniSirGlobal pMac, tSirScanType scanTy static void csr_sta_ap_conc_timer_handler(void *); #endif bool csr_is_supported_channel(tpAniSirGlobal pMac, uint8_t channelId); -CDF_STATUS csr_scan_channels(tpAniSirGlobal pMac, tSmeCmd *pCommand); +QDF_STATUS csr_scan_channels(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_set_cfg_valid_channel_list(tpAniSirGlobal pMac, uint8_t *pChannelList, uint8_t NumChannels); void csr_save_tx_power_to_cfg(tpAniSirGlobal pMac, tDblLinkList *pList, @@ -138,10 +138,10 @@ void csr_free_scan_result_entry(tpAniSirGlobal pMac, tCsrScanResult *pResult) cdf_mem_free(pResult); } -static CDF_STATUS csr_ll_scan_purge_result(tpAniSirGlobal pMac, +static QDF_STATUS csr_ll_scan_purge_result(tpAniSirGlobal pMac, tDblLinkList *pList) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry; tCsrScanResult *pBssDesc; @@ -157,9 +157,9 @@ static CDF_STATUS csr_ll_scan_purge_result(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx) +QDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx) { - CDF_STATUS status; + QDF_STATUS status; csr_ll_open(mac_ctx->hHdd, &mac_ctx->scan.scanResultList); csr_ll_open(mac_ctx->hHdd, &mac_ctx->scan.tempScanResults); @@ -175,7 +175,7 @@ CDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx) CDF_TIMER_TYPE_SW, csr_sta_ap_conc_timer_handler, mac_ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("Mem Alloc failed for hTimerStaApConcTimer timer")); return status; @@ -185,14 +185,14 @@ CDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx) CDF_TIMER_TYPE_SW, csr_scan_result_cfg_aging_timer_handler, mac_ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(mac_ctx, LOGE, FL("Mem Alloc failed for CFG ResultAging timer")); return status; } -CDF_STATUS csr_scan_close(tpAniSirGlobal pMac) +QDF_STATUS csr_scan_close(tpAniSirGlobal pMac) { csr_ll_scan_purge_result(pMac, &pMac->scan.tempScanResults); csr_ll_scan_purge_result(pMac, &pMac->scan.scanResultList); @@ -213,24 +213,24 @@ CDF_STATUS csr_scan_close(tpAniSirGlobal pMac) #ifdef WLAN_AP_STA_CONCURRENCY cdf_mc_timer_destroy(&pMac->scan.hTimerStaApConcTimer); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_scan_enable(tpAniSirGlobal pMac) +QDF_STATUS csr_scan_enable(tpAniSirGlobal pMac) { pMac->scan.fScanEnable = true; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_scan_disable(tpAniSirGlobal pMac) +QDF_STATUS csr_scan_disable(tpAniSirGlobal pMac) { csr_scan_stop_timers(pMac); pMac->scan.fScanEnable = false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* Set scan timing parameters according to state of other driver sessions */ @@ -296,7 +296,7 @@ static void csr_set_default_scan_timing(tpAniSirGlobal pMac, tSirScanType scanTy * * @Return: status of operation */ -static CDF_STATUS +static QDF_STATUS csr_scan_2g_only_request(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, tCsrScanRequest *scan_req) @@ -308,11 +308,11 @@ csr_scan_2g_only_request(tpAniSirGlobal mac_ctx, if ((scan_cmd == NULL) || (scan_req == NULL)) { sms_log(mac_ctx, LOGE, FL(" Scan Cmd or Scan Request is NULL ")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (eCSR_SCAN_REQUEST_FULL_SCAN != scan_req->requestType) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; sms_log(mac_ctx, LOG1, FL("Scanning only 2G Channels during first scan")); @@ -323,7 +323,7 @@ csr_scan_2g_only_request(tpAniSirGlobal mac_ctx, cdf_mem_malloc(NUM_24GHZ_CHANNELS); if (NULL == scan_req->ChannelInfo.ChannelList) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed.")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } for (idx = 1; idx <= NUM_24GHZ_CHANNELS; idx++) { if (csr_is_supported_channel(mac_ctx, idx)) { @@ -346,7 +346,7 @@ csr_scan_2g_only_request(tpAniSirGlobal mac_ctx, } } scan_req->ChannelInfo.numOfChannels = lst_sz; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static void @@ -374,11 +374,11 @@ csr_set_scan_reason(tSmeCmd *scan_cmd, eCsrRequestType req_type) } } -static CDF_STATUS +static QDF_STATUS csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, tCsrScanRequest *scan_req, uint16_t session_id) { - CDF_STATUS status; + QDF_STATUS status; tSmeCmd *scan_11d_cmd = NULL; tCsrScanRequest tmp_rq; tCsrChannelInfo *pChnInfo = &tmp_rq.ChannelInfo; @@ -389,7 +389,7 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, sms_log(mac_ctx, LOGE, FL("session %d not found"), session_id); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!(((false == mac_ctx->first_scan_done) @@ -398,20 +398,20 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, && (eCSR_SCAN_SOFTAP_CHANNEL_RANGE != scan_req->requestType) #endif && (false == mac_ctx->scan.fEnableBypass11d))) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; cdf_mem_set(&tmp_rq, sizeof(tCsrScanRequest), 0); scan_11d_cmd = csr_get_command_buffer(mac_ctx); if (!scan_11d_cmd) { sms_log(mac_ctx, LOGE, FL("scan_11d_cmd failed")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_set(&scan_11d_cmd->u.scanCmd, sizeof(tScanCmd), 0); pChnInfo->ChannelList = cdf_mem_malloc(numChn); if (NULL == pChnInfo->ChannelList) { sms_log(mac_ctx, LOGE, FL("Failed to allocate memory")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(pChnInfo->ChannelList, mac_ctx->scan.base_channels.channelList, numChn); @@ -463,9 +463,9 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, /* Free the channel list */ cdf_mem_free(pChnInfo->ChannelList); pChnInfo->ChannelList = NULL; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("csr_scan_copy_request failed")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mac_ctx->scan.scanProfile.numOfChannels = @@ -473,19 +473,19 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, status = csr_queue_sme_command(mac_ctx, scan_11d_cmd, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("Failed to send message status = %d"), status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, +QDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, tCsrScanRequest *scan_req, csr_scan_completeCallback callback, void *pContext) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tSmeCmd *scan_cmd = NULL; tCsrScanRequest *pTempScanReq = NULL; tCsrConfig *cfg_prm = &pMac->roam.configParam; @@ -571,7 +571,7 @@ CDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, * & issue an 11d scan request to PE. */ status = csr_issue_11d_scan(pMac, scan_cmd, scan_req, sessionId); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) goto release_cmd; /* @@ -601,7 +601,7 @@ CDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, * builds the target scan request in which this variable is used. */ cfg_prm->initial_scan_no_dfs_chnl = 0; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("fail to copy request status = %d"), status); goto release_cmd; @@ -622,13 +622,13 @@ CDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, pTempScanReq->maxChnTime, pTempScanReq->uIEFieldLen); status = csr_queue_sme_command(pMac, scan_cmd, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("fail to send message status = %d"), status); } release_cmd: - if (!CDF_IS_STATUS_SUCCESS(status) && scan_cmd) { + if (!QDF_IS_STATUS_SUCCESS(status) && scan_cmd) { sms_log(pMac, LOGE, FL(" SId: %d Failed with status=%d" " Scan reason=%u numOfSSIDs=%d" " P2P search=%d scanId=%d"), @@ -641,11 +641,11 @@ release_cmd: return status; } -CDF_STATUS csr_issue_roam_after_lostlink_scan(tpAniSirGlobal pMac, +QDF_STATUS csr_issue_roam_after_lostlink_scan(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamReason reason) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tScanResultHandle hBSSList = NULL; tCsrScanResultFilter *pScanFilter = NULL; uint32_t roamId = 0; @@ -654,19 +654,19 @@ CDF_STATUS csr_issue_roam_after_lostlink_scan(tpAniSirGlobal pMac, if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, FL("Entry")); if (pSession->fCancelRoaming) { sms_log(pMac, LOGW, FL("lost link roaming canceled")); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; goto free_filter; } /* Here is the profile we need to connect to */ pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_filter; } cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); @@ -681,23 +681,23 @@ CDF_STATUS csr_issue_roam_after_lostlink_scan(tpAniSirGlobal pMac, */ pProfile = cdf_mem_malloc(sizeof(tCsrRoamProfile)); if (NULL == pProfile) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_filter; } cdf_mem_set(pProfile, sizeof(tCsrRoamProfile), 0); status = csr_roam_copy_profile(pMac, pProfile, pSession->pCurRoamProfile); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_filter; status = csr_roam_prepare_filter_from_profile(pMac, pProfile, pScanFilter); } /* We have a profile */ roamId = GET_NEXT_ROAM_ID(&pMac->roam); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_filter; status = csr_scan_get_result(pMac, pScanFilter, &hBSSList); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_filter; if (eCsrLostLink1 == reason) { @@ -707,7 +707,7 @@ CDF_STATUS csr_issue_roam_after_lostlink_scan(tpAniSirGlobal pMac, } status = csr_roam_issue_connect(pMac, sessionId, pProfile, hBSSList, reason, roamId, true, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_scan_result_purge(pMac, hBSSList); } @@ -724,18 +724,18 @@ free_filter: return status; } -CDF_STATUS csr_scan_handle_failed_lostlink1(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_handle_failed_lostlink1(tpAniSirGlobal pMac, uint32_t sessionId) { tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOGW, "Lost link scan 1 failed"); if (pSession->fCancelRoaming) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (!pSession->pCurRoamProfile) return csr_scan_request_lost_link3(pMac, sessionId); /* @@ -751,22 +751,22 @@ CDF_STATUS csr_scan_handle_failed_lostlink1(tpAniSirGlobal pMac, /* go straight to lostlink scan3 */ return csr_scan_request_lost_link3(pMac, sessionId); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_scan_handle_failed_lostlink2(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_handle_failed_lostlink2(tpAniSirGlobal pMac, uint32_t sessionId) { tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOGW, "Lost link scan 2 failed"); if (pSession->fCancelRoaming) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (!pSession->pCurRoamProfile || !pSession->pCurRoamProfile->ChannelInfo.ChannelList @@ -774,17 +774,17 @@ CDF_STATUS csr_scan_handle_failed_lostlink2(tpAniSirGlobal pMac, /* try lostlink scan3 */ return csr_scan_request_lost_link3(pMac, sessionId); } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } -CDF_STATUS csr_scan_handle_failed_lostlink3(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_handle_failed_lostlink3(tpAniSirGlobal pMac, uint32_t sessionId) { sms_log(pMac, LOGW, "Lost link scan 3 failed"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS +static QDF_STATUS csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, tCsrRoamSession *pSession, uint32_t session_id) { @@ -792,7 +792,7 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, tScanResultHandle bss_lst = NULL; tCsrScanResultInfo *scan_result = NULL; tCsrScanResultFilter *scan_filter = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrSSIDs *ssid_list = &cmd->u.scanCmd.u.scanRequest.SSIDs; tCsrChannelInfo *ch_info = &cmd->u.scanCmd.u.scanRequest.ChannelInfo; @@ -820,7 +820,7 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, */ ssid_list->SSIDList = cdf_mem_malloc(sizeof(tCsrSSIDInfo)); if (NULL == ssid_list->SSIDList) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; ssid_list->numOfSSIDs = 1; cdf_mem_copy(&ssid_list->SSIDList[0].SSID, &pSession->connectedProfile.SSID, @@ -830,25 +830,25 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, } if (!pSession->pCurRoamProfile) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; scan_filter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == scan_filter) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(scan_filter, sizeof(tCsrScanResultFilter), 0); status = csr_roam_prepare_filter_from_profile(mac_ctx, pSession->pCurRoamProfile, scan_filter); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_lost_link1_local_mem; - if (!(CDF_IS_STATUS_SUCCESS(csr_scan_get_result(mac_ctx, scan_filter, + if (!(QDF_IS_STATUS_SUCCESS(csr_scan_get_result(mac_ctx, scan_filter, &bss_lst)) && bss_lst)) { if (csr_roam_is_channel_valid(mac_ctx, pSession->connectedProfile.operationChannel)) { ch_info->ChannelList = cdf_mem_malloc(1); if (NULL == ch_info->ChannelList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_lost_link1_local_mem; } ch_info->ChannelList[0] = @@ -861,7 +861,7 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, /* on error: this mem will be released by csr_release_command_scan */ ch_info->ChannelList = cdf_mem_malloc(WNI_CFG_VALID_CHANNEL_LIST_LEN); if (NULL == ch_info->ChannelList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_lost_link1_local_mem; } @@ -911,39 +911,39 @@ free_lost_link1_local_mem: * * Return: status of operation */ -CDF_STATUS +QDF_STATUS csr_scan_request_lost_link1(tpAniSirGlobal mac_ctx, uint32_t session_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *cmd = NULL; tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); if (!session) { sms_log(mac_ctx, LOGE, FL("session %d not found"), session_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(mac_ctx, LOGW, FL("Entry")); cmd = csr_get_command_buffer(mac_ctx); if (!cmd) { - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; goto release_lost_link1_cmd; } cdf_mem_set(&cmd->u.scanCmd, sizeof(tScanCmd), 0); status = csr_update_lost_link1_cmd(mac_ctx, cmd, session, session_id); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto release_lost_link1_cmd; cdf_mem_set(&cmd->u.scanCmd.u.scanRequest.bssid, sizeof(struct cdf_mac_addr), 0xFF); status = csr_queue_sme_command(mac_ctx, cmd, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("fail to send message status = %d"), status); } release_lost_link1_cmd: - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGW, FL("failed with status %d"), status); if (cmd) csr_release_command_scan(mac_ctx, cmd); @@ -952,11 +952,11 @@ release_lost_link1_cmd: return status; } -static CDF_STATUS +static QDF_STATUS csr_update_lost_link2_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, uint32_t session_id, tCsrRoamSession *session) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t i, num_ch = 0; tScanResultHandle bss_lst = NULL; tCsrScanResultInfo *scan_result = NULL; @@ -977,22 +977,22 @@ csr_update_lost_link2_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, cmd->u.scanCmd.u.scanRequest.scan_id = cmd->u.scanCmd.scanID; if (!session->pCurRoamProfile) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; status = cdf_mc_timer_init(&cmd->u.scanCmd.csr_scan_timer, CDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &cmd); scan_fltr = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == scan_fltr) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(scan_fltr, sizeof(tCsrScanResultFilter), 0); status = csr_roam_prepare_filter_from_profile(mac_ctx, session->pCurRoamProfile, scan_fltr); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_lost_link2_local_mem; status = csr_scan_get_result(mac_ctx, scan_fltr, &bss_lst); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_lost_link2_local_mem; if (!bss_lst) @@ -1000,7 +1000,7 @@ csr_update_lost_link2_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, ch_info->ChannelList = cdf_mem_malloc(WNI_CFG_VALID_CHANNEL_LIST_LEN); if (NULL == ch_info->ChannelList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_lost_link2_local_mem; } scan_result = csr_scan_result_get_next(mac_ctx, bss_lst); @@ -1038,41 +1038,41 @@ free_lost_link2_local_mem: * * Return: status of operation */ -CDF_STATUS +QDF_STATUS csr_scan_request_lost_link2(tpAniSirGlobal mac_ctx, uint32_t session_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *cmd = NULL; tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); if (!session) { sms_log(mac_ctx, LOGE, FL("session %d not found"), session_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(mac_ctx, LOGW, FL(" called")); cmd = csr_get_command_buffer(mac_ctx); if (!cmd) { - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; goto release_lost_link2_cmd; } cdf_mem_set(&cmd->u.scanCmd, sizeof(tScanCmd), 0); status = csr_update_lost_link2_cmd(mac_ctx, cmd, session_id, session); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto release_lost_link2_cmd; cdf_mem_set(&cmd->u.scanCmd.u.scanRequest.bssid, sizeof(struct cdf_mac_addr), 0xFF); /* Put to the head in pending queue */ status = csr_queue_sme_command(mac_ctx, cmd, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("fail to send message status = %d"), status); goto release_lost_link2_cmd; } release_lost_link2_cmd: - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGW, FL("failed with status %d"), status); if (cmd) csr_release_command_scan(mac_ctx, cmd); @@ -1088,17 +1088,17 @@ release_lost_link2_cmd: * * Return: status of operation */ -CDF_STATUS +QDF_STATUS csr_scan_request_lost_link3(tpAniSirGlobal mac_ctx, uint32_t session_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *cmd; sms_log(mac_ctx, LOGW, FL(" called")); do { cmd = csr_get_command_buffer(mac_ctx); if (!cmd) { - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; break; } cdf_mem_set(&cmd->u.scanCmd, sizeof(tScanCmd), 0); @@ -1121,13 +1121,13 @@ csr_scan_request_lost_link3(tpAniSirGlobal mac_ctx, uint32_t session_id) cdf_set_macaddr_broadcast(&cmd->u.scanCmd.u.scanRequest.bssid); /* Put to the head of pending queue */ status = csr_queue_sme_command(mac_ctx, cmd, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("fail to send message status = %d"), status); break; } } while (0); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGW, FL("failed with status %d"), status); if (cmd) csr_release_command_scan(mac_ctx, cmd); @@ -1136,10 +1136,10 @@ csr_scan_request_lost_link3(tpAniSirGlobal mac_ctx, uint32_t session_id) return status; } -CDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tScanResultHandle hBSSList = CSR_INVALID_SCANRESULT_HANDLE; tCsrScanResultFilter *pScanFilter = NULL; tCsrRoamProfile *pProfile = pCommand->u.scanCmd.pToRoamProfile; @@ -1150,11 +1150,11 @@ CDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal pMac, if (pMac->roam.neighborRoamInfo[sessionId].uOsRequestedHandoff) { /* notify LFR state m/c */ status = csr_neighbor_roam_sssid_scan_done(pMac, - sessionId, CDF_STATUS_SUCCESS); - if (CDF_STATUS_SUCCESS != status) + sessionId, QDF_STATUS_SUCCESS); + if (QDF_STATUS_SUCCESS != status) csr_neighbor_roam_start_lfr_scan(pMac, sessionId); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } /* @@ -1170,22 +1170,22 @@ CDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal pMac, break; pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; break; } cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); status = csr_roam_prepare_filter_from_profile(pMac, pProfile, pScanFilter); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) break; status = csr_scan_get_result(pMac, pScanFilter, &hBSSList); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) break; if (pMac->roam.roamSession[sessionId].connectState == eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTING) { sms_log(pMac, LOGE, FL("upper layer issued disconnetion")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } status = csr_roam_issue_connect(pMac, sessionId, pProfile, @@ -1194,7 +1194,7 @@ CDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal pMac, true, true); } while (0); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { if (CSR_INVALID_SCANRESULT_HANDLE != hBSSList) { csr_scan_result_purge(pMac, hBSSList); } @@ -1211,10 +1211,10 @@ CDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t sessionId = pCommand->sessionId; tCsrRoamProfile *pProfile = pCommand->u.scanCmd.pToRoamProfile; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -1222,16 +1222,16 @@ CDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal pMac, if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* If this scan is for LFR */ if (pMac->roam.neighborRoamInfo[sessionId].uOsRequestedHandoff) { /* notify LFR state m/c */ status = csr_neighbor_roam_sssid_scan_done(pMac, sessionId, - CDF_STATUS_E_FAILURE); - if (CDF_STATUS_SUCCESS != status) + QDF_STATUS_E_FAILURE); + if (QDF_STATUS_SUCCESS != status) csr_neighbor_roam_start_lfr_scan(pMac, sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_DEBUG if (pCommand->u.scanCmd.u.scanRequest.SSIDs.numOfSSIDs == 1) { @@ -1251,7 +1251,7 @@ CDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal pMac, status = csr_roam_issue_connect(pMac, sessionId, pProfile, NULL, eCsrHddIssued, pCommand->u.scanCmd.roamId, true, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("failed to issue startIBSS, status: 0x%08X"), status); @@ -1297,10 +1297,10 @@ roam_completion: return status; } -CDF_STATUS csr_scan_result_purge(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_result_purge(tpAniSirGlobal pMac, tScanResultHandle hScanList) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; tScanResultList *pScanList = (tScanResultList *) hScanList; if (pScanList) { @@ -1591,7 +1591,7 @@ static void csr_scan_add_to_occupied_channels(tpAniSirGlobal pMac, tCsrChannel *occupied_ch, tDot11fBeaconIEs *pIes) { - CDF_STATUS status; + QDF_STATUS status; uint8_t ch; uint8_t num_occupied_ch = occupied_ch->numChannels; uint8_t *occupied_ch_lst = occupied_ch->channelList; @@ -1604,7 +1604,7 @@ static void csr_scan_add_to_occupied_channels(tpAniSirGlobal pMac, status = csr_add_to_channel_list_front(occupied_ch_lst, num_occupied_ch, ch); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { occupied_ch->numChannels++; sms_log(pMac, LOG2, FL("Added channel %d to the list (count=%d)"), @@ -1651,7 +1651,7 @@ csr_parser_scan_result_for_5ghz_preference(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter) { bool fMatch; - CDF_STATUS status; + QDF_STATUS status; tListElem *pEntry; tDot11fBeaconIEs *pIes; tCsrScanResult *pBssDesc; @@ -1676,7 +1676,7 @@ csr_parser_scan_result_for_5ghz_preference(tpAniSirGlobal pMac, /* At this time, Result.pvIes may be NULL */ status = csr_get_parsed_bss_description_ies(pMac, &pBssDesc->Result.BssDescriptor, &pIes); - if (!pIes && (!CDF_IS_STATUS_SUCCESS(status))) + if (!pIes && (!QDF_IS_STATUS_SUCCESS(status))) continue; sms_log(pMac, LOG1, FL("SSID Matched")); @@ -1791,7 +1791,7 @@ csr_prefer_5ghz(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter) csr_ll_unlock(&pMac->scan.scanResultList); } -static CDF_STATUS +static QDF_STATUS csr_save_ies(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter, tCsrScanResult *pBssDesc, @@ -1801,7 +1801,7 @@ csr_save_ies(tpAniSirGlobal pMac, eCsrEncryptionType *mc, eCsrAuthType *auth) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tDot11fBeaconIEs *pIes = NULL; if (!pFilter) @@ -1834,7 +1834,7 @@ csr_save_ies(tpAniSirGlobal pMac, */ *pNewIes = cdf_mem_malloc(sizeof(tDot11fBeaconIEs)); if (NULL == *pNewIes) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("fail to allocate memory for IEs")); /* Need to free memory allocated by csr_match_bss */ if (!pBssDesc->Result.pvIes) @@ -1845,7 +1845,7 @@ csr_save_ies(tpAniSirGlobal pMac, return status; } -static CDF_STATUS +static QDF_STATUS csr_save_scan_entry(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter, bool fMatch, @@ -1857,7 +1857,7 @@ csr_save_scan_entry(tpAniSirGlobal pMac, eCsrEncryptionType mc, eCsrAuthType *auth) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrScanResult *pResult; uint32_t bssLen, allocLen; /* To sort the list */ @@ -1872,7 +1872,7 @@ csr_save_scan_entry(tpAniSirGlobal pMac, allocLen = sizeof(tCsrScanResult) + bssLen; pResult = cdf_mem_malloc(allocLen); if (NULL == pResult) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("fail to allocate memory for scan result, len=%d"), allocLen); @@ -1939,7 +1939,7 @@ csr_save_scan_entry(tpAniSirGlobal pMac, * * Return: success or failure */ -static CDF_STATUS csr_calc_pref_val_by_pcl(tpAniSirGlobal mac_ctx, +static QDF_STATUS csr_calc_pref_val_by_pcl(tpAniSirGlobal mac_ctx, tCsrScanResultFilter *filter, tCsrScanResult *bss_descr) { @@ -1947,7 +1947,7 @@ static CDF_STATUS csr_calc_pref_val_by_pcl(tpAniSirGlobal mac_ctx, int orig_pref_val = 0; if (NULL == mac_ctx || NULL == bss_descr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (mac_ctx->policy_manager_enabled && is_channel_found_in_pcl(mac_ctx, @@ -1974,16 +1974,16 @@ static CDF_STATUS csr_calc_pref_val_by_pcl(tpAniSirGlobal mac_ctx, bss_descr->preferValue = CSR_MAX(new_pref_val, bss_descr->preferValue); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS +static QDF_STATUS csr_parse_scan_results(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter, tScanResultList *pRetList, uint32_t *count) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry; bool fMatch = false; tCsrScanResult *pBssDesc = NULL; @@ -2005,7 +2005,7 @@ csr_parse_scan_results(tpAniSirGlobal pMac, } } - if (CDF_STATUS_E_FAILURE == status) + if (QDF_STATUS_E_FAILURE == status) sms_log(pMac, CDF_TRACE_LEVEL_ERROR, FL("Retrieving pcl failed from HDD")); pEntry = csr_ll_peek_head(&pMac->scan.scanResultList, LL_ACCESS_NOLOCK); @@ -2021,7 +2021,7 @@ csr_parse_scan_results(tpAniSirGlobal pMac, pNewIes = NULL; status = csr_save_ies(pMac, pFilter, pBssDesc, &pNewIes, &fMatch, &uc, &mc, &auth); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, FL("save ies fail %d"), status); break; @@ -2034,7 +2034,7 @@ csr_parse_scan_results(tpAniSirGlobal pMac, status = csr_save_scan_entry(pMac, pFilter, fMatch, pBssDesc, pNewIes, pRetList, count, uc, mc, &auth); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, FL("save entry fail %d"), status); break; @@ -2046,11 +2046,11 @@ csr_parse_scan_results(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_scan_get_result(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_get_result(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter, tScanResultHandle *phResult) { - CDF_STATUS status; + QDF_STATUS status; tScanResultList *pRetList; uint32_t count = 0; @@ -2062,7 +2062,7 @@ CDF_STATUS csr_scan_get_result(tpAniSirGlobal pMac, pRetList = cdf_mem_malloc(sizeof(tScanResultList)); if (NULL == pRetList) { sms_log(pMac, LOGE, FL("pRetList is NULL")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(pRetList, sizeof(tScanResultList), 0); @@ -2071,7 +2071,7 @@ CDF_STATUS csr_scan_get_result(tpAniSirGlobal pMac, status = csr_parse_scan_results(pMac, pFilter, pRetList, &count); sms_log(pMac, LOG1, FL("return %d BSS %d"), csr_ll_count(&pRetList->List), status); - if (!CDF_IS_STATUS_SUCCESS(status) || (phResult == NULL)) { + if (!QDF_IS_STATUS_SUCCESS(status) || (phResult == NULL)) { /* Fail or No one wants the result. */ csr_scan_result_purge(pMac, (tScanResultHandle) pRetList); } else { @@ -2079,7 +2079,7 @@ CDF_STATUS csr_scan_get_result(tpAniSirGlobal pMac, /* We are here meaning the there is no match */ csr_ll_close(&pRetList->List); cdf_mem_free(pRetList); - status = CDF_STATUS_E_NULL_VALUE; + status = QDF_STATUS_E_NULL_VALUE; } else if (phResult) { *phResult = pRetList; } @@ -2112,25 +2112,25 @@ bool csr_scan_flush_denied(tpAniSirGlobal pMac) return 0; } -CDF_STATUS csr_scan_flush_result(tpAniSirGlobal pMac) +QDF_STATUS csr_scan_flush_result(tpAniSirGlobal pMac) { bool isFlushDenied = csr_scan_flush_denied(pMac); if (isFlushDenied) { sms_log(pMac, LOGW, "%s: scan flush denied in roam state %d", __func__, isFlushDenied); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG4, "%s: Flushing all scan results", __func__); csr_ll_scan_purge_result(pMac, &pMac->scan.tempScanResults); csr_ll_scan_purge_result(pMac, &pMac->scan.scanResultList); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_scan_flush_selective_result(tpAniSirGlobal pMac, bool flushP2P) +QDF_STATUS csr_scan_flush_selective_result(tpAniSirGlobal pMac, bool flushP2P) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry, *pFreeElem; tCsrScanResult *pBssDesc; tDblLinkList *pList = &pMac->scan.scanResultList; @@ -2207,15 +2207,15 @@ void csr_scan_flush_bss_entry(tpAniSirGlobal pMac, * @return Status */ -CDF_STATUS csr_check11d_channel(uint8_t channelId, uint8_t *pChannelList, +QDF_STATUS csr_check11d_channel(uint8_t channelId, uint8_t *pChannelList, uint32_t numChannels) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint8_t i = 0; for (i = 0; i < numChannels; i++) { if (pChannelList[i] == channelId) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } } @@ -2244,15 +2244,15 @@ CDF_STATUS csr_check11d_channel(uint8_t channelId, uint8_t *pChannelList, * @return Status */ -CDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac) +QDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry, *pTempEntry; tCsrScanResult *pBssDesc; uint32_t len = sizeof(pMac->roam.validChannelList); /* Get valid channels list from CFG */ - if (!CDF_IS_STATUS_SUCCESS(csr_get_cfg_valid_channels(pMac, + if (!QDF_IS_STATUS_SUCCESS(csr_get_cfg_valid_channels(pMac, pMac->roam. validChannelList, &len))) { @@ -2307,10 +2307,10 @@ CDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac) return status; } -CDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, +QDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, tScanResultHandle *phResult) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tScanResultList *pRetList, *pInList = (tScanResultList *) hIn; tCsrScanResult *pResult, *pScanResult; uint32_t count = 0; @@ -2322,7 +2322,7 @@ CDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, } pRetList = cdf_mem_malloc(sizeof(tScanResultList)); if (NULL == pRetList) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else { cdf_mem_set(pRetList, sizeof(tScanResultList), 0); csr_ll_open(pMac->hHdd, &pRetList->List); @@ -2340,10 +2340,10 @@ CDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, allocLen = sizeof(tCsrScanResult) + bssLen; pResult = cdf_mem_malloc(allocLen); if (NULL == pResult) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_scan_result_purge(pMac, (tScanResultHandle *) pRetList); @@ -2358,10 +2358,10 @@ CDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, pResult->Result.pvIes = cdf_mem_malloc(sizeof(tDot11fBeaconIEs)); if (NULL == pResult->Result.pvIes) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) { /* Free the memory we allocate above first */ cdf_mem_free(pResult); csr_scan_result_purge(pMac, @@ -2383,11 +2383,11 @@ CDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, csr_ll_unlock(&pInList->List); csr_ll_unlock(&pMac->scan.scanResultList); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (0 == count) { csr_ll_close(&pRetList->List); cdf_mem_free(pRetList); - status = CDF_STATUS_E_NULL_VALUE; + status = QDF_STATUS_E_NULL_VALUE; } else if (phResult) { *phResult = pRetList; } @@ -2397,10 +2397,10 @@ CDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, return status; } -CDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, +QDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirMbMsg *pMsg = (tSirMbMsg *) pMsgBuf; tCsrRoamSession *pSession; tSirSmeAssocIndToUpperLayerCnf *pUpperLayerAssocCnf; @@ -2439,7 +2439,7 @@ CDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* send the status code as Success */ @@ -2590,11 +2590,11 @@ bool csr_remove_dup_bss_description(tpAniSirGlobal pMac, return fRC; } -CDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tPmkidCandidateInfo *pmkid_info = NULL; #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR @@ -2603,7 +2603,7 @@ CDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, #endif /* FEATURE_WLAN_DIAG_SUPPORT_CSR */ if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOGW, FL("NumPmkidCandidate = %d"), @@ -2615,7 +2615,7 @@ CDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, return status; if (pSession->NumPmkidCandidate >= CSR_MAX_PMKID_ALLOWED) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* BSS is capable of doing pre-authentication */ #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR @@ -2651,17 +2651,17 @@ CDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, * profile. If it is found, it return the sessionId, else it return invalid * sessionID */ -CDF_STATUS csr_process_bss_desc_for_pmkid_list(tpAniSirGlobal pMac, +QDF_STATUS csr_process_bss_desc_for_pmkid_list(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes, uint8_t sessionId) { tCsrRoamSession *pSession; tDot11fBeaconIEs *pIesLocal = pIes; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (!(pIesLocal || - CDF_IS_STATUS_SUCCESS( + QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies(pMac, pBssDesc, &pIesLocal)))) return status; @@ -2681,11 +2681,11 @@ CDF_STATUS csr_process_bss_desc_for_pmkid_list(tpAniSirGlobal pMac, /* This new BSS fits the current profile connected */ status = csr_add_pmkid_candidate_list(pMac, sessionId, pBssDesc, pIesLocal); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(pMac, LOGE, FL("csr_add_pmkid_candidate_list failed")); else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } if (!pIes) @@ -2695,16 +2695,16 @@ CDF_STATUS csr_process_bss_desc_for_pmkid_list(tpAniSirGlobal pMac, } #ifdef FEATURE_WLAN_WAPI -CDF_STATUS csr_add_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_add_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOGW, @@ -2733,7 +2733,7 @@ CDF_STATUS csr_add_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, } pSession->NumBkidCandidate++; } else { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } } } @@ -2753,10 +2753,10 @@ bool csr_process_bss_desc_for_bkid_list(tpAniSirGlobal pMac, tDot11fBeaconIEs *pIesLocal = pIes; uint32_t sessionId; tCsrRoamSession *pSession; - CDF_STATUS status; + QDF_STATUS status; if (!(pIesLocal || - CDF_IS_STATUS_SUCCESS( + QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies(pMac, pBssDesc, &pIesLocal)))) return fRC; @@ -2774,7 +2774,7 @@ bool csr_process_bss_desc_for_bkid_list(tpAniSirGlobal pMac, /* this new BSS fits the current profile connected */ status = csr_add_bkid_candidate_list(pMac, sessionId, pBssDesc, pIesLocal); - if (CDF_IS_STATUS_SUCCESS(status)) + if (QDF_IS_STATUS_SUCCESS(status)) fRC = true; } } @@ -2790,7 +2790,7 @@ csr_remove_from_tmp_list(tpAniSirGlobal mac_ctx, uint8_t reason, uint8_t session_id) { - CDF_STATUS status; + QDF_STATUS status; tListElem *entry; tCsrScanResult *bss_dscp; tDot11fBeaconIEs *local_ie = NULL; @@ -2813,7 +2813,7 @@ csr_remove_from_tmp_list(tpAniSirGlobal mac_ctx, local_ie = (tDot11fBeaconIEs *)(bss_dscp->Result.pvIes); status = csr_get_parsed_bss_description_ies(mac_ctx, &bss_dscp->Result.BssDescriptor, &local_ie); - if (!(local_ie || CDF_IS_STATUS_SUCCESS(status))) { + if (!(local_ie || QDF_IS_STATUS_SUCCESS(status))) { sms_log(mac_ctx, LOGE, FL("Cannot pared IEs")); csr_free_scan_result_entry(mac_ctx, bss_dscp); continue; @@ -2838,7 +2838,7 @@ csr_remove_from_tmp_list(tpAniSirGlobal mac_ctx, status = csr_process_bss_desc_for_pmkid_list(mac_ctx, &bss_dscp->Result.BssDescriptor, local_ie, session_id); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Found a new BSS */ csr_roam_call_callback(mac_ctx, session_id, NULL, 0, eCSR_ROAM_SCAN_FOUND_NEW_BSS, @@ -3030,7 +3030,7 @@ void csr_purge_channel_power(tpAniSirGlobal pMac, tDblLinkList *pChannelList) * Input: pCountryInfo -- the country code (e.g. "USI"), channel list, and power * limit are all stored inside this data structure */ -CDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, +QDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, uint32_t tableSize, tSirMacChanInfo *channelTable) { @@ -3072,7 +3072,7 @@ CDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, FL("Invalid Channel %d Present in Country IE"), pChannelSet->firstChannel); cdf_mem_free(pChannelSet); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pChannelSet->txPower = CDF_MIN(pChannelInfo->maxTxPower, pMac->roam.configParam.nTxPowerCap); @@ -3120,7 +3120,7 @@ CDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, } pChannelInfo++; /* move to next entry */ } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static void csr_clear_dfs_channel_list(tpAniSirGlobal pMac) @@ -3269,7 +3269,7 @@ void csr_add_vote_for_country_info(tpAniSirGlobal pMac, uint8_t *pCountryCode) * 11d information element, let's default to US. */ - if (!CDF_IS_STATUS_SUCCESS(csr_get_regulatory_domain_for_country(pMac, + if (!QDF_IS_STATUS_SUCCESS(csr_get_regulatory_domain_for_country(pMac, pCountryCode, NULL, SOURCE_QUERY))) { pCountryCode[0] = '0'; @@ -3359,9 +3359,9 @@ bool csr_elected_country_info(tpAniSirGlobal pMac) * * Return: none */ -CDF_STATUS csr_set_country_code(tpAniSirGlobal pMac, uint8_t *pCountry) +QDF_STATUS csr_set_country_code(tpAniSirGlobal pMac, uint8_t *pCountry) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; v_REGDOMAIN_t domainId; if (pCountry) { @@ -3369,7 +3369,7 @@ CDF_STATUS csr_set_country_code(tpAniSirGlobal pMac, uint8_t *pCountry) status = csr_get_regulatory_domain_for_country(pMac, pCountry, &domainId, SOURCE_USERSPACE); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_copy(pMac->scan.countryCodeCurrent, pCountry, WNI_CFG_COUNTRY_CODE_LEN); @@ -3470,14 +3470,14 @@ diag_end: void csr_apply_country_information(tpAniSirGlobal pMac) { v_REGDOMAIN_t domainId; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (!csr_is11d_supported(pMac) || 0 == pMac->scan.channelOf11dInfo) return; status = csr_get_regulatory_domain_for_country(pMac, pMac->scan.countryCode11d, &domainId, SOURCE_QUERY); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return; /* Check whether we need to enforce default domain */ #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR @@ -3491,7 +3491,7 @@ void csr_apply_country_information(tpAniSirGlobal pMac) pMac->scan.domainIdCurrent, domainId); status = wma_set_reg_domain(pMac, domainId); } - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) sms_log(pMac, LOGE, FL("fail to set regId %d"), domainId); pMac->scan.domainIdCurrent = domainId; /* switch to active scans using this new channel list */ @@ -3572,7 +3572,7 @@ bool csr_learn_11dcountry_information(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, bool fForce) { - CDF_STATUS status; + QDF_STATUS status; uint8_t *pCountryCodeSelected; bool fRet = false; v_REGDOMAIN_t domainId; @@ -3588,7 +3588,7 @@ bool csr_learn_11dcountry_information(tpAniSirGlobal pMac, if (false == useVoting) { if (!pIesLocal && - (!CDF_IS_STATUS_SUCCESS( + (!QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies( pMac, pSirBssDesc, &pIesLocal)))) goto free_ie; @@ -3599,7 +3599,7 @@ bool csr_learn_11dcountry_information(tpAniSirGlobal pMac, status = csr_get_regulatory_domain_for_country(pMac, pIesLocal->Country.country, &domainId, SOURCE_QUERY); - if (CDF_IS_STATUS_SUCCESS(status) + if (QDF_IS_STATUS_SUCCESS(status) && (domainId == REGDOMAIN_WORLD)) goto free_ie; } /* useVoting == false */ @@ -3611,7 +3611,7 @@ bool csr_learn_11dcountry_information(tpAniSirGlobal pMac, status = csr_get_regulatory_domain_for_country(pMac, pCountryCodeSelected, &domainId, SOURCE_11D); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL("fail to get regId %d"), domainId); fRet = false; goto free_ie; @@ -3745,7 +3745,7 @@ bool csr_handle_scan11d1_failure(tpAniSirGlobal pMac, tSmeCmd *pCommand) /* Apply back the default setting and passively scan one more time. */ csr_apply_channel_power_info_wrapper(pMac); pCommand->u.scanCmd.reason = eCsrScan11d2; - if (CDF_IS_STATUS_SUCCESS(csr_scan_channels(pMac, pCommand))) { + if (QDF_IS_STATUS_SUCCESS(csr_scan_channels(pMac, pCommand))) { fRet = false; } @@ -3763,7 +3763,7 @@ csr_diag_scan_complete(tpAniSirGlobal pMac, tCsrScanResultInfo *pScanResult; tDot11fBeaconIEs *pIes; int n = 0, c = 0; - CDF_STATUS status; + QDF_STATUS status; WLAN_HOST_DIAG_LOG_ALLOC(pScanLog, host_log_scan_pkt_type, @@ -3786,7 +3786,7 @@ csr_diag_scan_complete(tpAniSirGlobal pMac, } status = csr_scan_get_result(pMac, NULL, &hScanResult); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { WLAN_HOST_DIAG_LOG_REPORT(pScanLog); return; } @@ -3796,7 +3796,7 @@ csr_diag_scan_complete(tpAniSirGlobal pMac, if (n < HOST_LOG_MAX_NUM_BSSID) { status = csr_get_parsed_bss_description_ies(pMac, &pScanResult->BssDescriptor, &pIes); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("fail to parse IEs")); break; } @@ -3835,15 +3835,15 @@ csr_diag_scan_complete(tpAniSirGlobal pMac, * * Saves the profile information from the SME's scan command * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, tSmeCmd *save_cmd, tSmeCmd *command) { tCsrScanResult *scan_result; tCsrScanResult *temp; uint32_t bss_len; - CDF_STATUS status; + QDF_STATUS status; save_cmd->u.scanCmd.pToRoamProfile = cdf_mem_malloc(sizeof(tCsrRoamProfile)); @@ -3855,7 +3855,7 @@ CDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, status = csr_roam_copy_profile(mac_ctx, save_cmd->u.scanCmd.pToRoamProfile, command->u.scanCmd.pToRoamProfile); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("csr_roam_copy_profile fail")); goto error; } @@ -3879,7 +3879,7 @@ CDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, sizeof(tCsrSSIDInfo)); if (!command->u.roamCmd.pRoamBssEntry) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; scan_result = GET_BASE_ADDR(command->u.roamCmd.pRoamBssEntry, tCsrScanResult, Link); @@ -3916,7 +3916,7 @@ CDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, temp->Link.last = temp->Link.next = NULL; save_cmd->u.roamCmd.pRoamBssEntry = (tListElem *)temp; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: csr_scan_handle_search_for_ssid_failure(mac_ctx, command); @@ -3927,7 +3927,7 @@ error: if (save_cmd->u.scanCmd.pToRoamProfile) cdf_mem_free(save_cmd->u.scanCmd.pToRoamProfile); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } static void @@ -3936,7 +3936,7 @@ csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *pCommand, bool *remove_cmd, uint32_t session_id, uint8_t chan) { - CDF_STATUS status, ret; + QDF_STATUS status, ret; tSmeCmd *save_cmd = NULL; switch (*nxt_cmd) { @@ -3966,19 +3966,19 @@ csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *pCommand, case eCsrNextLostLinkScan1Success: status = csr_issue_roam_after_lostlink_scan(mac_ctx, session_id, eCsrLostLink1); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) csr_scan_handle_failed_lostlink1(mac_ctx, session_id); break; case eCsrNextLostLinkScan2Success: status = csr_issue_roam_after_lostlink_scan(mac_ctx, session_id, eCsrLostLink2); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) csr_scan_handle_failed_lostlink2(mac_ctx, session_id); break; case eCsrNextLostLinkScan3Success: status = csr_issue_roam_after_lostlink_scan(mac_ctx, session_id, eCsrLostLink3); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) csr_scan_handle_failed_lostlink3(mac_ctx, session_id); break; case eCsrNextLostLinkScan1Failed: @@ -4016,7 +4016,7 @@ csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *pCommand, } status = csr_save_profile(mac_ctx, save_cmd, pCommand); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { /* csr_save_profile should report error */ sms_log(mac_ctx, LOGE, FL("profile save failed %d"), status); @@ -4026,7 +4026,7 @@ csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *pCommand, mac_ctx->sme.saved_scan_cmd = (void *)save_cmd; - if (CDF_STATUS_E_FAILURE == ret) { + if (QDF_STATUS_E_FAILURE == ret) { error: sms_log(mac_ctx, LOGE, FL("conn update fail %d"), chan); csr_scan_handle_search_for_ssid_failure(mac_ctx, @@ -4035,8 +4035,8 @@ error: cdf_mem_free(mac_ctx->sme.saved_scan_cmd); mac_ctx->sme.saved_scan_cmd = NULL; } - } else if ((CDF_STATUS_E_NOSUPPORT == ret) || - (CDF_STATUS_E_ALREADY == ret)) { + } else if ((QDF_STATUS_E_NOSUPPORT == ret) || + (QDF_STATUS_E_ALREADY == ret)) { sms_log(mac_ctx, LOGE, FL("conn update ret %d"), ret); csr_scan_handle_search_for_ssid(mac_ctx, pCommand); if (mac_ctx->sme.saved_scan_cmd) { @@ -4063,12 +4063,12 @@ error: * Scan entry in the active scan list mapping to the sent scan id * is returned to the caller. * - * Return: CDF_STATUS. + * Return: QDF_STATUS. */ -CDF_STATUS csr_get_active_scan_entry(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_get_active_scan_entry(tpAniSirGlobal mac_ctx, uint32_t scan_id, tListElem **entry) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tListElem *localentry; tSmeCmd *cmd; uint32_t cmd_scan_id = 0; @@ -4080,7 +4080,7 @@ CDF_STATUS csr_get_active_scan_entry(tpAniSirGlobal mac_ctx, sms_log(mac_ctx, LOGE, FL(" Active list Empty scanId: %d"), scan_id); csr_ll_unlock(&mac_ctx->sme.smeScanCmdActiveList); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } localentry = csr_ll_peek_head(&mac_ctx->sme.smeScanCmdActiveList, LL_ACCESS_NOLOCK); @@ -4095,7 +4095,7 @@ CDF_STATUS csr_get_active_scan_entry(tpAniSirGlobal mac_ctx, scan_id); *entry = localentry; csr_ll_unlock(&mac_ctx->sme.smeScanCmdActiveList); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } localentry = csr_ll_next(&mac_ctx->sme.smeScanCmdActiveList, localentry, LL_ACCESS_NOLOCK); @@ -4299,7 +4299,7 @@ bool csr_is_duplicate_bss_description(tpAniSirGlobal pMac, tSirMacCapabilityInfo *pCap1, *pCap2; tDot11fBeaconIEs *pIes1 = NULL; tDot11fBeaconIEs *pIesTemp = pIes2; - CDF_STATUS status; + QDF_STATUS status; pCap1 = (tSirMacCapabilityInfo *) &pSirBssDesc1->capabilityInfo; pCap2 = (tSirMacCapabilityInfo *) &pSirBssDesc2->capabilityInfo; @@ -4317,13 +4317,13 @@ bool csr_is_duplicate_bss_description(tpAniSirGlobal pMac, /* Check for SSID match, if exists */ status = csr_get_parsed_bss_description_ies(pMac, pSirBssDesc1, &pIes1); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_ies; if (NULL == pIesTemp) { status = csr_get_parsed_bss_description_ies(pMac, pSirBssDesc2, &pIesTemp); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_ies; } if (pIes1->SSID.present && pIesTemp->SSID.present) { @@ -4337,13 +4337,13 @@ bool csr_is_duplicate_bss_description(tpAniSirGlobal pMac, pSirBssDesc2->channelId)) { status = csr_get_parsed_bss_description_ies(pMac, pSirBssDesc1, &pIes1); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_ies; if (NULL == pIesTemp) { status = csr_get_parsed_bss_description_ies(pMac, pSirBssDesc2, &pIesTemp); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_ies; } @@ -4387,7 +4387,7 @@ static bool csr_scan_is_bss_allowed(tpAniSirGlobal pMac, bool fAllowed = false; eCsrPhyMode phyMode; - if (CDF_IS_STATUS_SUCCESS + if (QDF_IS_STATUS_SUCCESS (csr_get_phy_mode_from_bss(pMac, pBssDesc, &phyMode, pIes))) { switch (pMac->roam.configParam.phyMode) { case eCSR_DOT11_MODE_11b: @@ -4438,7 +4438,7 @@ static bool csr_scan_validate_scan_result(tpAniSirGlobal pMac, bool valid = false; tDot11fBeaconIEs *pIes = NULL; uint8_t index; - CDF_STATUS status; + QDF_STATUS status; for (index = 0; index < numChn; index++) { /* @@ -4459,7 +4459,7 @@ static bool csr_scan_validate_scan_result(tpAniSirGlobal pMac, if (valid) { status = csr_get_parsed_bss_description_ies(pMac, pBssDesc, &pIes); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return false; valid = csr_scan_is_bss_allowed(pMac, pBssDesc, pIes); @@ -4528,7 +4528,7 @@ static bool csr_scan_process_scan_results(tpAniSirGlobal pMac, tSmeCmd *pCommand * Return: 0 or other error codes. */ -CDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx, tSirBssDescription *bssdescr, uint32_t scan_id, uint32_t flags) { @@ -4538,7 +4538,7 @@ CDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx, uint32_t len = sizeof(mac_ctx->roam.validChannelList); sms_log(mac_ctx, LOG4, "CSR: Processing single bssdescr"); - if (CDF_IS_STATUS_SUCCESS( + if (QDF_IS_STATUS_SUCCESS( csr_get_cfg_valid_channels(mac_ctx, (uint8_t *) mac_ctx->roam.validChannelList, &len))) { @@ -4548,7 +4548,7 @@ CDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx, /* Cannot continue */ sms_log(mac_ctx, LOGW, FL("Received results on invalid channel")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (csr_scan_validate_scan_result(mac_ctx, chanlist, @@ -4562,7 +4562,7 @@ CDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx, if (ies != NULL) cdf_mem_free(ies); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -4579,10 +4579,10 @@ bool csr_scan_is_wild_card_scan(tpAniSirGlobal pMac, tSmeCmd *pCommand) && (pCommand->u.scanCmd.u.scanRequest.SSIDs.numOfSSIDs != 1); } -CDF_STATUS csr_scan_sme_scan_response(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_sme_scan_response(tpAniSirGlobal pMac, void *pMsgBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry = NULL; tSmeCmd *pCommand; eCsrScanStatus scanStatus; @@ -4633,7 +4633,7 @@ error_handling: sms_log(pMac, LOGE, FL("PNO Scan completion called.")); csr_save_scan_results(pMac, eCsrScanCandidateFound, pScanRsp->sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else { /* * Scan completion was called, PNO is active, but scan @@ -4641,11 +4641,11 @@ error_handling: */ sms_log(pMac, LOGE, FL("Scan completion called, scan rsp was not PNO.")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #endif sms_log(pMac, LOGE, FL("Scan completion called, but no active SCAN command.")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } tCsrScanResultInfo *csr_scan_result_get_first(tpAniSirGlobal pMac, @@ -4701,11 +4701,11 @@ tCsrScanResultInfo *csr_scan_result_get_next(tpAniSirGlobal pMac, * This function moves the first BSS that matches the bssid to the * head of the result */ -CDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, +QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, struct cdf_mac_addr *bssid, tScanResultHandle hScanResult) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tScanResultList *pResultList = (tScanResultList *) hScanResult; tCsrScanResult *pResult = NULL; tListElem *pEntry = NULL; @@ -4719,7 +4719,7 @@ CDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, pResult = GET_BASE_ADDR(pEntry, tCsrScanResult, Link); if (cdf_mem_compare(bssid, pResult->Result.BssDescriptor.bssId, sizeof(struct cdf_mac_addr))) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; csr_ll_remove_entry(&pResultList->List, pEntry, LL_ACCESS_NOLOCK); csr_ll_insert_head(&pResultList->List, pEntry, @@ -4797,10 +4797,10 @@ bool csr_scan_age_out_bss(tpAniSirGlobal pMac, tCsrScanResult *pResult) return fRet; } -CDF_STATUS csr_scan_age_results(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_age_results(tpAniSirGlobal pMac, tSmeGetScanChnRsp *pScanChnInfo) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry, *tmpEntry; tCsrScanResult *pResult; tLimScanChn *pChnInfo; @@ -4842,11 +4842,11 @@ CDF_STATUS csr_scan_age_results(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, +QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, tCsrScanRequest *pScanReq, tScanReqParam *pScanReqParam) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeScanReq *pMsg; uint16_t msgLen; tSirScanType scanType = pScanReq->scanType; @@ -4880,7 +4880,7 @@ CDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, pScanReq->ChannelInfo.numOfChannels, sme_request_type_to_string(pScanReq->requestType), pScanReq->requestType, pScanReq->p2pSearch); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(pMsg, msgLen, 0); @@ -4922,13 +4922,13 @@ CDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, uint32_t len = CDF_MAC_ADDR_SIZE; status = wlan_cfg_get_str(pMac, WNI_CFG_STA_ID, selfmac.bytes, &len); - if (!CDF_IS_STATUS_SUCCESS(status) + if (!QDF_IS_STATUS_SUCCESS(status) || (len < CDF_MAC_ADDR_SIZE)) { sms_log(pMac, LOGE, FL("Can't get self MAC address = %d"), status); /* Force failed status */ - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto send_scan_req; } } @@ -5031,7 +5031,7 @@ send_scan_req: pMsg->channelList.channelNumber[i]); } - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = cds_send_mb_message_to_mac(pMsg); } else { sms_log(pMac, LOGE, @@ -5042,18 +5042,18 @@ send_scan_req: return status; } -CDF_STATUS csr_send_mb_scan_result_req(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_scan_result_req(tpAniSirGlobal pMac, uint32_t sessionId, tScanReqParam *pScanReqParam) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeScanReq *pMsg; uint16_t msgLen; msgLen = (uint16_t) (sizeof(tSirSmeScanReq)); pMsg = cdf_mem_malloc(msgLen); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, msgLen, 0); pMsg->messageType = eWNI_SME_SCAN_REQ; @@ -5066,7 +5066,7 @@ CDF_STATUS csr_send_mb_scan_result_req(tpAniSirGlobal pMac, pMsg->returnAfterFirstMatch = pScanReqParam->bReturnAfter1stMatch; status = cds_send_mb_message_to_mac(pMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to send down scan req with status = %d\n"), status); @@ -5114,9 +5114,9 @@ static void csr_diag_scan_channels(tpAniSirGlobal pMac, tSmeCmd *pCommand) #define csr_diag_scan_channels(tpAniSirGlobal pMac, tSmeCmd *pCommand) (void)0; #endif /* #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR */ -CDF_STATUS csr_scan_channels(tpAniSirGlobal pMac, tSmeCmd *pCommand) +QDF_STATUS csr_scan_channels(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tScanReqParam scanReq; /* @@ -5147,11 +5147,11 @@ CDF_STATUS csr_scan_channels(tpAniSirGlobal pMac, tSmeCmd *pCommand) return status; } -static CDF_STATUS +static QDF_STATUS csr_issue_user_scan(tpAniSirGlobal mac_ctx, tSmeCmd *cmd) { int i, j; - CDF_STATUS status; + QDF_STATUS status; uint32_t len = 0; uint8_t *ch_lst = NULL; tCsrChannelInfo new_ch_info = { 0, NULL }; @@ -5171,7 +5171,7 @@ csr_issue_user_scan(tpAniSirGlobal mac_ctx, tSmeCmd *cmd) len = sizeof(mac_ctx->roam.validChannelList); status = csr_get_cfg_valid_channels(mac_ctx, (uint8_t *) mac_ctx->roam.validChannelList, &len); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* allocate twice the channel */ new_ch_info.ChannelList = (uint8_t *) cdf_mem_malloc(len * 2); @@ -5206,9 +5206,9 @@ csr_issue_user_scan(tpAniSirGlobal mac_ctx, tSmeCmd *cmd) return csr_scan_channels(mac_ctx, cmd); } -CDF_STATUS csr_process_scan_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) +QDF_STATUS csr_process_scan_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; sms_log(pMac, LOG3, FL("starting SCAN cmd in %d state. reason %d"), @@ -5224,7 +5224,7 @@ CDF_STATUS csr_process_scan_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) break; } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_release_scan_command(pMac, pCommand, eCSR_SCAN_FAILURE); } @@ -5391,11 +5391,11 @@ static bool csr_scan_filter_ibss_chnl_band(tpAniSirGlobal mac_ctx, * * Return: 0 - Success, Error number - Failure */ -CDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, tCsrScanRequest *dst_req, tCsrScanRequest *src_req) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t len = sizeof(mac_ctx->roam.validChannelList); uint32_t index = 0; uint32_t new_index = 0; @@ -5407,7 +5407,7 @@ CDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, !mac_ctx->scan.fEnableDFSChnlScan; status = csr_scan_free_request(mac_ctx, dst_req); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto complete; cdf_mem_copy(dst_req, src_req, sizeof(tCsrScanRequest)); /* Re-initialize the pointers to NULL since we did a copy */ @@ -5419,12 +5419,12 @@ CDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, dst_req->pIEField = cdf_mem_malloc(src_req->uIEFieldLen); if (NULL == dst_req->pIEField) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(mac_ctx, LOGE, FL("No memory for scanning IE fields")); goto complete; } else { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; cdf_mem_copy(dst_req->pIEField, src_req->pIEField, src_req->uIEFieldLen); dst_req->uIEFieldLen = src_req->uIEFieldLen; @@ -5440,7 +5440,7 @@ CDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, cdf_mem_malloc(src_req->ChannelInfo.numOfChannels * sizeof(*dst_req->ChannelInfo.ChannelList)); if (NULL == dst_req->ChannelInfo.ChannelList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; dst_req->ChannelInfo.numOfChannels = 0; sms_log(mac_ctx, LOGE, FL("No memory for scanning Channel List")); @@ -5471,7 +5471,7 @@ CDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, } } dst_req->ChannelInfo.numOfChannels = new_index; - } else if (CDF_IS_STATUS_SUCCESS( + } else if (QDF_IS_STATUS_SUCCESS( csr_get_cfg_valid_channels(mac_ctx, mac_ctx->roam.validChannelList, &len))) { @@ -5527,10 +5527,10 @@ CDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, cdf_mem_malloc(src_req->SSIDs.numOfSSIDs * sizeof(*dst_req->SSIDs.SSIDList)); if (NULL == dst_req->SSIDs.SSIDList) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(status)) { dst_req->SSIDs.numOfSSIDs = src_req->SSIDs.numOfSSIDs; cdf_mem_copy(dst_req->SSIDs.SSIDList, @@ -5551,14 +5551,14 @@ CDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, dst_req->timestamp = src_req->timestamp; complete: - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_scan_free_request(mac_ctx, dst_req); } return status; } -CDF_STATUS csr_scan_free_request(tpAniSirGlobal pMac, tCsrScanRequest *pReq) +QDF_STATUS csr_scan_free_request(tpAniSirGlobal pMac, tCsrScanRequest *pReq) { if (pReq->ChannelInfo.ChannelList) { @@ -5577,7 +5577,7 @@ CDF_STATUS csr_scan_free_request(tpAniSirGlobal pMac, tCsrScanRequest *pReq) } pReq->SSIDs.numOfSSIDs = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void csr_scan_call_callback(tpAniSirGlobal pMac, tSmeCmd *pCommand, @@ -5624,7 +5624,7 @@ static void csr_sta_ap_conc_timer_handler(void *pv) uint8_t i, j; tCsrChannelInfo *chn_info = NULL; uint8_t channel_to_scan[WNI_CFG_VALID_CHANNEL_LIST_LEN]; - CDF_STATUS status; + QDF_STATUS status; csr_ll_lock(&mac_ctx->scan.scanCmdPendingList); @@ -5741,7 +5741,7 @@ static void csr_sta_ap_conc_timer_handler(void *pv) status = csr_scan_copy_request(mac_ctx, &send_scancmd->u.scanCmd.u. scanRequest, &scan_req); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL(" Failed to get copy csr_scan_request = %d"), status); @@ -5778,9 +5778,9 @@ static void csr_sta_ap_conc_timer_handler(void *pv) } #endif -CDF_STATUS csr_scan_start_result_cfg_aging_timer(tpAniSirGlobal pMac) +QDF_STATUS csr_scan_start_result_cfg_aging_timer(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (pMac->scan.fScanEnable) { status = @@ -5791,7 +5791,7 @@ CDF_STATUS csr_scan_start_result_cfg_aging_timer(tpAniSirGlobal pMac) return status; } -CDF_STATUS csr_scan_stop_result_cfg_aging_timer(tpAniSirGlobal pMac) +QDF_STATUS csr_scan_stop_result_cfg_aging_timer(tpAniSirGlobal pMac) { return cdf_mc_timer_stop(&pMac->scan.hTimerResultCfgAging); } @@ -5849,7 +5849,7 @@ bool csr_scan_remove_fresh_scan_command(tpAniSirGlobal pMac, uint8_t sessionId) tDblLinkList *pCmdList; cdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!CDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return fRet; } @@ -5921,12 +5921,12 @@ void csr_release_scan_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, csr_release_command_scan(pMac, pCommand); } -CDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, tPmkidCandidateInfo *pPmkidList, uint32_t *pNumItems) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tCsrScanResultFilter *pScanFilter; tCsrScanResultInfo *pScanResult; @@ -5935,7 +5935,7 @@ CDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOGW, FL("pMac->scan.NumPmkidCandidate = %d"), @@ -5948,19 +5948,19 @@ CDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, *pNumItems = 0; pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); /* Here is the profile we need to connect to */ status = csr_roam_prepare_filter_from_profile(pMac, pSession->pCurRoamProfile, pScanFilter); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pScanFilter); return status; } status = csr_scan_get_result(pMac, pScanFilter, &hBSSList); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_free_scan_filter(pMac, pScanFilter); cdf_mem_free(pScanFilter); return status; @@ -5992,12 +5992,12 @@ CDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, } #ifdef FEATURE_WLAN_WAPI -CDF_STATUS csr_scan_get_bkid_candidate_list(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_get_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, tBkidCandidateInfo *pBkidList, uint32_t *pNumItems) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tCsrScanResultFilter *pScanFilter; tCsrScanResultInfo *pScanResult; @@ -6006,7 +6006,7 @@ CDF_STATUS csr_scan_get_bkid_candidate_list(tpAniSirGlobal pMac, if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOGW, FL("pMac->scan.NumBkidCandidate = %d"), @@ -6019,19 +6019,19 @@ CDF_STATUS csr_scan_get_bkid_candidate_list(tpAniSirGlobal pMac, *pNumItems = 0; pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); /* Here is the profile we need to connect to */ status = csr_roam_prepare_filter_from_profile(pMac, pSession->pCurRoamProfile, pScanFilter); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pScanFilter); return status; } status = csr_scan_get_result(pMac, pScanFilter, &hBSSList); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_free_scan_filter(pMac, pScanFilter); cdf_mem_free(pScanFilter); return status; @@ -6105,13 +6105,13 @@ static void csr_roam_copy_channellist(tpAniSirGlobal mac_ctx, * Function is usually used for BSSs that suppresses SSID so the profile * shall have one and only one SSID. * - * Return: Success - CDF_STATUS_SUCCESS, Failure - error number + * Return: Success - QDF_STATUS_SUCCESS, Failure - error number */ -CDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, +QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, tCsrRoamProfile *profile, uint32_t roam_id, bool notify) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; tSmeCmd *scan_cmd = NULL; tCsrScanRequest *scan_req = NULL; uint8_t index = 0; @@ -6142,13 +6142,13 @@ CDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, cdf_mem_malloc(sizeof(tCsrRoamProfile)); if (NULL == scan_cmd->u.scanCmd.pToRoamProfile) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else status = csr_roam_copy_profile(mac_ctx, scan_cmd->u.scanCmd.pToRoamProfile, profile); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto error; scan_cmd->u.scanCmd.roamId = roam_id; @@ -6182,14 +6182,14 @@ CDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, cdf_mem_malloc(profile->nAddIEScanLength); if (NULL == scan_req->pIEField) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; cdf_mem_set(scan_req->pIEField, profile->nAddIEScanLength, 0); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_copy(scan_req->pIEField, profile->pAddIEScan, profile->nAddIEScanLength); @@ -6239,13 +6239,13 @@ CDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, profile->ChannelInfo.numOfChannels); if (NULL == scan_req->ChannelInfo.ChannelList) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; scan_req->ChannelInfo.numOfChannels = 0; - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_roam_is_channel_valid(mac_ctx, profile->ChannelInfo.ChannelList[0]); csr_roam_copy_channellist(mac_ctx, @@ -6263,11 +6263,11 @@ CDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, sizeof(tCsrSSIDInfo)); if (NULL == scan_req->SSIDs.SSIDList) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto error; ssids = &scan_req->SSIDs; @@ -6281,7 +6281,7 @@ CDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, /* Start process the command */ status = csr_queue_sme_command(mac_ctx, scan_cmd, false); error: - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL(" failed to iniate scan with status = %d"), status); if (scan_cmd) @@ -6298,7 +6298,7 @@ void csr_set_cfg_valid_channel_list(tpAniSirGlobal pMac, uint8_t *pChannelList, uint8_t NumChannels) { uint32_t dataLen = sizeof(uint8_t) * NumChannels; - CDF_STATUS status; + QDF_STATUS status; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: dump valid channel list(NumChannels(%d))", @@ -6316,7 +6316,7 @@ void csr_set_cfg_valid_channel_list(tpAniSirGlobal pMac, uint8_t *pChannelList, */ pMac->scan.fcc_constraint = false; status = csr_update_channel_list(pMac); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "failed to update the supported channel list"); } @@ -6451,22 +6451,22 @@ void csr_set_cfg_country_code(tpAniSirGlobal pMac, uint8_t *countryCode) * domain-specific settings (TX filter...) */ /* - if(CDF_IS_STATUS_SUCCESS(csr_get_regulatory_domain_for_country( + if(QDF_IS_STATUS_SUCCESS(csr_get_regulatory_domain_for_country( pMac, cc, &DomainId))) { halPhySetRegDomain(pMac, DomainId); } */ } -CDF_STATUS csr_get_country_code(tpAniSirGlobal pMac, uint8_t *pBuf, +QDF_STATUS csr_get_country_code(tpAniSirGlobal pMac, uint8_t *pBuf, uint8_t *pbLen) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; uint32_t len; if (pBuf && pbLen && (*pbLen >= WNI_CFG_COUNTRY_CODE_LEN)) { len = *pbLen; status = wlan_cfg_get_str(pMac, WNI_CFG_COUNTRY_CODE, pBuf, &len); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { *pbLen = (uint8_t) len; } } @@ -6520,10 +6520,10 @@ void csr_set_cfg_scan_control_list(tpAniSirGlobal pMac, uint8_t *countryCode, } /* AllocateMemory */ } -CDF_STATUS csr_scan_abort_mac_scan(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS csr_scan_abort_mac_scan(tpAniSirGlobal pMac, uint8_t sessionId, eCsrAbortReason reason) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; pMac->scan.fDropScanCmd = true; csr_remove_cmd_with_session_id_from_pending_list(pMac, @@ -6548,7 +6548,7 @@ void csr_remove_cmd_with_session_id_from_pending_list(tpAniSirGlobal pMac, tListElem *pEntryToRemove; cdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!CDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL("failed to open list")); return; } @@ -6598,7 +6598,7 @@ void csr_remove_cmd_from_pending_list(tpAniSirGlobal pMac, tListElem *pEntryToRemove; cdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!CDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return; } @@ -6633,9 +6633,9 @@ void csr_remove_cmd_from_pending_list(tpAniSirGlobal pMac, } -CDF_STATUS csr_scan_abort_scan_for_ssid(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_scan_abort_scan_for_ssid(tpAniSirGlobal pMac, uint32_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; pMac->scan.fDropScanCmd = true; csr_remove_scan_for_ssid_from_pending_list(pMac, @@ -6656,7 +6656,7 @@ void csr_remove_scan_for_ssid_from_pending_list(tpAniSirGlobal pMac, tListElem *pEntryToRemove; cdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!CDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return; } @@ -6709,7 +6709,7 @@ static void csr_send_scan_abort(tpAniSirGlobal mac_ctx, { tSirSmeScanAbortReq *msg; uint16_t msg_len; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; msg_len = (uint16_t)(sizeof(tSirSmeScanAbortReq)); msg = cdf_mem_malloc(msg_len); @@ -6727,7 +6727,7 @@ static void csr_send_scan_abort(tpAniSirGlobal mac_ctx, FL("Abort scan sent to Firmware scan_id %d session %d"), scan_id, session_id); status = cds_send_mb_message_to_mac(msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(msg); sms_log(mac_ctx, LOGE, FL("Failed to send abort scan.scan_id %d session %d"), @@ -6746,16 +6746,16 @@ static void csr_send_scan_abort(tpAniSirGlobal mac_ctx, * * .Remove Scan command from active scan list * - * Return: Success - CDF_STATUS_SUCCESS, Failure - error number + * Return: Success - QDF_STATUS_SUCCESS, Failure - error number */ -CDF_STATUS csr_abort_scan_from_active_list(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_abort_scan_from_active_list(tpAniSirGlobal mac_ctx, tDblLinkList *list, uint32_t session_id, eSmeCommandType scan_cmd_type, eCsrAbortReason abort_reason) { tListElem *entry; tSmeCmd *cmd; tListElem *entry_remove; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; csr_ll_lock(list); if (!csr_ll_is_list_empty(list, LL_ACCESS_NOLOCK)) { @@ -6786,10 +6786,10 @@ CDF_STATUS csr_abort_scan_from_active_list(tpAniSirGlobal mac_ctx, } -CDF_STATUS csr_scan_abort_mac_scan_not_for_connect(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_abort_mac_scan_not_for_connect(tpAniSirGlobal pMac, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (!csr_is_scan_for_roam_command_active(pMac)) { /* * Only abort the scan if it is not used for other roam/connect @@ -6816,7 +6816,7 @@ bool csr_roam_is_valid_channel(tpAniSirGlobal pMac, uint8_t channel) } #ifdef FEATURE_WLAN_SCAN_PNO -CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, tSirPrefNetworkFoundInd * pPrefNetworkFoundInd) { @@ -6828,7 +6828,7 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, tDot11fBeaconIEs *local_ie = NULL; tAniSSID tmpSsid; v_TIME_t timer = 0; - CDF_STATUS status; + QDF_STATUS status; tpSirMacMgmtHdr macHeader = (tpSirMacMgmtHdr) pPrefNetworkFoundInd->data; @@ -6837,14 +6837,14 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, if (NULL == parsed_frm) { sms_log(pMac, LOGE, FL("fail to allocate memory for frame")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } if (pPrefNetworkFoundInd->frameLength <= SIR_MAC_HDR_LEN_3A) { sms_log(pMac, LOGE, FL("Incorrect len(%d)"), pPrefNetworkFoundInd->frameLength); cdf_mem_free(parsed_frm); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (sir_convert_probe_frame2_struct(pMac, &pPrefNetworkFoundInd->data[SIR_MAC_HDR_LEN_3A], @@ -6854,7 +6854,7 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL("Parse error ProbeResponse, length=%d"), pPrefNetworkFoundInd->frameLength); cdf_mem_free(parsed_frm); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* 24 byte MAC header and 12 byte to ssid IE */ if (pPrefNetworkFoundInd->frameLength > @@ -6866,7 +6866,7 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, if (NULL == pScanResult) { sms_log(pMac, LOGE, FL("fail to allocate memory for frame")); cdf_mem_free(parsed_frm); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(pScanResult, sizeof(tCsrScanResult) + uLen, 0); pBssDescr = &pScanResult->Result.BssDescriptor; @@ -6927,11 +6927,11 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, local_ie = (tDot11fBeaconIEs *) (pScanResult->Result.pvIes); status = csr_get_parsed_bss_description_ies(pMac, &pScanResult->Result.BssDescriptor, &local_ie); - if (!(local_ie || CDF_IS_STATUS_SUCCESS(status))) { + if (!(local_ie || QDF_IS_STATUS_SUCCESS(status))) { sms_log(pMac, LOGE, FL("Cannot parse IEs")); csr_free_scan_result_entry(pMac, pScanResult); cdf_mem_free(parsed_frm); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } fDupBss = csr_remove_dup_bss_description(pMac, @@ -6946,7 +6946,7 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, cdf_mem_free(local_ie); csr_free_scan_result_entry(pMac, pScanResult); cdf_mem_free(parsed_frm); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } /* Add to scan cache */ csr_scan_add_result(pMac, pScanResult, local_ie, @@ -6955,7 +6955,7 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, if ((pScanResult->Result.pvIes == NULL) && local_ie) cdf_mem_free(local_ie); cdf_mem_free(parsed_frm); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_SCAN_PNO */ @@ -6994,7 +6994,7 @@ void csr_init_occupied_channels_list(tpAniSirGlobal pMac, uint8_t sessionId) pBssDesc = GET_BASE_ADDR(pEntry, tCsrScanResult, Link); pIes = (tDot11fBeaconIEs *) (pBssDesc->Result.pvIes); /* At this time, pBssDescription->Result.pvIes may be NULL */ - if (!pIes && !CDF_IS_STATUS_SUCCESS( + if (!pIes && !QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies(pMac, &pBssDesc->Result.BssDescriptor, &pIes))) continue; @@ -7012,19 +7012,19 @@ void csr_init_occupied_channels_list(tpAniSirGlobal pMac, uint8_t sessionId) csr_ll_unlock(&pMac->scan.scanResultList); } -CDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, uint32_t sessionId, struct cdf_mac_addr bssid, uint8_t channel) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tDot11fBeaconIEs *pNewIes = NULL; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tSirBssDescription *pNewBssDescriptor = NULL; uint32_t size = 0; if (NULL == pSession) { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } sms_log(pMac, LOG2, FL("Current bssid::"MAC_ADDRESS_STR), @@ -7032,24 +7032,24 @@ CDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, sms_log(pMac, LOG2, FL("My bssid::"MAC_ADDRESS_STR" channel %d"), MAC_ADDR_ARRAY(bssid.bytes), channel); - if (!CDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies( + if (!QDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies( pMac, pSession->pConnectBssDesc, &pNewIes))) { sms_log(pMac, LOGE, FL("Failed to parse IEs")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto free_mem; } size = pSession->pConnectBssDesc->length + sizeof(pSession->pConnectBssDesc->length); if (!size) { sms_log(pMac, LOGE, FL("length of bss descriptor is 0")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto free_mem; } pNewBssDescriptor = cdf_mem_malloc(size); if (NULL == pNewBssDescriptor) { sms_log(pMac, LOGE, FL("memory allocation failed")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto free_mem; } cdf_mem_copy(pNewBssDescriptor, pSession->pConnectBssDesc, size); @@ -7061,7 +7061,7 @@ CDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, pNewIes, true, sessionId)) { sms_log(pMac, LOGE, FL("csr_scan_append_bss_description failed")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto free_mem; } sms_log(pMac, LOGE, FL("entry successfully added in scan cache")); @@ -7102,7 +7102,7 @@ void update_cckmtsf(uint32_t *timeStamp0, uint32_t *timeStamp1, * @return Status */ #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, roam_offload_synch_ind *roam_sync_ind_ptr, tpSirBssDescription bss_desc_ptr) { @@ -7120,7 +7120,7 @@ CDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, if (scan_res_ptr == NULL) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, " fail to allocate memory for frame"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(scan_res_ptr, sizeof(tCsrScanResult) + length); @@ -7129,14 +7129,14 @@ CDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, (sizeof(tSirBssDescription) + length)); ies_local_ptr = (tDot11fBeaconIEs *)(scan_res_ptr->Result.pvIes); if (!ies_local_ptr && - (!CDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies( + (!QDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies( pMac, &scan_res_ptr->Result. BssDescriptor, &ies_local_ptr)))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:Cannot Parse IEs", __func__); csr_free_scan_result_entry(pMac, scan_res_ptr); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } dup_bss = csr_remove_dup_bss_description(pMac, @@ -7149,10 +7149,10 @@ CDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, cdf_mem_free(ies_local_ptr); csr_free_scan_result_entry(pMac, scan_res_ptr); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } csr_scan_add_result(pMac, scan_res_ptr, ies_local_ptr, session_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -7212,7 +7212,7 @@ void csr_scan_active_list_timeout_handle(void *userData) uint16_t scan_id; tSirSmeScanAbortReq *msg; uint16_t msg_len; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (scan_cmd == NULL) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -7242,7 +7242,7 @@ void csr_scan_active_list_timeout_handle(void *userData) msg->sessionId = scan_cmd->sessionId; msg->scan_id = scan_id; status = cds_send_mb_message_to_mac(msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL(" Failed to post message to LIM")); cdf_mem_free(msg); diff --git a/core/sme/src/csr/csr_cmd_process.c b/core/sme/src/csr/csr_cmd_process.c index 7fa7ec8aaa..0eb96e2d1e 100644 --- a/core/sme/src/csr/csr_cmd_process.c +++ b/core/sme/src/csr/csr_cmd_process.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. * @@ -46,11 +46,11 @@ * * This routine will handle all the message for csr to process * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS csr_msg_processor(tpAniSirGlobal mac_ctx, void *msg_buf) +QDF_STATUS csr_msg_processor(tpAniSirGlobal mac_ctx, void *msg_buf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeRsp *sme_rsp = (tSirSmeRsp *) msg_buf; #ifdef FEATURE_WLAN_SCAN_PNO tSirMbMsg *msg = (tSirMbMsg *) msg_buf; @@ -80,12 +80,12 @@ CDF_STATUS csr_msg_processor(tpAniSirGlobal mac_ctx, void *msg_buf) if (!session) { sms_log(mac_ctx, LOGE, FL("session %d not found, msgType : %d"), session_id, msg->type); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (eWNI_SME_SCAN_RSP == msg->type) { status = csr_scanning_state_msg_processor(mac_ctx, msg_buf); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) sms_log(mac_ctx, LOGE, FL("handling PNO scan resp 0x%X CSR state %d"), sme_rsp->messageType, cur_state); diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index db25910266..e21cde84b5 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -197,7 +197,7 @@ typedef struct { eCsrRoamState csr_roam_state_change(tpAniSirGlobal pMac, eCsrRoamState NewRoamState, uint8_t sessionId); -CDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf); void csr_roaming_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf); void csr_roam_joined_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf); bool csr_scan_complete(tpAniSirGlobal pMac, tSirSmeScanRsp *pScanRsp); @@ -210,39 +210,39 @@ bool csr_is_duplicate_bss_description(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc1, tSirBssDescription *pSirBssDesc2, tDot11fBeaconIEs *pIes2, bool fForced); -CDF_STATUS csr_roam_save_connected_bss_desc(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_save_connected_bss_desc(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDesc); bool csr_is_network_type_equal(tSirBssDescription *pSirBssDesc1, tSirBssDescription *pSirBssDesc2); -CDF_STATUS csr_scan_sme_scan_response(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS csr_scan_sme_scan_response(tpAniSirGlobal pMac, void *pMsgBuf); /* Prepare a filter base on a profile for parsing the scan results. Upon successful return, caller MUST call csr_free_scan_filter on pScanFilter when it is done with the filter. */ -CDF_STATUS csr_roam_prepare_filter_from_profile(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_prepare_filter_from_profile(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tCsrScanResultFilter *pScanFilter); -CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, tCsrRoamProfile *pDstProfile, tCsrRoamProfile *pSrcProfile); -CDF_STATUS csr_roam_start(tpAniSirGlobal pMac); +QDF_STATUS csr_roam_start(tpAniSirGlobal pMac); void csr_roam_stop(tpAniSirGlobal pMac, uint32_t sessionId); void csr_roam_startMICFailureTimer(tpAniSirGlobal pMac); void csr_roam_stopMICFailureTimer(tpAniSirGlobal pMac); void csr_roam_startTKIPCounterMeasureTimer(tpAniSirGlobal pMac); void csr_roam_stopTKIPCounterMeasureTimer(tpAniSirGlobal pMac); -CDF_STATUS csr_scan_open(tpAniSirGlobal pMac); -CDF_STATUS csr_scan_close(tpAniSirGlobal pMac); -CDF_STATUS csr_scan_request_lost_link1(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_scan_request_lost_link2(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_scan_request_lost_link3(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_scan_handle_failed_lostlink1(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_open(tpAniSirGlobal pMac); +QDF_STATUS csr_scan_close(tpAniSirGlobal pMac); +QDF_STATUS csr_scan_request_lost_link1(tpAniSirGlobal pMac, uint32_t sessionId); +QDF_STATUS csr_scan_request_lost_link2(tpAniSirGlobal pMac, uint32_t sessionId); +QDF_STATUS csr_scan_request_lost_link3(tpAniSirGlobal pMac, uint32_t sessionId); +QDF_STATUS csr_scan_handle_failed_lostlink1(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_scan_handle_failed_lostlink2(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_handle_failed_lostlink2(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_scan_handle_failed_lostlink3(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_handle_failed_lostlink3(tpAniSirGlobal pMac, uint32_t sessionId); tCsrScanResult *csr_scan_append_bss_description(tpAniSirGlobal pMac, tSirBssDescription * @@ -251,20 +251,20 @@ tCsrScanResult *csr_scan_append_bss_description(tpAniSirGlobal pMac, bool fForced, uint8_t sessionId); void csr_scan_call_callback(tpAniSirGlobal pMac, tSmeCmd *pCommand, eCsrScanStatus scanStatus); -CDF_STATUS csr_scan_copy_request(tpAniSirGlobal pMac, tCsrScanRequest *pDstReq, +QDF_STATUS csr_scan_copy_request(tpAniSirGlobal pMac, tCsrScanRequest *pDstReq, tCsrScanRequest *pSrcReq); -CDF_STATUS csr_scan_free_request(tpAniSirGlobal pMac, tCsrScanRequest *pReq); -CDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, +QDF_STATUS csr_scan_free_request(tpAniSirGlobal pMac, tCsrScanRequest *pReq); +QDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, tScanResultHandle *phResult); -CDF_STATUS csr_scan_for_ssid(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, uint32_t roamId, bool notify); -CDF_STATUS csr_scan_start_result_cfg_aging_timer(tpAniSirGlobal pMac); -CDF_STATUS csr_scan_stop_result_cfg_aging_timer(tpAniSirGlobal pMac); +QDF_STATUS csr_scan_start_result_cfg_aging_timer(tpAniSirGlobal pMac); +QDF_STATUS csr_scan_stop_result_cfg_aging_timer(tpAniSirGlobal pMac); void csr_scan_stop_timers(tpAniSirGlobal pMac); /* To remove fresh scan commands from the pending queue */ bool csr_scan_remove_fresh_scan_command(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_scan_abort_mac_scan(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS csr_scan_abort_mac_scan(tpAniSirGlobal pMac, uint8_t sessionId, eCsrAbortReason reason); void csr_remove_cmd_from_pending_list(tpAniSirGlobal pMac, tDblLinkList *pList, eSmeCommandType commandType); @@ -272,14 +272,14 @@ void csr_remove_cmd_with_session_id_from_pending_list(tpAniSirGlobal pMac, uint8_t sessionId, tDblLinkList *pList, eSmeCommandType commandType); -CDF_STATUS csr_scan_abort_mac_scan_not_for_connect(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_abort_mac_scan_not_for_connect(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_scan_abort_scan_for_ssid(tpAniSirGlobal pMac, uint32_t sessionId); +QDF_STATUS csr_scan_abort_scan_for_ssid(tpAniSirGlobal pMac, uint32_t sessionId); void csr_remove_scan_for_ssid_from_pending_list(tpAniSirGlobal pMac, tDblLinkList *pList, uint32_t sessionId); -CDF_STATUS csr_abort_scan_from_active_list(tpAniSirGlobal pMac, +QDF_STATUS csr_abort_scan_from_active_list(tpAniSirGlobal pMac, tDblLinkList *pList, uint32_t sessionId, eSmeCommandType scan_cmd_type, eCsrAbortReason abort_reason); @@ -288,7 +288,7 @@ CDF_STATUS csr_abort_scan_from_active_list(tpAniSirGlobal pMac, /* The logic is that whenever CSR add a BSS to scan result, it set the age count to */ /* a value. This function deduct the age count if channelId matches the BSS' channelId */ /* The BSS is remove if the count reaches 0. */ -CDF_STATUS csr_scan_age_results(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_age_results(tpAniSirGlobal pMac, tSmeGetScanChnRsp *pScanChnInfo); /* If fForce is true we will save the new String that is learn't. */ @@ -302,22 +302,22 @@ void csr_set_cfg_scan_control_list(tpAniSirGlobal pMac, uint8_t *countryCode, void csr_reinit_scan_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_free_scan_result_entry(tpAniSirGlobal pMac, tCsrScanResult *pResult); -CDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus u1, eCsrRoamResult u2); -CDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tScanResultHandle hBSSList, eCsrRoamReason reason, uint32_t roamId, bool fImediate, bool fClearScan); -CDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tCsrRoamModifyProfileFields *pModProfileFields, eCsrRoamReason reason, uint32_t roamId, bool fImediate); void csr_roam_complete(tpAniSirGlobal pMac, eCsrRoamCompleteResult Result, void *Context); -CDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, uint32_t sessionId, eCsrEncryptionType EncryptType, tSirBssDescription *pBssDescription, tSirMacAddr *bssId, bool addKey, @@ -325,20 +325,20 @@ CDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, uint32_t sessionI tAniKeyDirection aniKeyDirection, uint8_t keyId, uint16_t keyLength, uint8_t *pKey, uint8_t paeRole); -CDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pCommand, +QDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pCommand, bool fDisassoc, bool fMICFailure); -CDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes); void csr_roam_check_for_link_status_change(tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg); void csr_roam_stats_rsp_processor(tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg); -CDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamStartBssParams *pParam, tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc, uint32_t roamId); -CDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamSubState NewSubstate); bool csr_is_same_profile(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pProfile1, tCsrRoamProfile *pProfile2); @@ -348,38 +348,38 @@ bool csr_is_scan_for_roam_command_active(tpAniSirGlobal pMac); eRoamCmdStatus csr_get_roam_complete_status(tpAniSirGlobal pMac, uint32_t sessionId); /* pBand can be NULL if caller doesn't need to get it */ -CDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamDisconnectReason reason); -CDF_STATUS csr_roam_disconnect_internal(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_disconnect_internal(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamDisconnectReason reason); /* pCommand may be NULL */ void csr_roam_remove_duplicate_command(tpAniSirGlobal pMac, uint32_t sessionId, tSmeCmd *pCommand, eCsrRoamReason eRoamReason); -CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDescription, tCsrRoamProfile *pProfile, tDot11fBeaconIEs *pIes, uint16_t messageType); -CDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, tSirMacAddr bssId, uint16_t reasonCode); -CDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, tSirMacAddr bssId, uint16_t reasonCode); -CDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeDisassocInd pDisassocInd); -CDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal pMac, tpSirSmeDeauthInd pDeauthInd); -CDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, - CDF_STATUS status); -CDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, + QDF_STATUS status); +QDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, - CDF_STATUS Halstatus, + QDF_STATUS Halstatus, uint8_t sessionId); -CDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamBssType bssType, tCsrRoamStartBssParams *pParam, tSirBssDescription *pBssDesc); -CDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId); +QDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId); /* Caller should put the BSS' ssid to fiedl bssSsid when comparing SSID for a BSS. */ bool csr_is_ssid_match(tpAniSirGlobal pMac, uint8_t *ssid1, uint8_t ssid1Len, @@ -392,7 +392,7 @@ bool csr_is_phy_mode_match(tpAniSirGlobal pMac, uint32_t phyMode, bool csr_roam_is_channel_valid(tpAniSirGlobal pMac, uint8_t channel); /* pNumChan is a caller allocated space with the sizeof pChannels */ -CDF_STATUS csr_get_cfg_valid_channels(tpAniSirGlobal pMac, uint8_t *pChannels, +QDF_STATUS csr_get_cfg_valid_channels(tpAniSirGlobal pMac, uint8_t *pChannels, uint32_t *pNumChan); void csr_roam_ccm_cfg_set_callback(tpAniSirGlobal pMac, int32_t result); @@ -401,7 +401,7 @@ int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel); /* To free the last roaming profile */ void csr_free_roam_profile(tpAniSirGlobal pMac, uint32_t sessionId); void csr_free_connect_bss_desc(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, +QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, struct cdf_mac_addr *bssid, tScanResultHandle hScanResult); bool csr_check_ps_ready(void *pv); @@ -423,10 +423,10 @@ void csr_apply_channel_power_info_to_fw(tpAniSirGlobal pMac, void csr_apply_power2_current(tpAniSirGlobal pMac); void csr_assign_rssi_for_category(tpAniSirGlobal pMac, int8_t bestApRssi, uint8_t catOffset); -CDF_STATUS csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, tCsrRoamConnectedProfile * pConnProfile); -CDF_STATUS csr_roam_start_roaming(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_start_roaming(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamingReason roamingReason); /* return a bool to indicate whether roaming completed or continue. */ bool csr_roam_complete_roaming(tpAniSirGlobal pMac, uint32_t sessionId, @@ -440,7 +440,7 @@ void csr_reset_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId); #ifdef FEATURE_WLAN_WAPI void csr_reset_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId); #endif /* FEATURE_WLAN_WAPI */ -CDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, uint32_t tableSize, +QDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, uint32_t tableSize, tSirMacChanInfo *channelTable); /* To check whether a country code matches the one in the IE */ @@ -452,19 +452,19 @@ CDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, uint32_t tableS /* pIes cannot be NULL */ bool csr_match_country_code(tpAniSirGlobal pMac, uint8_t *pCountry, tDot11fBeaconIEs *pIes); -CDF_STATUS csr_roam_set_key(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_set_key(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamSetKey *pSetKey, uint32_t roamId); -CDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, csr_roam_completeCallback callback, void *pContext, uint8_t *pSelfMacAddr, uint8_t *pbSessionId, uint32_t type, uint32_t subType); /* fSync: true means cleanupneeds to handle synchronously. */ -CDF_STATUS csr_roam_close_session(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_close_session(tpAniSirGlobal pMac, uint32_t sessionId, bool fSync, csr_roamSessionCloseCallback callback, void *pContext); void csr_cleanup_session(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, struct cdf_mac_addr *bssid, +QDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, struct cdf_mac_addr *bssid, uint32_t *pSessionId); eCsrCfgDot11Mode csr_find_best_phy_mode(tpAniSirGlobal pMac, uint32_t phyMode); @@ -472,44 +472,44 @@ eCsrCfgDot11Mode csr_find_best_phy_mode(tpAniSirGlobal pMac, uint32_t phyMode); \fn csr_scan_enable \brief Enable the scanning feature of CSR. It must be called before any scan request can be performed. \param tHalHandle - HAL context handle - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_scan_enable(tpAniSirGlobal); +QDF_STATUS csr_scan_enable(tpAniSirGlobal); /* --------------------------------------------------------------------------- \fn csr_scan_disable \brief Disableing the scanning feature of CSR. After this function return success, no scan is performed until a successfull to csr_scan_enable \param tHalHandle - HAL context handle - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_scan_disable(tpAniSirGlobal); +QDF_STATUS csr_scan_disable(tpAniSirGlobal); /* --------------------------------------------------------------------------- \fn csr_scan_request \brief Request a 11d or full scan. \param callback - a callback function that scan calls upon finish, will not be called if csr_scan_request returns error \param pContext - a pointer passed in for the callback - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_scan_request(tpAniSirGlobal, uint16_t, tCsrScanRequest *, +QDF_STATUS csr_scan_request(tpAniSirGlobal, uint16_t, tCsrScanRequest *, csr_scan_completeCallback callback, void *pContext); /* --------------------------------------------------------------------------- \fn csrScanAbort \brief If a scan request is abort, the scan complete callback will be called first before csrScanAbort returns. \param pScanRequestID - The request ID returned from csr_scan_request - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csrScanAbort(tpAniSirGlobal, uint32_t scanRequestID); +QDF_STATUS csrScanAbort(tpAniSirGlobal, uint32_t scanRequestID); /* --------------------------------------------------------------------------- \fn csr_scan_get_result \brief Return scan results. \param pFilter - If pFilter is NULL, all cached results are returned \param phResult - an object for the result. - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_scan_get_result(tpAniSirGlobal, tCsrScanResultFilter *pFilter, +QDF_STATUS csr_scan_get_result(tpAniSirGlobal, tCsrScanResultFilter *pFilter, tScanResultHandle *phResult); /* --------------------------------------------------------------------------- @@ -517,22 +517,22 @@ CDF_STATUS csr_scan_get_result(tpAniSirGlobal, tCsrScanResultFilter *pFilter, \brief Clear scan results. \param pMac - pMac global pointer \param sessionId - Session Identifier - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_scan_flush_result(tpAniSirGlobal); +QDF_STATUS csr_scan_flush_result(tpAniSirGlobal); /* --------------------------------------------------------------------------- * \fn csr_scan_filter_results * \brief Filter scan results based on valid channel list. * \param pMac - Pointer to Global MAC structure - * \return CDF_STATUS + * \return QDF_STATUS ***------------------------------------------------------------------------------- */ -CDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac); +QDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac); void csr_save_scan_results(tpAniSirGlobal pMac, uint8_t reason, uint8_t sessionId); -CDF_STATUS csr_scan_flush_selective_result(tpAniSirGlobal, bool flushP2P); +QDF_STATUS csr_scan_flush_selective_result(tpAniSirGlobal, bool flushP2P); /* --------------------------------------------------------------------------- \fn csr_scan_result_get_first @@ -557,9 +557,9 @@ tCsrScanResultInfo *csr_scan_result_get_next(tpAniSirGlobal, \param pBuf - Caller allocated buffer with at least 3 bytes, upon success return, this has the country code \param pbLen - Caller allocated, as input, it indicates the length of pBuf. Upon success return, this contains the length of the data in pBuf - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_get_country_code(tpAniSirGlobal pMac, uint8_t *pBuf, +QDF_STATUS csr_get_country_code(tpAniSirGlobal pMac, uint8_t *pBuf, uint8_t *pbLen); /* --------------------------------------------------------------------------- @@ -567,9 +567,9 @@ CDF_STATUS csr_get_country_code(tpAniSirGlobal pMac, uint8_t *pBuf, \brief this function is to set the country code so channel/power setting matches the countrycode and the domain it belongs to. \param pCountry - Caller allocated buffer with at least 3 bytes specifying the country code - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_set_country_code(tpAniSirGlobal pMac, uint8_t *pCountry); +QDF_STATUS csr_set_country_code(tpAniSirGlobal pMac, uint8_t *pCountry); /* --------------------------------------------------------------------------- \fn csr_get_regulatory_domain_for_country @@ -579,9 +579,9 @@ CDF_STATUS csr_set_country_code(tpAniSirGlobal pMac, uint8_t *pCountry); \param pCountry - Caller allocated buffer with at least 3 bytes specifying the country code \param pDomainId - Caller allocated buffer to get the return domain ID upon success return. Can be NULL. \param source - the source of country information. - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_get_regulatory_domain_for_country(tpAniSirGlobal pMac, +QDF_STATUS csr_get_regulatory_domain_for_country(tpAniSirGlobal pMac, uint8_t *pCountry, v_REGDOMAIN_t *pDomainId, enum country_src source); @@ -594,13 +594,13 @@ bool csr_is_wmm_supported(tpAniSirGlobal pMac); bool csr_is_mcc_supported(tpAniSirGlobal pMac); /* Return SUCCESS is the command is queued, failed */ -CDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, +QDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, bool fHighPriority); tSmeCmd *csr_get_command_buffer(tpAniSirGlobal pMac); void csr_release_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_scan_flush_bss_entry(tpAniSirGlobal pMac, tpSmeCsaOffloadInd pCsaOffloadInd); -CDF_STATUS csr_get_active_scan_entry(tpAniSirGlobal mac, uint32_t scan_id, +QDF_STATUS csr_get_active_scan_entry(tpAniSirGlobal mac, uint32_t scan_id, tListElem **entry); #ifdef FEATURE_WLAN_WAPI @@ -691,9 +691,9 @@ int diag_enc_type_from_csr_type(eCsrEncryptionType encType); \brief remove all items(tCsrScanResult) in the list and free memory for each item \param hScanResult - returned from csr_scan_get_result. hScanResult is considered gone by calling this function and even before this function reutrns. - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_scan_result_purge(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_result_purge(tpAniSirGlobal pMac, tScanResultHandle hScanResult); /* /////////////////////////////////////////Common Scan ends */ @@ -703,9 +703,9 @@ CDF_STATUS csr_scan_result_purge(tpAniSirGlobal pMac, \brief To inititiate an association \param pProfile - can be NULL to join to any open ones \param pRoamId - to get back the request ID - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, uint32_t *pRoamId); @@ -719,9 +719,9 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, that might need modification dynamically once STA is up & running and this could trigger a reassoc \param pRoamId - to get back the request ID - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tCsrRoamModifyProfileFields modProfileFields, uint32_t *pRoamId); @@ -729,9 +729,9 @@ CDF_STATUS csr_roam_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, /* --------------------------------------------------------------------------- \fn csr_roam_reconnect \brief To disconnect and reconnect with the same profile - \return CDF_STATUS. It returns fail if currently not connected + \return QDF_STATUS. It returns fail if currently not connected -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_reconnect(tpAniSirGlobal pMac, uint32_t sessionId); +QDF_STATUS csr_roam_reconnect(tpAniSirGlobal pMac, uint32_t sessionId); /* --------------------------------------------------------------------------- \fn csr_roam_set_pmkid_cache @@ -739,11 +739,11 @@ CDF_STATUS csr_roam_reconnect(tpAniSirGlobal pMac, uint32_t sessionId); \param pPMKIDCache - caller allocated buffer point to an array of tPmkidCacheInfo \param numItems - a variable that has the number of tPmkidCacheInfo allocated when retruning, this is either the number needed or number of items put into pPMKIDCache - \return CDF_STATUS - when fail, it usually means the buffer allocated is not big enough and pNumItems + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough and pNumItems has the number of tPmkidCacheInfo. \Note: pNumItems is a number of tPmkidCacheInfo, not sizeof(tPmkidCacheInfo) * something -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, tPmkidCacheInfo *pPMKIDCache, uint32_t numItems, bool update_entire_cache); @@ -754,10 +754,10 @@ CDF_STATUS csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, *\param pMac - pointer to global structure for MAC *\param sessionId - Sme session id *\param pPSK_PMK - pointer to an array of Psk/Pmk - *\return CDF_STATUS - usually it succeed unless sessionId is not found + *\return QDF_STATUS - usually it succeed unless sessionId is not found *\Note: *-------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_set_psk_pmk(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_set_psk_pmk(tpAniSirGlobal pMac, uint32_t sessionId, uint8_t *pPSK_PMK, size_t pmk_len); /* --------------------------------------------------------------------------- @@ -766,10 +766,10 @@ CDF_STATUS csr_roam_set_psk_pmk(tpAniSirGlobal pMac, uint32_t sessionId, *\param pMac - pointer to global structure for MAC *\param sessionId - Sme session id *\param nRoamKeyMgmtOffloadEnabled - value of key mgmt offload enable - *\return CDF_STATUS - usually it succeed unless sessionId is not found + *\return QDF_STATUS - usually it succeed unless sessionId is not found *\Note: *-------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_set_key_mgmt_offload(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_set_key_mgmt_offload(tpAniSirGlobal pMac, uint32_t sessionId, bool nRoamKeyMgmtOffloadEnabled); #endif @@ -779,9 +779,9 @@ CDF_STATUS csr_roam_set_key_mgmt_offload(tpAniSirGlobal pMac, \param pLen - caller allocated memory that has the length of pBuf as input. Upon returned, *pLen has the needed or IE length in pBuf. \param pBuf - Caller allocated memory that contain the IE field, if any, upon return - \return CDF_STATUS - when fail, it usually means the buffer allocated is not big enough + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf); /* --------------------------------------------------------------------------- @@ -790,9 +790,9 @@ CDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, \param pLen - caller allocated memory that has the length of pBuf as input. Upon returned, *pLen has the needed or IE length in pBuf. \param pBuf - Caller allocated memory that contain the IE field, if any, upon return - \return CDF_STATUS - when fail, it usually means the buffer allocated is not big enough + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf); /* --------------------------------------------------------------------------- @@ -808,9 +808,9 @@ uint32_t csr_roam_get_num_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId); \param pNum - caller allocated memory that has the space of the number of pBuf tPmkidCacheInfo as input. Upon returned, *pNum has the needed or actually number in tPmkidCacheInfo. \param pPmkidCache - Caller allocated memory that contains PMKID cache, if any, upon return - \return CDF_STATUS - when fail, it usually means the buffer allocated is not big enough + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pNum, tPmkidCacheInfo *pPmkidCache); /** @@ -823,17 +823,17 @@ CDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, * @pProfile: pointer to a caller allocated structure * tCsrRoamConnectedProfile * - * Return: CDF_STATUS. Failure if not connected, success otherwise + * Return: QDF_STATUS. Failure if not connected, success otherwise */ -CDF_STATUS csr_roam_get_connect_profile(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_connect_profile(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamConnectedProfile *pProfile); /* --------------------------------------------------------------------------- \fn csr_roam_get_connect_state \brief To return the current connect state of Roaming - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_get_connect_state(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_connect_state(tpAniSirGlobal pMac, uint32_t sessionId, eCsrConnectState *pState); void csr_roam_free_connect_profile(tCsrRoamConnectedProfile *profile); @@ -843,9 +843,9 @@ void csr_roam_free_connect_profile(tCsrRoamConnectedProfile *profile); \brief HDD calls this function to set the WNI_CFG_VALID_CHANNEL_LIST base on the band/mode settings. This function must be called after CFG is downloaded and all the band/mode setting already passed into CSR. - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal pMac); +QDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal pMac); /** * csr_change_config_params() - The CSR API exposed for HDD to provide config @@ -862,25 +862,25 @@ CDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal pMac); * API provides info regarding 11d only at reset but we can extend this for * other params (PMC, QoS) which needs to be initialized again at reset. * - * Return: CDF_STATUS. status of operation + * Return: QDF_STATUS. status of operation */ -CDF_STATUS csr_change_config_params(tpAniSirGlobal pMac, +QDF_STATUS csr_change_config_params(tpAniSirGlobal pMac, tCsrUpdateConfigParam *pUpdateConfigParam); /* --------------------------------------------------------------------------- \fn csr_roam_connect_to_last_profile \brief To disconnect and reconnect with the same profile - \return CDF_STATUS. It returns fail if currently connected + \return QDF_STATUS. It returns fail if currently connected -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_connect_to_last_profile(tpAniSirGlobal pMac, uint32_t sessionId); +QDF_STATUS csr_roam_connect_to_last_profile(tpAniSirGlobal pMac, uint32_t sessionId); /* --------------------------------------------------------------------------- \fn csr_roam_disconnect \brief To disconnect from a network \param reason -- To indicate the reason for disconnecting. Currently, only eCSR_DISCONNECT_REASON_MIC_ERROR is meanful. - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_disconnect(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_disconnect(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamDisconnectReason reason); /* --------------------------------------------------------------------------- @@ -889,17 +889,17 @@ CDF_STATUS csr_roam_disconnect(tpAniSirGlobal pMac, uint32_t sessionId, \param pPmkidList - caller allocated buffer point to an array of tPmkidCandidateInfo \param pNumItems - pointer to a variable that has the number of tPmkidCandidateInfo allocated when retruning, this is either the number needed or number of items put into pPmkidList - \return CDF_STATUS - when fail, it usually means the buffer allocated is not big enough and pNumItems + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough and pNumItems has the number of tPmkidCandidateInfo. \Note: pNumItems is a number of tPmkidCandidateInfo, not sizeof(tPmkidCandidateInfo) * something -------------------------------------------------------------------------------*/ -CDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, tPmkidCandidateInfo *pPmkidList, uint32_t *pNumItems); /* This function is used to stop a BSS. It is similar of csr_roamIssueDisconnect but this function */ /* doesn't have any logic other than blindly trying to stop BSS */ -CDF_STATUS csr_roam_issue_stop_bss_cmd(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_stop_bss_cmd(tpAniSirGlobal pMac, uint32_t sessionId, bool fHighPriority); void csr_call_roaming_completion_callback(tpAniSirGlobal pMac, @@ -913,9 +913,9 @@ void csr_call_roaming_completion_callback(tpAniSirGlobal pMac, \param sessionId - session Id for Soft AP \param pPeerMacAddr - MAC of associated station to delete \param reason - reason code, be one of the tSirMacReasonCodes - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, uint32_t sessionId, const uint8_t *pPeerMacAddr, uint32_t reason); @@ -928,9 +928,9 @@ CDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, * * CSR function that HDD calls to issue a deauthenticate station command * - * Return: CDF_STATUS_SUCCESS on success or another CDF_STATUS_* on error + * Return: QDF_STATUS_SUCCESS on success or another CDF_STATUS_* on error */ -CDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, uint32_t sessionId, struct tagCsrDelStaParams *pDelStaParams); @@ -939,9 +939,9 @@ CDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, \brief csr function that HDD calls to start and stop tkip countermeasures \param sessionId - session Id for Soft AP \param bEnable - Flag to start/stop countermeasures - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId, bool bEnable); /* --------------------------------------------------------------------------- @@ -952,14 +952,14 @@ CDF_STATUS csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, \param pUsrContext - Opaque HDD context \param pfnSapEventCallback - Sap event callback in HDD \param pAssocStasBuf - Caller allocated memory to be filled with associatd stations info - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, CDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf); -CDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, CDF_MODULE_ID modId, struct cdf_mac_addr bssId, @@ -974,14 +974,14 @@ CDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, \param pUsrContext - Opaque HDD context \param pfnSapEventCallback - Sap event callback in HDD \param pRemoveMac - pointer to MAC address of session to be removed - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_get_wps_session_overlap(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wps_session_overlap(tpAniSirGlobal pMac, uint32_t sessionId, void *pUsrContext, void *pfnSapEventCallback, struct cdf_mac_addr pRemoveMac); -CDF_STATUS csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, uint32_t sessionId, struct cdf_mac_addr bssId, void *pUsrContext, @@ -992,9 +992,9 @@ CDF_STATUS csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, \fn csr_send_chng_mcc_beacon_interval \brief csr function that HDD calls to send Update beacon interval \param sessionId - session Id for Soft AP - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS +QDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal pMac, uint32_t sessionId); /* --------------------------------------------------------------------------- @@ -1009,10 +1009,10 @@ void update_cckmtsf(uint32_t *timeStamp0, uint32_t *timeStamp1, uint32_t *incr); #endif -CDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal pMac, uint32_t sessionId, tpSirBssDescription pBssDescription, eCsrRoamReason reason, bool fImmediate); -CDF_STATUS csr_dequeue_roam_command(tpAniSirGlobal pMac, eCsrRoamReason reason); +QDF_STATUS csr_dequeue_roam_command(tpAniSirGlobal pMac, eCsrRoamReason reason); void csr_init_occupied_channels_list(tpAniSirGlobal pMac, uint8_t sessionId); bool csr_neighbor_roam_is_new_connected_profile(tpAniSirGlobal pMac, uint8_t sessionId); @@ -1021,13 +1021,13 @@ bool csr_neighbor_roam_connected_profile_match(tpAniSirGlobal pMac, tCsrScanResult *pResult, tDot11fBeaconIEs *pIes); -CDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, uint32_t sessionId, struct cdf_mac_addr bssid, uint8_t channel); -CDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac); -CDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, +QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac); +QDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, uint32_t sessionId, const uint8_t *pBSSId, bool flush_cache); @@ -1037,16 +1037,16 @@ void csr_add_vote_for_country_info(tpAniSirGlobal pMac, uint8_t *pCountryCode); void csr_clear_votes_for_country_info(tpAniSirGlobal pMac); #endif -CDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, uint32_t channel, uint8_t session_id); #ifdef QCA_HT_2040_COEX -CDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal pMac, uint32_t sessionId, ePhyChanBondState cbMode, bool obssEnabled); #endif -CDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal mac, +QDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal mac, tSmeCmd *command); -CDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal mac, +QDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal mac, tSmeCmd *command); tSirBssDescription* csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle, @@ -1056,5 +1056,5 @@ void csr_release_scan_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, bool is_disconnect_pending(tpAniSirGlobal mac_ctx, uint8_t sessionid); void csr_scan_active_list_timeout_handle(void *userData); -CDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, +QDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, uint32_t session_id, tSmeCmd **sme_cmd); diff --git a/core/sme/src/csr/csr_link_list.c b/core/sme/src/csr/csr_link_list.c index 1fa0b8b6f5..da01816d02 100644 --- a/core/sme/src/csr/csr_link_list.c +++ b/core/sme/src/csr/csr_link_list.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -217,28 +217,28 @@ bool csr_ll_find_entry(tDblLinkList *pList, tListElem *pEntryToFind) return fFound; } -CDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList) +QDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status; if (!pList) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (LIST_FLAG_OPEN != pList->Flag) { pList->Count = 0; pList->cmdTimeoutTimer = NULL; - cdf_status = cdf_mutex_init(&pList->Lock); + qdf_status = cdf_mutex_init(&pList->Lock); - if (CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (QDF_IS_STATUS_SUCCESS(qdf_status)) { csr_list_init(&pList->ListHead); pList->Flag = LIST_FLAG_OPEN; pList->hHdd = hHdd; } else { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } } return status; diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index a2db166316..ba92198d1d 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -55,10 +55,10 @@ static void csr_neighbor_roam_reset_channel_info(tpCsrNeighborRoamChannelInfo static void csr_neighbor_roam_reset_preauth_control_info(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pDstProfile); -static CDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal pMac, +static QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal pMac, uint8_t sessionId); #define CSR_NEIGHBOR_ROAM_STATE_TRANSITION(mac_ctx, newstate, session) \ @@ -262,12 +262,12 @@ static void csr_neighbor_roam_trigger_handoff(tpAniSirGlobal pMac, } } -CDF_STATUS +QDF_STATUS csr_neighbor_roam_update_fast_roaming_enabled(tpAniSirGlobal pMac, uint8_t sessionId, const bool fastRoamEnabled) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; /* set fast roam enable/disable flag */ @@ -296,18 +296,18 @@ csr_neighbor_roam_update_fast_roaming_enabled(tpAniSirGlobal pMac, ("Unexpected state %s, returning failure"), mac_trace_get_neighbour_roam_state (pNeighborRoamInfo->neighborRoamState)); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; break; } - return cdf_status; + return qdf_status; } #ifdef FEATURE_WLAN_ESE -CDF_STATUS csr_neighbor_roam_update_ese_mode_enabled(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_update_ese_mode_enabled(tpAniSirGlobal pMac, uint8_t sessionId, const bool eseMode) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -338,18 +338,18 @@ CDF_STATUS csr_neighbor_roam_update_ese_mode_enabled(tpAniSirGlobal pMac, pNeighborRoamInfo->neighborRoamState); break; } - return cdf_status; + return qdf_status; } #endif -CDF_STATUS csr_neighbor_roam_set_lookup_rssi_threshold(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_set_lookup_rssi_threshold(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t neighborLookupRssiThreshold) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; switch (pNeighborRoamInfo->neighborRoamState) { case eCSR_NEIGHBOR_ROAM_STATE_CONNECTED: @@ -381,19 +381,19 @@ CDF_STATUS csr_neighbor_roam_set_lookup_rssi_threshold(tpAniSirGlobal pMac, ("Unexpected state %s, returning failure"), mac_trace_get_neighbour_roam_state (pNeighborRoamInfo->neighborRoamState)); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; break; } - return cdf_status; + return qdf_status; } -CDF_STATUS +QDF_STATUS csr_neighbor_roam_set_opportunistic_scan_threshold_diff(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nOpportunisticThresholdDiff) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -427,18 +427,18 @@ csr_neighbor_roam_set_opportunistic_scan_threshold_diff(tpAniSirGlobal pMac, NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Unexpected state %d returning failure"), pNeighborRoamInfo->neighborRoamState); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; break; } - return cdf_status; + return qdf_status; } -CDF_STATUS +QDF_STATUS csr_neighbor_roam_set_roam_rescan_rssi_diff(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamRescanRssiDiff) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -470,18 +470,18 @@ csr_neighbor_roam_set_roam_rescan_rssi_diff(tpAniSirGlobal pMac, NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Unexpected state %d returning failure"), pNeighborRoamInfo->neighborRoamState); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; break; } - return cdf_status; + return qdf_status; } -CDF_STATUS +QDF_STATUS csr_neighbor_roam_set_roam_bmiss_first_bcnt(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamBmissFirstBcnt) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -516,18 +516,18 @@ csr_neighbor_roam_set_roam_bmiss_first_bcnt(tpAniSirGlobal pMac, LOGE, FL("Unexpected state %d returning failure"), pNeighborRoamInfo->neighborRoamState); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; break; } - return cdf_status; + return qdf_status; } -CDF_STATUS +QDF_STATUS csr_neighbor_roam_set_roam_bmiss_final_bcnt(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamBmissFinalBcnt) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -561,18 +561,18 @@ csr_neighbor_roam_set_roam_bmiss_final_bcnt(tpAniSirGlobal pMac, LOGE, FL("Unexpected state %d returning failure"), pNeighborRoamInfo->neighborRoamState); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; break; } - return cdf_status; + return qdf_status; } -CDF_STATUS +QDF_STATUS csr_neighbor_roam_set_roam_beacon_rssi_weight(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamBeaconRssiWeight) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -606,10 +606,10 @@ csr_neighbor_roam_set_roam_beacon_rssi_weight(tpAniSirGlobal pMac, LOGE, FL("Unexpected state %d returning failure"), pNeighborRoamInfo->neighborRoamState); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; break; } - return cdf_status; + return qdf_status; } /*CleanUP Routines*/ @@ -773,9 +773,9 @@ void csr_neighbor_roam_purge_preauth_fail_list(tpAniSirGlobal pMac) * * This function adds the given BSSID to the Preauth fail list * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise */ -CDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx, uint8_t session_id, tSirMacAddr bssid) { @@ -797,20 +797,20 @@ CDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx, bssid, sizeof(tSirMacAddr))) { sms_log(mac_ctx, LOGW, FL("BSSID "MAC_ADDRESS_STR" already present in preauth fail list"), MAC_ADDR_ARRAY(bssid)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } if ((num_mac_addr + 1) > MAX_NUM_PREAUTH_FAIL_LIST_ADDRESS) { sms_log(mac_ctx, LOGE, FL("Cannot add, preauth fail list is full.")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(neighbor_roam_info->FTRoamInfo.preAuthFailList. macAddress[num_mac_addr], bssid, sizeof(tSirMacAddr)); neighbor_roam_info->FTRoamInfo.preAuthFailList.numMACAddress++; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -863,14 +863,14 @@ bool csr_neighbor_roam_is_preauth_candidate(tpAniSirGlobal pMac, * This function issues preauth request to PE with the 1st AP entry in the * roamable AP list * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise */ -static CDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, +static QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, uint8_t session_id) { tpCsrNeighborRoamControlInfo neighbor_roam_info = &mac_ctx->roam.neighborRoamInfo[session_id]; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamBSSInfo neighbor_bss_node; @@ -878,7 +878,7 @@ static CDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, /* This must not be true here */ CDF_ASSERT(neighbor_roam_info->FTRoamInfo.preauthRspPending == false); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* @@ -893,7 +893,7 @@ static CDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, if (NULL == neighbor_bss_node) { sms_log(mac_ctx, LOGW, FL("Roamable AP list is empty.. ")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else { csr_neighbor_roam_send_lfr_metric_event(mac_ctx, session_id, neighbor_bss_node->pBssDescription->bssId, @@ -908,7 +908,7 @@ static CDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, neighbor_bss_node->pBssDescription->bssId), (int)neighbor_bss_node->pBssDescription->channelId); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(mac_ctx, LOGE, FL("Return failed preauth request status %d"), status); @@ -943,17 +943,17 @@ static CDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, * pre-auth failed list. If no more entries present in roamable AP list, * transition to REPORT_SCAN state. * - * Return: CDF_STATUS_SUCCESS on success (i.e. pre-auth processed), - * CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success (i.e. pre-auth processed), + * QDF_STATUS_E_FAILURE otherwise */ -CDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx, uint8_t session_id, tSirRetStatus lim_status) { tpCsrNeighborRoamControlInfo neighbor_roam_info = &mac_ctx->roam.neighborRoamInfo[session_id]; - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS preauth_processed = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS preauth_processed = QDF_STATUS_SUCCESS; tpCsrNeighborRoamBSSInfo preauth_rsp_node = NULL; if (false == neighbor_roam_info->FTRoamInfo.preauthRspPending) { @@ -966,7 +966,7 @@ CDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx, NEIGHBOR_ROAM_DEBUG(mac_ctx, LOGW, FL("Unexpected pre-auth response in state %d"), neighbor_roam_info->neighborRoamState); - preauth_processed = CDF_STATUS_E_FAILURE; + preauth_processed = QDF_STATUS_E_FAILURE; goto DEQ_PREAUTH; } /* We can receive it in these 2 states. */ @@ -976,7 +976,7 @@ CDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx, FL("Preauth response received in state %s"), mac_trace_get_neighbour_roam_state (neighbor_roam_info->neighborRoamState)); - preauth_processed = CDF_STATUS_E_FAILURE; + preauth_processed = QDF_STATUS_E_FAILURE; goto DEQ_PREAUTH; } @@ -1088,7 +1088,7 @@ NEXT_PREAUTH: goto ABORT_PREAUTH; } /* Issue preauth request for the same/next entry */ - if (CDF_STATUS_SUCCESS == csr_neighbor_roam_issue_preauth_req( + if (QDF_STATUS_SUCCESS == csr_neighbor_roam_issue_preauth_req( mac_ctx, session_id)) goto DEQ_PREAUTH; ABORT_PREAUTH: @@ -1125,9 +1125,9 @@ DEQ_PREAUTH: * This function handles the RoamOffloadSynch and adds the * roamed AP to the preauth done list * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise */ -CDF_STATUS +QDF_STATUS csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, roam_offload_synch_ind *roam_sync_ind_ptr, uint8_t session_id) { @@ -1141,14 +1141,14 @@ csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("LFR3:Roam Offload Synch Ind received in state %d"), neighbor_roam_info_ptr->neighborRoamState); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } bss_info_ptr = cdf_mem_malloc(sizeof(tCsrNeighborRoamBSSInfo)); if (NULL == bss_info_ptr) { sms_log(pMac, LOGE, FL("LFR3:Memory allocation for Neighbor Roam BSS Info failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } bss_desc_len = roam_sync_ind_ptr->bss_desc_ptr->length + sizeof(roam_sync_ind_ptr->bss_desc_ptr->length); @@ -1161,7 +1161,7 @@ csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL("LFR3:Mem alloc for Neighbor Roam BSS Descriptor failed")); cdf_mem_free(bss_info_ptr); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } csr_ll_insert_tail(&neighbor_roam_info_ptr->FTRoamInfo.preAuthDoneList, @@ -1173,7 +1173,7 @@ csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR3:Entry added to Auth Done List"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /** @@ -1186,9 +1186,9 @@ csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, * This function creates a scan filter based on the currently * connected profile. Based on this filter, scan results are obtained * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise */ -CDF_STATUS +QDF_STATUS csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, tCsrScanResultFilter *pScanFilter, uint8_t sessionId) @@ -1203,7 +1203,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, CDF_ASSERT(pScanFilter != NULL); if (pScanFilter == NULL) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; cdf_mem_zero(pScanFilter, sizeof(tCsrScanResultFilter)); roam_params = &pMac->roam.configParam.roam_params; @@ -1219,7 +1219,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, if (NULL == pScanFilter->BSSIDs.bssid) { sms_log(pMac, LOGE, FL("Scan Filter BSSID mem alloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pScanFilter->BSSIDs.bssid, @@ -1244,7 +1244,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, if (NULL == pScanFilter->SSIDs.SSIDList) { sms_log(pMac, LOGE, FL("Scan Filter SSID mem alloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } for (i = 0; i < roam_params->num_ssid_allowed_list; i++) { pScanFilter->SSIDs.SSIDList[i].handoffPermitted = 1; @@ -1264,7 +1264,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, if (NULL == pScanFilter->SSIDs.SSIDList) { sms_log(pMac, LOGE, FL("Scan Filter SSID mem alloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pScanFilter->SSIDs.SSIDList->handoffPermitted = 1; pScanFilter->SSIDs.SSIDList->ssidHidden = 0; @@ -1308,7 +1308,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, FL("Scan Filter Ch list mem alloc failed")); cdf_mem_free(pScanFilter->SSIDs.SSIDList); pScanFilter->SSIDs.SSIDList = NULL; - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } for (i = 0; i < pScanFilter->ChannelInfo.numOfChannels; i++) { pScanFilter->ChannelInfo.ChannelList[i] = @@ -1335,7 +1335,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, pScanFilter->MFPRequired = pCurProfile->MFPRequired; pScanFilter->MFPCapable = pCurProfile->MFPCapable; #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } uint32_t csr_get_current_ap_rssi(tpAniSirGlobal pMac, @@ -1607,7 +1607,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, csr_scan_result_purge(mac_ctx, *scan_results_list); } -static CDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, +static QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, uint8_t sessionId) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = @@ -1615,7 +1615,7 @@ static CDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, tCsrScanResultFilter scanFilter; tScanResultHandle scanResult; uint32_t tempVal = 0; - CDF_STATUS hstatus; + QDF_STATUS hstatus; hstatus = csr_neighbor_roam_prepare_scan_profile_filter(pMac, &scanFilter, @@ -1624,15 +1624,15 @@ static CDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, FL ("11R/ESE/Other Association: Prepare scan to find neighbor AP filter status = %d"), hstatus); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { sms_log(pMac, LOGE, FL ("Scan Filter preparation failed for Assoc type %d.. Bailing out.."), tempVal); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } hstatus = csr_scan_get_result(pMac, &scanFilter, &scanResult); - if (hstatus != CDF_STATUS_SUCCESS) { + if (hstatus != QDF_STATUS_SUCCESS) { NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Get Scan Result status code %d"), hstatus); @@ -1647,7 +1647,7 @@ static CDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, if (tempVal) { csr_neighbor_roam_trigger_handoff(pMac, sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (csr_roam_is_roam_offload_scan_enabled(pMac)) { @@ -1666,7 +1666,7 @@ static CDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, CSR_NEIGHBOR_ROAM_STATE_TRANSITION (pMac, eCSR_NEIGHBOR_ROAM_STATE_CONNECTED, sessionId); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -1687,9 +1687,9 @@ static CDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, * This function is used to filter out the channels based on the * currently associated AP channel * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise */ -CDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t * pInputChannelList, @@ -1706,17 +1706,17 @@ CDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal pMac pMac->roam.neighborRoamInfo[sessionId].currAPoperationChannel; /* Check for NULL pointer */ if (!pInputChannelList) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; /* Check for NULL pointer */ if (!pOutputChannelList) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; if (inputNumOfChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Wrong Number of Input Channels %d", __func__, inputNumOfChannels); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } for (i = 0; i < inputNumOfChannels; i++) { if (get_rf_band(currAPoperationChannel) == @@ -1729,7 +1729,7 @@ CDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal pMac /* Return final number of channels */ *pMergedOutputNumOfChannels = numChannels; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1751,9 +1751,9 @@ CDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal pMac * copies the input channel list to the output channel list. if number * of merged channels are more than 100, num of channels set to 100 * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise */ -CDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, uint8_t *pInputChannelList, uint8_t inputNumOfChannels, uint8_t *pOutputChannelList, @@ -1767,23 +1767,23 @@ CDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, /* Check for NULL pointer */ if (!pInputChannelList) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; /* Check for NULL pointer */ if (!pOutputChannelList) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; if (inputNumOfChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Wrong Number of Input Channels %d", __func__, inputNumOfChannels); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (outputNumOfChannels >= WNI_CFG_VALID_CHANNEL_LIST_LEN) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Wrong Number of Output Channels %d", __func__, outputNumOfChannels); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Add the "new" channels in the input list to the end of the output list. */ for (i = 0; i < inputNumOfChannels; i++) { @@ -1813,7 +1813,7 @@ CDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, /* Return final number of channels */ *pMergedOutputNumOfChannels = numChannels; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1827,9 +1827,9 @@ CDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, * it generates channel list which will be used in REPORT_SCAN state to * scan for these neighbor APs * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise */ -CDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGlobal pMac, uint8_t sessionId) { tpRrmNeighborReportDesc pNeighborBssDesc; @@ -1940,7 +1940,7 @@ CDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba sms_log(pMac, LOGE, FL ("Memory allocation for Channel list failed.. TL event ignored")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. @@ -1992,7 +1992,7 @@ CDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba } pNeighborRoamInfo->roamChannelInfo.currentChanIndex = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_VOWIFI */ @@ -2094,7 +2094,7 @@ bool csr_neighbor_roam_is_new_connected_profile(tpAniSirGlobal pMac, pBssDesc = pPrevProfile->pBssDesc; if (pBssDesc) { - if (CDF_IS_STATUS_SUCCESS( + if (QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies(pMac, pBssDesc, &pIes)) && csr_neighbor_roam_is_ssid_and_security_match(pMac, pCurrProfile, pBssDesc, pIes)) { @@ -2148,9 +2148,9 @@ bool csr_neighbor_roam_connected_profile_match(tpAniSirGlobal pMac, * This function is used to prepare a channel list that is derived from * the list of valid channels and does not include those in the occupied list * - * Return CDF_STATUS + * Return QDF_STATUS */ -CDF_STATUS +QDF_STATUS csr_neighbor_roam_prepare_non_occupied_channel_list(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t *pInputChannelList, uint8_t numOfChannels, uint8_t *pOutputChannelList, @@ -2191,7 +2191,7 @@ csr_neighbor_roam_prepare_non_occupied_channel_list(tpAniSirGlobal pMac, /* Return the number of channels */ *pOutputNumOfChannels = outputNumOfChannels; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2230,9 +2230,9 @@ void csr_roam_reset_roam_params(tpAniSirGlobal mac_ctx) * data structures. Neighbor roam state transitions to INIT state whenever * this function is called except if the current state is REASSOCIATING * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, uint8_t sessionId) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = @@ -2244,7 +2244,7 @@ CDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, if (NULL == pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Disconn ind on session %d in state %d from bss :" @@ -2272,7 +2272,7 @@ CDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, "sessionId: %d, csrPersonna %d"), sessionId, (int)roam_session->pCurRoamProfile->csrPersona); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_WLAN_ESE if (pSession->connectedProfile.isESEAssoc) { @@ -2359,7 +2359,7 @@ CDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, REASON_DISCONNECTED); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2481,7 +2481,7 @@ static void csr_neighbor_roam_info_ctx_init( * csr_neighbor_roam_indicate_connect() * @pMac: mac context * @session_id: Session Id - * @cdf_status: CDF status + * @qdf_status: CDF status * * This function is called by CSR as soon as the station connects to an AP. * This initializes all the necessary data structures related to the @@ -2489,9 +2489,9 @@ static void csr_neighbor_roam_info_ctx_init( * * Return: CDF status */ -CDF_STATUS csr_neighbor_roam_indicate_connect( +QDF_STATUS csr_neighbor_roam_indicate_connect( tpAniSirGlobal pMac, uint8_t session_id, - CDF_STATUS cdf_status) + QDF_STATUS qdf_status) { tpCsrNeighborRoamControlInfo ngbr_roam_info = &pMac->roam.neighborRoamInfo[session_id]; @@ -2500,12 +2500,12 @@ CDF_STATUS csr_neighbor_roam_indicate_connect( tCsrRoamSession *session = &pMac->roam.roamSession[session_id]; tpSirSetActiveModeSetBncFilterReq msg; #endif - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* if session id invalid then we need return failure */ if (NULL == ngbr_roam_info || !CSR_IS_SESSION_VALID(pMac, session_id) || (NULL == pMac->roam.roamSession[session_id].pCurRoamProfile)) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG2, @@ -2520,7 +2520,7 @@ CDF_STATUS csr_neighbor_roam_indicate_connect( FL("Ignoring Connect ind received from a non STA." "session_id: %d, csrPersonna %d"), session_id, (int)session->pCurRoamProfile->csrPersona); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* if a concurrent session is running */ if ((false == @@ -2529,7 +2529,7 @@ CDF_STATUS csr_neighbor_roam_indicate_connect( sms_log(pMac, LOGE, FL("Ignoring Connect ind. received in multisession %d"), csr_is_concurrent_session_running(pMac)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->roam_synch_in_progress && @@ -2541,7 +2541,7 @@ CDF_STATUS csr_neighbor_roam_indicate_connect( if (msg == NULL) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "LFR3:Mem Alloc failed for beacon Filter Req"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } msg->messageType = eWNI_SME_SET_BCN_FILTER_REQ; msg->length = sizeof(uint8_t); @@ -2564,7 +2564,7 @@ CDF_STATUS csr_neighbor_roam_indicate_connect( switch (ngbr_roam_info->neighborRoamState) { case eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING: - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { /** * Just transition the state to INIT state.Rest of the * clean up happens when we get next connect indication @@ -2631,12 +2631,12 @@ void csr_neighbor_roam_purge_preauth_failed_list(tpAniSirGlobal pMac) \param pMac - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS on success, corresponding error code otherwise + \return QDF_STATUS_SUCCESS on success, corresponding error code otherwise ---------------------------------------------------------------------------*/ -CDF_STATUS csr_neighbor_roam_init11r_assoc_info(tpAniSirGlobal pMac) +QDF_STATUS csr_neighbor_roam_init11r_assoc_info(tpAniSirGlobal pMac) { - CDF_STATUS status; + QDF_STATUS status; uint8_t i; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL; tpCsr11rAssocNeighborInfo pFTRoamInfo = NULL; @@ -2666,10 +2666,10 @@ CDF_STATUS csr_neighbor_roam_init11r_assoc_info(tpAniSirGlobal pMac) MAX_BSS_IN_NEIGHBOR_RPT); status = csr_ll_open(pMac->hHdd, &pFTRoamInfo->preAuthDoneList); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(pMac, LOGE, FL("LL Open of preauth done AP List failed")); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } } return status; @@ -2683,12 +2683,12 @@ CDF_STATUS csr_neighbor_roam_init11r_assoc_info(tpAniSirGlobal pMac) \param pMac - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS on success, corresponding error code otherwise + \return QDF_STATUS_SUCCESS on success, corresponding error code otherwise ---------------------------------------------------------------------------*/ -CDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) +QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) { - CDF_STATUS status; + QDF_STATUS status; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -2736,7 +2736,7 @@ CDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) pNeighborRoamInfo->cfgParams.channelInfo.ChannelList) { sms_log(pMac, LOGE, FL("Memory Allocation for CFG Channel List failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } } else { pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL; @@ -2781,12 +2781,12 @@ CDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) sizeof(tCsrRoamConnectedProfile), 0); status = csr_ll_open(pMac->hHdd, &pNeighborRoamInfo->roamableAPList); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(pMac, LOGE, FL("LL Open of roam able AP List failed")); cdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo. ChannelList); pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL; - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } pNeighborRoamInfo->roamChannelInfo.currentChanIndex = @@ -2798,13 +2798,13 @@ CDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = false; status = csr_neighbor_roam_init11r_assoc_info(pMac); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(pMac, LOGE, FL("LL Open of roam able AP List failed")); cdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo. ChannelList); pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL; csr_ll_close(&pNeighborRoamInfo->roamableAPList); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } CSR_NEIGHBOR_ROAM_STATE_TRANSITION(pMac, eCSR_NEIGHBOR_ROAM_STATE_INIT, @@ -2812,7 +2812,7 @@ CDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = false; /* Set the Last Sent Cmd as RSO_STOP */ pNeighborRoamInfo->last_sent_cmd = ROAM_SCAN_OFFLOAD_STOP; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- @@ -2903,7 +2903,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, &mac_ctx->roam.neighborRoamInfo[session_id]; tCsrNeighborRoamBSSInfo handoff_node; uint32_t roamid = 0; - CDF_STATUS status; + QDF_STATUS status; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s session_id=%d", __func__, session_id); @@ -2948,7 +2948,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, */ status = csr_roam_copy_connected_profile(mac_ctx, session_id, &neighbor_roam_info->csrNeighborRoamProfile); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("csr_roam_copy_connected_profile failed %d"), status); @@ -2962,7 +2962,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, NEIGHBOR_ROAM_DEBUG(mac_ctx, LOGW, " csr_roamHandoffRequested: disassociating with current AP"); - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_roam_issue_disassociate_cmd (mac_ctx, session_id, eCSR_DISCONNECT_REASON_HANDOFF))) { @@ -3173,16 +3173,16 @@ bool csr_neighbor_middle_of_roaming(tpAniSirGlobal pMac, uint8_t sessionId) * This function is called by CSR as soon as TL posts the candidate * found indication to SME via MC thread * - * Return: CDF_STATUS_SUCCESS on success, corresponding error code otherwise + * Return: QDF_STATUS_SUCCESS on success, corresponding error code otherwise */ -CDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, void *pMsg) +QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, void *pMsg) { tSirSmeCandidateFoundInd *pSirSmeCandidateFoundInd = (tSirSmeCandidateFoundInd *) pMsg; uint32_t sessionId = pSirSmeCandidateFoundInd->sessionId; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; sms_log(pMac, LOG1, FL("Received indication from firmware")); @@ -3193,7 +3193,7 @@ CDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, void sms_log(pMac, LOGE, FL ("Received in not CONNECTED state OR uOsRequestedHandoff is set. Ignore it")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { /* Firmware indicated that roaming candidate is found. Beacons * are already in the SME scan results table. @@ -3209,11 +3209,11 @@ CDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, void */ status = csr_neighbor_roam_process_scan_complete(pMac, sessionId); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(pMac, LOGE, FL("Neighbor scan process complete failed with status %d"), status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } @@ -3231,13 +3231,13 @@ CDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, void * * Return: status */ -CDF_STATUS csr_neighbor_roam_process_handoff_req( +QDF_STATUS csr_neighbor_roam_process_handoff_req( tpAniSirGlobal mac_ctx, uint8_t session_id) { tpCsrNeighborRoamControlInfo roam_ctrl_info = &mac_ctx->roam.neighborRoamInfo[session_id]; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t roam_id; tCsrRoamProfile *profile = NULL; tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); @@ -3245,20 +3245,20 @@ CDF_STATUS csr_neighbor_roam_process_handoff_req( if (NULL == session) { sms_log(mac_ctx, LOGE, FL("session is NULL ")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } roam_id = GET_NEXT_ROAM_ID(&mac_ctx->roam); profile = cdf_mem_malloc(sizeof(tCsrRoamProfile)); if (NULL == profile) { sms_log(mac_ctx, LOGE, FL("Memory alloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(profile, sizeof(tCsrRoamProfile), 0); status = csr_roam_copy_profile(mac_ctx, profile, session->pCurRoamProfile); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("Profile copy failed")); goto end; } @@ -3270,7 +3270,7 @@ CDF_STATUS csr_neighbor_roam_process_handoff_req( profile->BSSIDs.numOfBSSIDs); if (NULL == profile->BSSIDs.bssid) { sms_log(mac_ctx, LOGE, FL("mem alloc failed for BSSID")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } } @@ -3294,7 +3294,7 @@ CDF_STATUS csr_neighbor_roam_process_handoff_req( if (NULL == profile->ChannelInfo.ChannelList) { sms_log(mac_ctx, LOGE, FL("mem alloc failed for ChannelList")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } } @@ -3304,7 +3304,7 @@ CDF_STATUS csr_neighbor_roam_process_handoff_req( /* do a SSID scan */ status = csr_scan_for_ssid(mac_ctx, session_id, profile, roam_id, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("SSID scan failed")); } @@ -3327,15 +3327,15 @@ end: \param pMac - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS on success, corresponding error code otherwise + \return QDF_STATUS_SUCCESS on success, corresponding error code otherwise ---------------------------------------------------------------------------*/ -CDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal pMac, - uint8_t sessionId, CDF_STATUS status) +QDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal pMac, + uint8_t sessionId, QDF_STATUS status) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_STATUS hstatus; + QDF_STATUS hstatus; sms_log(pMac, LOGE, FL("called ")); @@ -3344,36 +3344,36 @@ CDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal pMac, pNeighborRoamInfo->neighborRoamState) { sms_log(pMac, LOGE, FL("Received in not CONNECTED state. Ignore it")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* if SSID scan failed to find our candidate add an entry to csr scan cache ourself */ - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Add an entry to csr scan cache")); hstatus = csr_scan_create_entry_in_scan_cache(pMac, sessionId, pNeighborRoamInfo-> handoffReqInfo.bssid, pNeighborRoamInfo-> handoffReqInfo.channel); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { sms_log(pMac, LOGE, FL ("csr_scan_create_entry_in_scan_cache failed with status %d"), hstatus); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } /* Now we have completed scanning for the candidate provided by HDD. Let move on to HO */ hstatus = csr_neighbor_roam_process_scan_complete(pMac, sessionId); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { sms_log(pMac, LOGE, FL ("Neighbor scan process complete failed with status %d"), hstatus); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -3387,28 +3387,28 @@ CDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal pMac, * * Return: status */ -CDF_STATUS csr_neighbor_roam_handoff_req_hdlr( +QDF_STATUS csr_neighbor_roam_handoff_req_hdlr( tpAniSirGlobal mac_ctx, void *msg) { tAniHandoffReq *handoff_req = (tAniHandoffReq *) msg; uint32_t session_id = handoff_req->sessionId; tpCsrNeighborRoamControlInfo roam_ctrl_info = &mac_ctx->roam.neighborRoamInfo[session_id]; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* we must be in connected state, if not ignore it */ if (eCSR_NEIGHBOR_ROAM_STATE_CONNECTED != roam_ctrl_info->neighborRoamState) { sms_log(mac_ctx, LOGE, FL("Received in not CONNECTED state. Ignore it")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* save the handoff info came from HDD as part of the reassoc req */ handoff_req = (tAniHandoffReq *) msg; if (NULL == handoff_req) { sms_log(mac_ctx, LOGE, FL("Received msg is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* sanity check */ @@ -3418,7 +3418,7 @@ CDF_STATUS csr_neighbor_roam_handoff_req_hdlr( sms_log(mac_ctx, LOGE, FL ("Received req has same BSSID as current AP!!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } roam_ctrl_info->handoffReqInfo.channel = handoff_req->channel; @@ -3430,7 +3430,7 @@ CDF_STATUS csr_neighbor_roam_handoff_req_hdlr( status = csr_roam_offload_scan(mac_ctx, session_id, ROAM_SCAN_OFFLOAD_STOP, REASON_OS_REQUESTED_ROAMING_NOW); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(mac_ctx, LOGE, FL("csr_roam_offload_scan failed")); roam_ctrl_info->uOsRequestedHandoff = 0; @@ -3447,14 +3447,14 @@ CDF_STATUS csr_neighbor_roam_handoff_req_hdlr( * This function is called by CSR as soon as it gets rsp back for * ROAM_SCAN_OFFLOAD_STOP with reason REASON_OS_REQUESTED_ROAMING_NOW * - * Return: CDF_STATUS_SUCCESS on success, corresponding error code otherwise + * Return: QDF_STATUS_SUCCESS on success, corresponding error code otherwise */ -CDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal pMac, uint8_t sessionId) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* we must be in connected state, if not ignore it */ if ((eCSR_NEIGHBOR_ROAM_STATE_CONNECTED != pNeighborRoamInfo->neighborRoamState) @@ -3462,12 +3462,12 @@ CDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL ("Received in not CONNECTED state or uOsRequestedHandoff is not set. Ignore it")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { /* Let's go ahead with handoff */ status = csr_neighbor_roam_process_handoff_req(pMac, sessionId); } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { pNeighborRoamInfo->uOsRequestedHandoff = 0; } return status; @@ -3483,10 +3483,10 @@ CDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal pMac, \param pMac - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS on success, corresponding error code otherwise + \return QDF_STATUS_SUCCESS on success, corresponding error code otherwise ---------------------------------------------------------------------------*/ -CDF_STATUS csr_neighbor_roam_start_lfr_scan(tpAniSirGlobal pMac, uint8_t sessionId) +QDF_STATUS csr_neighbor_roam_start_lfr_scan(tpAniSirGlobal pMac, uint8_t sessionId) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -3496,5 +3496,5 @@ CDF_STATUS csr_neighbor_roam_start_lfr_scan(tpAniSirGlobal pMac, uint8_t session csr_roam_offload_scan(pMac, sessionId, ROAM_SCAN_OFFLOAD_START, REASON_NO_CAND_FOUND_OR_NOT_ROAMING_NOW); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } diff --git a/core/sme/src/csr/csr_tdls_process.c b/core/sme/src/csr/csr_tdls_process.c index e800fad1c0..d99bd997cd 100644 --- a/core/sme/src/csr/csr_tdls_process.c +++ b/core/sme/src/csr/csr_tdls_process.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. * @@ -51,9 +51,9 @@ * common routine to remove TDLS cmd from SME command list.. * commands are removed after getting reponse from PE. */ -CDF_STATUS csr_tdls_remove_sme_cmd(tpAniSirGlobal pMac, eSmeCommandType cmdType) +QDF_STATUS csr_tdls_remove_sme_cmd(tpAniSirGlobal pMac, eSmeCommandType cmdType) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tListElem *pEntry; tSmeCmd *pCommand; @@ -67,7 +67,7 @@ CDF_STATUS csr_tdls_remove_sme_cmd(tpAniSirGlobal pMac, eSmeCommandType cmdType) sizeof(tTdlsCmd)); csr_release_command(pMac, pCommand); sme_process_pending_queue(pMac); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } } @@ -83,13 +83,13 @@ CDF_STATUS csr_tdls_remove_sme_cmd(tpAniSirGlobal pMac, eSmeCommandType cmdType) * TDLS request API, called from HDD to send a TDLS frame in SME/CSR and * send message to PE to trigger TDLS discovery procedure. */ -CDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId, tCsrTdlsSendMgmt *tdlsSendMgmt) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSmeCmd *tdlsSendMgmtCmd; tTdlsSendMgmtCmdInfo *tdlsSendMgmtCmdInfo; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; /* If connected and in Infra. Only then allow this */ if (!CSR_IS_SESSION_VALID(pMac, sessionId) || @@ -112,7 +112,7 @@ CDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId, if ((0 != tdlsSendMgmt->len) && (NULL != tdlsSendMgmt->buf)) { tdlsSendMgmtCmdInfo->buf = cdf_mem_malloc(tdlsSendMgmt->len); if (NULL == tdlsSendMgmtCmdInfo->buf) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("Alloc Failed")); CDF_ASSERT(0); return status; @@ -128,20 +128,20 @@ CDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId, tdlsSendMgmtCmd->command = eSmeCommandTdlsSendMgmt; tdlsSendMgmtCmd->u.tdlsCmd.size = sizeof(tTdlsSendMgmtCmdInfo); sme_push_command(pMac, tdlsSendMgmtCmd, false); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; return status; } /* * TDLS request API, called from HDD to add a TDLS peer */ -CDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrStaParams *pstaParams) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSmeCmd *tdlsAddStaCmd; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; /* If connected and in Infra. Only then allow this */ if (CSR_IS_SESSION_VALID(pMac, sessionId) && @@ -200,7 +200,7 @@ CDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId, tdlsAddStaCmd->u.tdlsCmd.size = sizeof(tTdlsAddStaCmdInfo); sme_push_command(pMac, tdlsAddStaCmd, false); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } @@ -210,7 +210,7 @@ CDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId, /* * TDLS request API, called from HDD to Send Link Establishment Parameters */ -CDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, +QDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrTdlsLinkEstablishParams * @@ -218,7 +218,7 @@ CDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSmeCmd *tdlsLinkEstablishCmd; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; /* If connected and in Infra. Only then allow this */ if (CSR_IS_SESSION_VALID(pMac, sessionId) && csr_is_conn_state_connected_infra(pMac, sessionId) && @@ -270,7 +270,7 @@ CDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, tdlsLinkEstablishCmd->u.tdlsCmd.size = sizeof(tTdlsLinkEstablishCmdInfo); sme_push_command(pMac, tdlsLinkEstablishCmd, false); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } @@ -280,12 +280,12 @@ CDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, /* * TDLS request API, called from HDD to add a TDLS peer */ -CDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSmeCmd *tdlsAddStaCmd; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; /* If connected and in Infra. Only then allow this */ if (CSR_IS_SESSION_VALID(pMac, sessionId) && @@ -307,7 +307,7 @@ CDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId, tdlsAddStaCmd->u.tdlsCmd.size = sizeof(tTdlsAddStaCmdInfo); sme_push_command(pMac, tdlsAddStaCmd, false); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } @@ -317,12 +317,12 @@ CDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId, /* * TDLS request API, called from HDD to delete a TDLS peer */ -CDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSmeCmd *tdlsDelStaCmd; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; /* If connected and in Infra. Only then allow this */ if (CSR_IS_SESSION_VALID(pMac, sessionId) && @@ -343,7 +343,7 @@ CDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId, tdlsDelStaCmd->u.tdlsCmd.size = sizeof(tTdlsDelStaCmdInfo); sme_push_command(pMac, tdlsDelStaCmd, false); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } @@ -353,7 +353,7 @@ CDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId, /* * TDLS messages sent to PE . */ -CDF_STATUS tdls_send_message(tpAniSirGlobal pMac, uint16_t msg_type, +QDF_STATUS tdls_send_message(tpAniSirGlobal pMac, uint16_t msg_type, void *msg_data, uint32_t msg_size) { @@ -364,40 +364,40 @@ CDF_STATUS tdls_send_message(tpAniSirGlobal pMac, uint16_t msg_type, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, ("sending msg = %d"), pMsg->type); /* Send message. */ - if (cds_send_mb_message_to_mac(pMsg) != CDF_STATUS_SUCCESS) { + if (cds_send_mb_message_to_mac(pMsg) != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL("Cannot send message")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd) +QDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd) { tTdlsSendMgmtCmdInfo *tdlsSendMgmtCmdInfo = &cmd->u.tdlsCmd.u.tdlsSendMgmtCmdInfo; tSirTdlsSendMgmtReq *tdlsSendMgmtReq = NULL; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, cmd->sessionId); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (NULL == pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (NULL == pSession->pConnectBssDesc) { sms_log(pMac, LOGE, FL("BSS Description is not present")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } tdlsSendMgmtReq = cdf_mem_malloc(sizeof(tSirTdlsSendMgmtReq) + tdlsSendMgmtCmdInfo->len); if (NULL == tdlsSendMgmtReq) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("alloc failed")); CDF_ASSERT(0); return status; @@ -428,7 +428,7 @@ CDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd) (void *)tdlsSendMgmtReq, sizeof(tSirTdlsSendMgmtReq) + tdlsSendMgmtCmdInfo->len); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to send request to MAC")); } if (tdlsSendMgmtCmdInfo->len && tdlsSendMgmtCmdInfo->buf) { @@ -441,31 +441,31 @@ CDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd) return status; } -CDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) +QDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) { tTdlsAddStaCmdInfo *tdlsAddStaCmdInfo = &cmd->u.tdlsCmd.u.tdlsAddStaCmdInfo; tSirTdlsAddStaReq *tdlsAddStaReq = NULL; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, cmd->sessionId); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (NULL == pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (NULL == pSession->pConnectBssDesc) { sms_log(pMac, LOGE, FL("BSS description is not present")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } tdlsAddStaReq = cdf_mem_malloc(sizeof(tSirTdlsAddStaReq)); if (NULL == tdlsAddStaReq) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("alloc failed")); CDF_ASSERT(0); return status; @@ -506,37 +506,37 @@ CDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) status = tdls_send_message(pMac, eWNI_SME_TDLS_ADD_STA_REQ, (void *)tdlsAddStaReq, sizeof(tSirTdlsAddStaReq)); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to send request to MAC")); } return status; } -CDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) +QDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) { tTdlsDelStaCmdInfo *tdlsDelStaCmdInfo = &cmd->u.tdlsCmd.u.tdlsDelStaCmdInfo; tSirTdlsDelStaReq *tdlsDelStaReq = NULL; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, cmd->sessionId); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (NULL == pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (NULL == pSession->pConnectBssDesc) { sms_log(pMac, LOGE, FL("BSS description is not present")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } tdlsDelStaReq = cdf_mem_malloc(sizeof(tSirTdlsDelStaReq)); if (NULL == tdlsDelStaReq) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("alloc failed")); CDF_ASSERT(0); return status; @@ -558,7 +558,7 @@ CDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) status = tdls_send_message(pMac, eWNI_SME_TDLS_DEL_STA_REQ, (void *)tdlsDelStaReq, sizeof(tSirTdlsDelStaReq)); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to send request to MAC")); } return status; @@ -567,7 +567,7 @@ CDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) /* * commands received from CSR */ -CDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *cmd) +QDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *cmd) { eSmeCommandType cmdType = cmd->command; bool status = true; @@ -575,7 +575,7 @@ CDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *cmd) case eSmeCommandTdlsSendMgmt: { status = csr_tdls_process_send_mgmt(pMac, cmd); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = false; } } @@ -583,7 +583,7 @@ CDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *cmd) case eSmeCommandTdlsAddPeer: { status = csr_tdls_process_add_sta(pMac, cmd); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = false; } } @@ -591,7 +591,7 @@ CDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *cmd) case eSmeCommandTdlsDelPeer: { status = csr_tdls_process_del_sta(pMac, cmd); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = false; } } @@ -599,7 +599,7 @@ CDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *cmd) case eSmeCommandTdlsLinkEstablish: { status = csr_tdls_process_link_establish(pMac, cmd); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = false; } } @@ -614,17 +614,17 @@ CDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *cmd) return status; } -CDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) +QDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) { tTdlsLinkEstablishCmdInfo *tdlsLinkEstablishCmdInfo = &cmd->u.tdlsCmd.u.tdlsLinkEstablishCmdInfo; tSirTdlsLinkEstablishReq *tdlsLinkEstablishReq = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, cmd->sessionId); if (NULL == pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } tdlsLinkEstablishReq = cdf_mem_malloc(sizeof(tSirTdlsLinkEstablishReq)); @@ -632,7 +632,7 @@ CDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) if (tdlsLinkEstablishReq == NULL) { sms_log(pMac, LOGE, FL("alloc failed")); CDF_ASSERT(0); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } tdlsLinkEstablishReq->sessionId = cmd->sessionId; /* Using dialog as transactionId. This can be used to match response with request */ @@ -663,7 +663,7 @@ CDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) status = tdls_send_message(pMac, eWNI_SME_TDLS_LINK_ESTABLISH_REQ, (void *)tdlsLinkEstablishReq, sizeof(tSirTdlsLinkEstablishReq)); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to send request to MAC\n")); } return status; @@ -673,7 +673,7 @@ CDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) * TDLS Message processor, will be called after TDLS message recieved from * PE */ -CDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, +QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBuf) { tCsrRoamInfo roamInfo = { 0 }; @@ -809,6 +809,6 @@ CDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, break; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index f895d7e96b..562048d444 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -1011,10 +1011,10 @@ bool csr_is_valid_mc_concurrent_session(tpAniSirGlobal mac_ctx, pSession = CSR_GET_SESSION(mac_ctx, session_id); if (NULL == pSession->pCurRoamProfile) return false; - if (CDF_STATUS_SUCCESS == + if (QDF_STATUS_SUCCESS == csr_isconcurrentsession_valid(mac_ctx, session_id, pSession->pCurRoamProfile->csrPersona)) { - if (CDF_STATUS_SUCCESS == + if (QDF_STATUS_SUCCESS == csr_validate_mcc_beacon_interval(mac_ctx, bss_descr->channelId, &bss_descr->beaconInterval, session_id, @@ -1108,13 +1108,13 @@ bool csr_is_ssid_equal(tHalHandle hHal, tSirBssDescription *pSirBssDesc1, break; if (!pIesLocal && - !CDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies + !QDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies (pMac, pSirBssDesc2, &pIesLocal))) { sms_log(pMac, LOGE, FL(" fail to parse IEs")); break; } - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies(pMac, pSirBssDesc1, &pIes1))) { break; @@ -1152,7 +1152,7 @@ bool csr_is_bss_description_wme(tHalHandle hHal, tSirBssDescription *pSirBssDesc do { if (pIesTemp == NULL) { - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies (pMac, pSirBssDesc, &pIesTemp))) { fWme = false; @@ -1214,11 +1214,11 @@ eCsrMediaAccessType csr_get_qo_s_from_bss_desc(tHalHandle hHal, } /* Caller allocates memory for pIEStruct */ -CDF_STATUS csr_parse_bss_description_ies(tHalHandle hHal, +QDF_STATUS csr_parse_bss_description_ies(tHalHandle hHal, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIEStruct) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); int ieLen = (int)(pBssDesc->length + sizeof(pBssDesc->length) - @@ -1229,7 +1229,7 @@ CDF_STATUS csr_parse_bss_description_ies(tHalHandle hHal, (dot11f_unpack_beacon_i_es (pMac, (uint8_t *) pBssDesc->ieFields, ieLen, pIEStruct))) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } @@ -1238,11 +1238,11 @@ CDF_STATUS csr_parse_bss_description_ies(tHalHandle hHal, /* This function will allocate memory for the parsed IEs to the caller. Caller must free the memory */ /* after it is done with the data only if this function succeeds */ -CDF_STATUS csr_get_parsed_bss_description_ies(tHalHandle hHal, +QDF_STATUS csr_get_parsed_bss_description_ies(tHalHandle hHal, tSirBssDescription *pBssDesc, tDot11fBeaconIEs **ppIEStruct) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (pBssDesc && ppIEStruct) { @@ -1253,14 +1253,14 @@ CDF_STATUS csr_get_parsed_bss_description_ies(tHalHandle hHal, status = csr_parse_bss_description_ies(hHal, pBssDesc, *ppIEStruct); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(*ppIEStruct); *ppIEStruct = NULL; } } else { sms_log(pMac, LOGE, FL(" failed to allocate memory")); CDF_ASSERT(0); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } } @@ -1422,11 +1422,11 @@ uint32_t csr_translate_to_wni_cfg_dot11_mode(tpAniSirGlobal pMac, * * Return: success **/ -CDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal pMac, +QDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal pMac, tSirBssDescription *pBSSDescription, eCsrPhyMode *pPhyMode, tDot11fBeaconIEs *pIes) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; eCsrPhyMode phyMode = csr_translate_to_phy_mode_from_bss_desc(pBSSDescription); @@ -1647,7 +1647,7 @@ bool csr_is_phy_mode_match(tpAniSirGlobal pMac, uint32_t phyMode, eCsrCfgDot11Mode cfgDot11ModeToUse = eCSR_CFG_DOT11_MODE_AUTO; uint32_t bitMask, loopCount; - if (!CDF_IS_STATUS_SUCCESS(csr_get_phy_mode_from_bss(pMac, pSirBssDesc, + if (!QDF_IS_STATUS_SUCCESS(csr_get_phy_mode_from_bss(pMac, pSirBssDesc, &phyModeInBssDesc, pIes))) return fMatch; @@ -1876,9 +1876,9 @@ bool csr_is_profile_rsn(tCsrRoamProfile *pProfile) * * This function will check if concurrent session is valid * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS +QDF_STATUS csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, enum tCDF_ADAPTER_MODE cur_bss_persona) { @@ -1901,7 +1901,7 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("** STA session **")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case CDF_SAP_MODE: temp = eCSR_ASSOC_STATE_TYPE_IBSS_DISCONNECTED; @@ -1912,7 +1912,7 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Can't start SAP")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; #endif } break; @@ -1924,7 +1924,7 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Can't start SAP")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } break; case CDF_IBSS_MODE: @@ -1934,7 +1934,7 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("IBSS mode already exist")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else if (((bss_persona == CDF_P2P_GO_MODE) || (bss_persona == CDF_SAP_MODE)) && (connect_state != @@ -1944,7 +1944,7 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Can't start GO/SAP")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; #endif } break; @@ -1952,7 +1952,7 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("**P2P-Client session**")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; default: CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -1961,7 +1961,7 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, break; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -1971,16 +1971,16 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, * * This function is to update the mcc p2p beacon interval * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS csr_update_mcc_p2p_beacon_interval(tpAniSirGlobal mac_ctx) +QDF_STATUS csr_update_mcc_p2p_beacon_interval(tpAniSirGlobal mac_ctx) { uint32_t session_id = 0; tCsrRoamSession *roam_session; /* If MCC is not supported just break and return SUCCESS */ if (!mac_ctx->roam.configParam.fenableMCCMode) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; for (session_id = 0; session_id < CSR_ROAM_SESSION_MAX; session_id++) { /* @@ -2014,7 +2014,7 @@ CDF_STATUS csr_update_mcc_p2p_beacon_interval(tpAniSirGlobal mac_ctx) eCSR_ROAM_RESULT_NONE); } } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } uint16_t csr_calculate_mcc_beacon_interval(tpAniSirGlobal pMac, uint16_t sta_bi, @@ -2068,7 +2068,7 @@ uint16_t csr_calculate_mcc_beacon_interval(tpAniSirGlobal pMac, uint16_t sta_bi, return go_fbi; } -CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, +QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, uint8_t channelId, uint16_t *beaconInterval, uint32_t cursessionId, @@ -2079,7 +2079,7 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, /* If MCC is not supported just break */ if (!pMac->roam.configParam.fenableMCCMode) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } for (sessionId = 0; sessionId < CSR_ROAM_SESSION_MAX; sessionId++) { @@ -2115,7 +2115,7 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL ("*** MCC with SAP+STA sessions ****")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } else if (pMac->roam.roamSession[sessionId]. bssParams.bssPersona == @@ -2137,7 +2137,7 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, if (pMac->roam.configParam. fAllowMCCGODiffBI == 0x01) { return - CDF_STATUS_SUCCESS; + QDF_STATUS_SUCCESS; } /* Send only Broadcast disassoc and update beaconInterval */ /* If configuration is set to 0x04 then dont */ @@ -2205,7 +2205,7 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, (pMac); } return - CDF_STATUS_SUCCESS; + QDF_STATUS_SUCCESS; } /* Disconnect the P2P session */ else if (pMac->roam.configParam. @@ -2223,7 +2223,7 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, FL ("BeaconInterval is different cannot connect to preferred AP...")); return - CDF_STATUS_E_FAILURE; + QDF_STATUS_E_FAILURE; } } } @@ -2253,7 +2253,7 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL ("BeaconInterval is different cannot connect to P2P_GO network ...")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } break; @@ -2321,7 +2321,7 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, = new_beaconInterval; return - CDF_STATUS_SUCCESS; + QDF_STATUS_SUCCESS; } } } @@ -2331,12 +2331,12 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL(" Persona not supported : %d"), currBssPersona); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3038,7 +3038,7 @@ uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId, if (!pIesLocal && - (!CDF_IS_STATUS_SUCCESS + (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies (pMac, pSirBssDesc, &pIesLocal)))) { break; @@ -3367,7 +3367,7 @@ uint8_t csr_construct_wapi_ie(tpAniSirGlobal pMac, uint32_t sessionId, if (!pIesLocal && - (!CDF_IS_STATUS_SUCCESS + (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies (pMac, pSirBssDesc, &pIesLocal)))) { break; @@ -3613,7 +3613,7 @@ uint8_t csr_construct_wpa_ie(tHalHandle hHal, tCsrRoamProfile *pProfile, if (!pIesLocal && - (!CDF_IS_STATUS_SUCCESS + (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies (pMac, pSirBssDesc, &pIesLocal)))) { break; @@ -4706,7 +4706,7 @@ bool csr_match_bss(tHalHandle hal, tSirBssDescription *bss_descr, roam_params = &mac_ctx->roam.configParam.roam_params; if ((NULL == ie_dblptr) || (*ie_dblptr) == NULL) { /* If no IEs passed in, get our own. */ - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies(mac_ctx, bss_descr, &ie_ptr))) { goto end; @@ -4892,7 +4892,7 @@ bool csr_match_bss_to_connect_profile(tHalHandle hHal, do { if (!pIes) { - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies (pMac, pBssDesc, &pIesLocal))) { break; @@ -5387,34 +5387,34 @@ eCsrCfgDot11Mode csr_get_cfg_dot11_mode_from_csr_phy_mode(tCsrRoamProfile *pProf return cfgDot11Mode; } -CDF_STATUS csr_get_regulatory_domain_for_country(tpAniSirGlobal pMac, +QDF_STATUS csr_get_regulatory_domain_for_country(tpAniSirGlobal pMac, uint8_t *pCountry, v_REGDOMAIN_t *pDomainId, enum country_src source) { - CDF_STATUS status = CDF_STATUS_E_INVAL; - CDF_STATUS cdf_status; + QDF_STATUS status = QDF_STATUS_E_INVAL; + QDF_STATUS qdf_status; uint8_t countryCode[CDS_COUNTRY_CODE_LEN + 1]; v_REGDOMAIN_t domainId; if (pCountry) { countryCode[0] = pCountry[0]; countryCode[1] = pCountry[1]; - cdf_status = cds_get_reg_domain_from_country_code(&domainId, + qdf_status = cds_get_reg_domain_from_country_code(&domainId, countryCode, source); - if (CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (QDF_IS_STATUS_SUCCESS(qdf_status)) { if (pDomainId) { *pDomainId = domainId; } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } else { sms_log(pMac, LOGW, FL (" Couldn't find domain for country code %c%c"), pCountry[0], pCountry[1]); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } } @@ -5463,23 +5463,23 @@ bool csr_match_country_code(tpAniSirGlobal pMac, uint8_t *pCountry, return fRet; } -CDF_STATUS csr_get_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_get_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamModifyProfileFields * pModifyProfileFields) { if (!pModifyProfileFields) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(pModifyProfileFields, &pMac->roam.roamSession[sessionId].connectedProfile. modifyProfileFields, sizeof(tCsrRoamModifyProfileFields)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_set_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_set_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamModifyProfileFields * pModifyProfileFields) { @@ -5488,7 +5488,7 @@ CDF_STATUS csr_set_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId cdf_mem_copy(&pSession->connectedProfile.modifyProfileFields, pModifyProfileFields, sizeof(tCsrRoamModifyProfileFields)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -5597,14 +5597,14 @@ const char *sme_request_type_to_string(const uint8_t request_type) } } -CDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList, +QDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList, int numChannels, uint8_t channel) { int i = 0; /* Check for NULL pointer */ if (!pChannelList) - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; /* Make room for the addition. (Start moving from the back.) */ for (i = numChannels; i > 0; i--) { @@ -5614,7 +5614,7 @@ CDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList, /* Now add the NEW channel...at the front */ pChannelList[0] = channel; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_WLAN_DIAG_SUPPORT /** @@ -5661,11 +5661,11 @@ void csr_diag_event_report(tpAniSirGlobal pmac, uint16_t event_type, bool csr_wait_for_connection_update(tpAniSirGlobal mac, bool do_release_reacquire_lock) { - CDF_STATUS status, ret; + QDF_STATUS status, ret; if (do_release_reacquire_lock == true) { ret = sme_release_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(ret)) { + if (!QDF_IS_STATUS_SUCCESS(ret)) { cds_err("lock release fail %d", ret); return false; } @@ -5675,13 +5675,13 @@ bool csr_wait_for_connection_update(tpAniSirGlobal mac, if (do_release_reacquire_lock == true) { ret = sme_acquire_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(ret)) { + if (!QDF_IS_STATUS_SUCCESS(ret)) { cds_err("lock acquire fail %d", ret); return false; } } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("wait for event failed"); return false; } diff --git a/core/sme/src/nan/nan_api.c b/core/sme/src/nan/nan_api.c index f2008ef03b..12252ec80d 100644 --- a/core/sme/src/nan/nan_api.c +++ b/core/sme/src/nan/nan_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -70,9 +70,9 @@ void sme_nan_register_callback(tHalHandle hHal, NanCallback callback) * Nan Request structure ptr * * Returns: - * CDF_STATUS + * QDF_STATUS *****************************************************************************/ -CDF_STATUS sme_nan_request(tpNanRequestReq input) +QDF_STATUS sme_nan_request(tpNanRequestReq input) { cds_msg_t msg; tpNanRequest data; @@ -84,7 +84,7 @@ CDF_STATUS sme_nan_request(tpNanRequestReq input) if (data == NULL) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Memory allocation failure")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(data, data_len); @@ -98,15 +98,15 @@ CDF_STATUS sme_nan_request(tpNanRequestReq input) msg.reserved = 0; msg.bodyptr = data; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Not able to post WMA_NAN_REQUEST message to WMA")); cdf_mem_free(data); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /****************************************************************************** @@ -121,17 +121,17 @@ CDF_STATUS sme_nan_request(tpNanRequestReq input) * pMsg - Message body passed from WMA; includes NAN header * * Returns: -* CDF_STATUS +* QDF_STATUS ******************************************************************************/ -CDF_STATUS sme_nan_event(tHalHandle hHal, void *pMsg) +QDF_STATUS sme_nan_event(tHalHandle hHal, void *pMsg) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pMsg) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("msg ptr is NULL")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, FL("SME: Received sme_nan_event")); diff --git a/core/sme/src/oem_data/oem_data_api.c b/core/sme/src/oem_data/oem_data_api.c index 680fb34dbb..f38cdbdd8f 100644 --- a/core/sme/src/oem_data/oem_data_api.c +++ b/core/sme/src/oem_data/oem_data_api.c @@ -48,18 +48,18 @@ /* --------------------------------------------------------------------------- \fn oem_data_oem_data_req_open \brief This function must be called before any API call to (OEM DATA REQ/RSP module) - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS oem_data_oem_data_req_open(tHalHandle hHal) +QDF_STATUS oem_data_oem_data_req_open(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); do { /* initialize all the variables to null */ cdf_mem_set(&(pMac->oemData), sizeof(tOemDataStruct), 0); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "oem_data_oem_data_req_open: Cannot allocate memory for the timer function"); break; @@ -72,16 +72,16 @@ CDF_STATUS oem_data_oem_data_req_open(tHalHandle hHal) /* --------------------------------------------------------------------------- \fn oem_data_oem_data_req_close \brief This function must be called before closing the csr module - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS oem_data_oem_data_req_close(tHalHandle hHal) +QDF_STATUS oem_data_oem_data_req_close(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); do { - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "oem_data_oem_data_req_close: Failed in oem_data_oem_data_req_close at StopTimers"); break; @@ -92,14 +92,14 @@ CDF_STATUS oem_data_oem_data_req_close(tHalHandle hHal) } while (0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- \fn oem_data_release_oem_data_req_command \brief This function removes the oemDataCommand from the active list and - and frees up any memory occupied by this - \return CDF_STATUS + and frees up any memory occupied by this + \return QDF_STATUS -------------------------------------------------------------------------------*/ void oem_data_release_oem_data_req_command(tpAniSirGlobal pMac, tSmeCmd *pOemDataCmd, @@ -130,21 +130,21 @@ void oem_data_release_oem_data_req_command(tpAniSirGlobal pMac, \brief Request an OEM DATA RSP \param sessionId - Id of session to be used \param pOemDataReqID - pointer to an object to get back the request ID - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS oem_data_oem_data_req(tHalHandle hHal, +QDF_STATUS oem_data_oem_data_req(tHalHandle hHal, uint8_t sessionId, tOemDataReqConfig *oemDataReqConfig, uint32_t *pOemDataReqID) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSmeCmd *pOemDataCmd = NULL; tOemDataReq *cmd_req; do { if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } @@ -169,7 +169,7 @@ CDF_STATUS oem_data_oem_data_req(tHalHandle hHal, if (!cmd_req->data) { sms_log(pMac, LOGE, FL("memory alloc failed")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; break; } @@ -177,7 +177,7 @@ CDF_STATUS oem_data_oem_data_req(tHalHandle hHal, (void *)(oemDataReqConfig->data), cmd_req->data_len); } else { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } @@ -188,7 +188,7 @@ CDF_STATUS oem_data_oem_data_req(tHalHandle hHal, } while (0); - if (!CDF_IS_STATUS_SUCCESS(status) && pOemDataCmd) { + if (!QDF_IS_STATUS_SUCCESS(status) && pOemDataCmd) { oem_data_release_oem_data_req_command(pMac, pOemDataCmd, eOEM_DATA_REQ_FAILURE); pMac->oemData.oemDataReqActive = false; @@ -202,12 +202,12 @@ CDF_STATUS oem_data_oem_data_req(tHalHandle hHal, \brief Request an OEM DATA REQ to be passed down to PE \param pMac: \param pOemDataReq: Pointer to the oem data request - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS oem_data_send_mb_oem_data_req(tpAniSirGlobal pMac, +QDF_STATUS oem_data_send_mb_oem_data_req(tpAniSirGlobal pMac, tOemDataReq *pOemDataReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirOemDataReq *pMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, pOemDataReq->sessionId); @@ -217,13 +217,13 @@ CDF_STATUS oem_data_send_mb_oem_data_req(tpAniSirGlobal pMac, if (!pOemDataReq) { sms_log(pMac, LOGE, FL("oem data req is NULL")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } pMsg = cdf_mem_malloc(sizeof(*pMsg)); if (NULL == pMsg) { sms_log(pMac, LOGP, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } msgLen = (uint16_t) (sizeof(*pMsg) + pOemDataReq->data_len); @@ -250,12 +250,12 @@ CDF_STATUS oem_data_send_mb_oem_data_req(tpAniSirGlobal pMac, * This function is called by the sme_process_command when the case hits * eSmeCommandOemDataReq. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS oem_data_process_oem_data_req_command(tpAniSirGlobal pMac, +QDF_STATUS oem_data_process_oem_data_req_command(tpAniSirGlobal pMac, tSmeCmd *pOemDataReqCmd) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* check if the system is in proper mode of operation for * oem data req/rsp to be functional. Currently, concurrency is not @@ -268,7 +268,7 @@ CDF_STATUS oem_data_process_oem_data_req_command(tpAniSirGlobal pMac, * 3. BTAMP Mode */ - if (CDF_STATUS_SUCCESS == oem_data_is_oem_data_req_allowed(pMac)) { + if (QDF_STATUS_SUCCESS == oem_data_is_oem_data_req_allowed(pMac)) { sms_log(pMac, LOG1, FL("OEM_DATA REQ allowed in the current mode")); pMac->oemData.oemDataReqActive = true; @@ -277,10 +277,10 @@ CDF_STATUS oem_data_process_oem_data_req_command(tpAniSirGlobal pMac, } else { sms_log(pMac, LOG1, FL("OEM_DATA REQ not allowed in the current mode")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, FL("OEM_DATA Failure, Release command")); oem_data_release_oem_data_req_command(pMac, pOemDataReqCmd, eOEM_DATA_REQ_INVALID_MODE); @@ -297,11 +297,11 @@ CDF_STATUS oem_data_process_oem_data_req_command(tpAniSirGlobal pMac, * * This function processes the oem data response obtained from the PE * - * Return: CDF_STATUS. + * Return: QDF_STATUS. */ -CDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *pMsg) +QDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *pMsg) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac; tListElem *pEntry = NULL; tSmeCmd *pCommand = NULL; @@ -315,7 +315,7 @@ CDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *pMsg) do { if (pMsg == NULL) { sms_log(pMac, LOGE, "in %s msg ptr is NULL", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } @@ -365,12 +365,12 @@ CDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *pMsg) /* --------------------------------------------------------------------------- \fn oem_data_is_oem_data_req_allowed \brief This function checks if OEM DATA REQs can be performed in the - current driver state - \return CDF_STATUS + current driver state + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS oem_data_is_oem_data_req_allowed(tHalHandle hHal) +QDF_STATUS oem_data_is_oem_data_req_allowed(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t sessionId; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -382,7 +382,7 @@ CDF_STATUS oem_data_is_oem_data_req_allowed(tHalHandle hHal) sms_log(pMac, LOGW, "OEM DATA REQ is not allowed due to IBSS exist in session %d", sessionId); - status = CDF_STATUS_CSR_WRONG_STATE; + status = QDF_STATUS_CSR_WRONG_STATE; break; } } @@ -391,7 +391,7 @@ CDF_STATUS oem_data_is_oem_data_req_allowed(tHalHandle hHal) sms_log(pMac, LOG1, "Exiting oem_data_is_oem_data_req_allowed with status %d", status); - return (status); + return status; } #endif /*FEATURE_OEM_DATA_SUPPORT */ diff --git a/core/sme/src/p2p/p2p_api.c b/core/sme/src/p2p/p2p_api.c index 118f78ad31..05d23ae584 100644 --- a/core/sme/src/p2p/p2p_api.c +++ b/core/sme/src/p2p/p2p_api.c @@ -40,10 +40,10 @@ * *------------------------------------------------------------------*/ -CDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, +QDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, tSmeCmd *p2pRemainonChn) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tSirRemainOnChnReq *pMsg; uint32_t len; tCsrRoamSession *pSession = @@ -94,7 +94,7 @@ CDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, status = cds_send_mb_message_to_mac(pMsg); } error: - if (CDF_STATUS_E_FAILURE == status) + if (QDF_STATUS_E_FAILURE == status) csr_release_roc_req_cmd(pMac); return status; } @@ -105,9 +105,9 @@ error: * *------------------------------------------------------------------*/ -CDF_STATUS sme_remain_on_chn_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) +QDF_STATUS sme_remain_on_chn_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry = NULL; tSmeCmd *pCommand = NULL; bool fFound; @@ -145,10 +145,10 @@ CDF_STATUS sme_remain_on_chn_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) * *------------------------------------------------------------------*/ -CDF_STATUS sme_remain_on_chn_ready(tHalHandle hHal, uint8_t *pMsg) +QDF_STATUS sme_remain_on_chn_ready(tHalHandle hHal, uint8_t *pMsg) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry = NULL; tSmeCmd *pCommand = NULL; tCsrRoamInfo RoamInfo; @@ -174,10 +174,10 @@ CDF_STATUS sme_remain_on_chn_ready(tHalHandle hHal, uint8_t *pMsg) return status; } -CDF_STATUS sme_send_action_cnf(tHalHandle hHal, uint8_t *pMsg) +QDF_STATUS sme_send_action_cnf(tHalHandle hHal, uint8_t *pMsg) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo RoamInfo; tSirSmeRsp *pSmeRsp = (tSirSmeRsp *) pMsg; @@ -190,22 +190,22 @@ CDF_STATUS sme_send_action_cnf(tHalHandle hHal, uint8_t *pMsg) return status; } -CDF_STATUS sme_p2p_open(tHalHandle hHal) +QDF_STATUS sme_p2p_open(tHalHandle hHal) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* If static structure is too big, Need to change this function to allocate memory dynamically */ cdf_mem_zero(&pMac->p2pContext, sizeof(tp2pContext)); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sme_p2p_close(hHal); } return status; } -CDF_STATUS p2p_stop(tHalHandle hHal) +QDF_STATUS p2p_stop(tHalHandle hHal) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -216,10 +216,10 @@ CDF_STATUS p2p_stop(tHalHandle hHal) pMac->p2pContext.probeRspIeLength = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_p2p_close(tHalHandle hHal) +QDF_STATUS sme_p2p_close(tHalHandle hHal) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -230,7 +230,7 @@ CDF_STATUS sme_p2p_close(tHalHandle hHal) pMac->p2pContext.probeRspIeLength = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } tSirRFBand get_rf_band(uint8_t channel) @@ -256,23 +256,23 @@ tSirRFBand get_rf_band(uint8_t channel) \param duration - Duration for which we should remain on channel \param callback - callback function. \param pContext - argument to the callback function - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS p2p_remain_on_channel(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS p2p_remain_on_channel(tHalHandle hHal, uint8_t sessionId, uint8_t channel, uint32_t duration, remainOnChanCallback callback, void *pContext, uint8_t isP2PProbeReqAllowed, uint32_t scan_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSmeCmd *pRemainChlCmd = NULL; uint32_t phyMode; pRemainChlCmd = sme_get_command_buffer(pMac); if (pRemainChlCmd == NULL) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (SIR_BAND_5_GHZ == get_rf_band(channel)) { phyMode = WNI_CFG_PHY_MODE_11A; @@ -300,14 +300,14 @@ CDF_STATUS p2p_remain_on_channel(tHalHandle hHal, uint8_t sessionId, sms_log(pMac, LOGW, "exiting function %s", __func__); - return (status); + return status; } -CDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, const uint8_t *pBuf, uint32_t len, uint16_t wait, bool noack, uint16_t channel_freq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirMbMsgP2p *pMsg; uint16_t msgLen; @@ -316,7 +316,7 @@ CDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, msgLen = (uint16_t) ((sizeof(tSirMbMsgP2p)) + len); pMsg = cdf_mem_malloc(msgLen); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else { cdf_mem_set((void *)pMsg, msgLen, 0); pMsg->type = eWNI_SME_SEND_ACTION_FRAME_IND; @@ -328,13 +328,13 @@ CDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, cdf_mem_copy(pMsg->data, pBuf, len); status = cds_send_mb_message_to_mac(pMsg); } - return (status); + return status; } -CDF_STATUS p2p_cancel_remain_on_channel(tHalHandle hHal, +QDF_STATUS p2p_cancel_remain_on_channel(tHalHandle hHal, uint8_t sessionId, uint32_t scan_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirMbMsgP2p *pMsg; uint16_t msgLen; @@ -343,7 +343,7 @@ CDF_STATUS p2p_cancel_remain_on_channel(tHalHandle hHal, msgLen = (uint16_t) (sizeof(tSirMbMsgP2p)); pMsg = cdf_mem_malloc(msgLen); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else { cdf_mem_set((void *)pMsg, msgLen, 0); pMsg->type = eWNI_SME_ABORT_REMAIN_ON_CHAN_IND; @@ -353,19 +353,19 @@ CDF_STATUS p2p_cancel_remain_on_channel(tHalHandle hHal, status = cds_send_mb_message_to_mac(pMsg); } - return (status); + return status; } -CDF_STATUS p2p_set_ps(tHalHandle hHal, tP2pPsConfig *pNoA) +QDF_STATUS p2p_set_ps(tHalHandle hHal, tP2pPsConfig *pNoA) { tpP2pPsConfig pNoAParam; tSirMsgQ msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); pNoAParam = cdf_mem_malloc(sizeof(tP2pPsConfig)); if (NULL == pNoAParam) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else { cdf_mem_set(pNoAParam, sizeof(tP2pPsConfig), 0); cdf_mem_copy(pNoAParam, pNoA, sizeof(tP2pPsConfig)); diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c index 02a1229940..1672a8d498 100644 --- a/core/sme/src/qos/sme_qos.c +++ b/core/sme/src/qos/sme_qos.c @@ -363,7 +363,7 @@ struct sme_qos_cb_s { /* counter for assigning Dialog Tokens */ uint8_t nextDialogToken; } sme_qos_cb; -typedef CDF_STATUS (*sme_QosProcessSearchEntry)(tpAniSirGlobal pMac, +typedef QDF_STATUS (*sme_QosProcessSearchEntry)(tpAniSirGlobal pMac, tListElem *pEntry); sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, @@ -385,52 +385,52 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, uint8_t sessionId, sme_QosWmmTspecInfo *pTspec_Info, sme_QosEdcaAcType ac); -CDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, uint8_t sessionId, sme_QosWmmTspecInfo *pTspec_Info, sme_QosEdcaAcType ac); -CDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, uint8_t sessionId, sme_QosEdcaAcType ac, uint8_t tspec_mask); -CDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf); -CDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf); -CDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf); -CDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal pMac, void *pMsgBuf); -CDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal pMac, uint8_t sessionId); +QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, uint8_t sessionId, tSirAddtsRspInfo *pRsp); -CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, uint8_t sessionId, tSirAddtsRspInfo *pRsp); -CDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, +QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, sme_QosWmmTspecInfo *pCurrent_Tspec_Info, sme_QosWmmTspecInfo *pUpdated_Tspec_Info); -static CDF_STATUS sme_qos_update_params(uint8_t sessionId, +static QDF_STATUS sme_qos_update_params(uint8_t sessionId, sme_QosEdcaAcType ac, uint8_t tspec_mask, sme_QosWmmTspecInfo *pTspec_Info); @@ -439,46 +439,46 @@ sme_QosEdcaAcType sme_qos_up_to_ac(sme_QosWmmUpType up); bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, sme_QosEdcaAcType ac, tDot11fBeaconIEs *pIes); tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key); -CDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal pMac, sme_QosSearchInfo search_key, sme_QosProcessSearchEntry fnp); static void sme_qos_state_transition(uint8_t sessionId, sme_QosEdcaAcType ac, sme_QosStates new_state); -CDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head); -static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t sessionId); -CDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, +QDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head); +static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t sessionId); +QDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, sme_QosAssocInfo *pAssoc_info); -CDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry); -CDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry); +QDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntry); -CDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry); -CDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry); -CDF_STATUS sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal pMac, tListElem *pEntry); -CDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry); -CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal pMac, tListElem *pEntry); +QDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry); +QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry); +QDF_STATUS sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal pMac, tListElem *pEntry); +QDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry); +QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal pMac, tListElem *pEntry); static bool sme_qos_is_rsp_pending(uint8_t sessionId, sme_QosEdcaAcType ac); static bool sme_qos_is_uapsd_active(void); void sme_qos_pmc_offload_start_uapsd_callback(void *callbackContext, - uint32_t sessionId, CDF_STATUS status); + uint32_t sessionId, QDF_STATUS status); bool sme_qos_pmc_offload_check_routine(void *callbackContext, uint32_t sessionId); -static CDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal pMac, +static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal pMac, uint8_t sessionId); -static CDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, +static QDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, uint8_t sessionId); static void sme_qos_cleanup_ctrl_blk_for_handoff(tpAniSirGlobal pMac, uint8_t sessionId); -static CDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, +static QDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, uint8_t sessionId); bool sme_qos_validate_requested_params(tpAniSirGlobal pMac, sme_QosWmmTspecInfo *pQoSInfo, uint8_t sessionId); -extern CDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme); -extern CDF_STATUS sme_release_global_lock(tSmeStruct *psSme); -static CDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, +extern QDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme); +extern QDF_STATUS sme_release_global_lock(tSmeStruct *psSme); +static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, eSmeCommandType cmdType, sme_QosWmmTspecInfo *pQoSInfo, sme_QosEdcaAcType ac, uint8_t tspec_mask); @@ -491,12 +491,12 @@ static sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal pMac, sme_QosEdcaAcType ac, uint8_t tspecMask); static void sme_qos_init_a_cs(tpAniSirGlobal pMac, uint8_t sessionId); -static CDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId, +static QDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId, tCsrRoamModifyProfileFields * pModFields, bool fForce); static uint32_t sme_qos_assign_flow_id(void); static uint8_t sme_qos_assign_dialog_token(void); -static CDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionId, +static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionId, sme_QosSearchInfo search_key, uint8_t new_tspec_mask); @@ -509,13 +509,13 @@ static CDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionId, * This function must be called before any API call to * SME QoS module. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_open(tpAniSirGlobal pMac) +QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) { sme_QosSessionInfo *pSession; uint8_t sessionId; - CDF_STATUS status; + QDF_STATUS status; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: initializing SME-QoS module", __func__, __LINE__); /* init the control block */ @@ -526,11 +526,11 @@ CDF_STATUS sme_qos_open(tpAniSirGlobal pMac) sme_qos_cb.nextDialogToken = SME_QOS_MIN_DIALOG_TOKEN; /* init flow list */ status = csr_ll_open(pMac->hHdd, &sme_qos_cb.flow_list); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: %d: cannot initialize Flow List", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } for (sessionId = 0; sessionId < CSR_ROAM_SESSION_MAX; ++sessionId) { @@ -540,11 +540,11 @@ CDF_STATUS sme_qos_open(tpAniSirGlobal pMac) sme_qos_init_a_cs(pMac, sessionId); /* initialize the session's buffered command list */ status = csr_ll_open(pMac->hHdd, &pSession->bufferedCommandList); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: %d: cannot initialize cmd list for session %d", __func__, __LINE__, sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession->readyForPowerSave = true; } @@ -552,7 +552,7 @@ CDF_STATUS sme_qos_open(tpAniSirGlobal pMac) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: done initializing SME-QoS module", __func__, __LINE__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* -------------------------------------------------------------------------- @@ -561,9 +561,9 @@ CDF_STATUS sme_qos_open(tpAniSirGlobal pMac) call of sme_qos_open. \param pMac - Pointer to the global MAC parameter structure. - \return CDF_STATUS + \return QDF_STATUS ----------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_close(tpAniSirGlobal pMac) +QDF_STATUS sme_qos_close(tpAniSirGlobal pMac) { sme_QosSessionInfo *pSession; sme_QosEdcaAcType ac; @@ -608,7 +608,7 @@ CDF_STATUS sme_qos_close(tpAniSirGlobal pMac) } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: closed down QoS", __func__, __LINE__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -636,7 +636,7 @@ CDF_STATUS sme_qos_close(tpAniSirGlobal pMac) * admission control on the requested AC, HDD needs to provide the necessary * Traffic Specification (TSPEC) parameters otherwise SME is going to use the * default params. - * Return: CDF_STATUS_SUCCESS - Setup is successful. + * Return: QDF_STATUS_SUCCESS - Setup is successful. * Other status means Setup request failed */ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId, @@ -647,14 +647,14 @@ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId, uint32_t *pQosFlowID) { sme_QosSessionInfo *pSession; - CDF_STATUS lock_status = CDF_STATUS_E_FAILURE; + QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sme_QosStatusType status; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Setup requested by client on session %d", __func__, __LINE__, sessionId); lock_status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(lock_status)) { + if (!QDF_IS_STATUS_SUCCESS(lock_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_SETUP_FAILURE_RSP; @@ -719,14 +719,14 @@ sme_QosStatusType sme_qos_modify_req(tHalHandle hHal, sme_QosWmmTspecInfo *pQoSInfo, uint32_t QosFlowID) { - CDF_STATUS lock_status = CDF_STATUS_E_FAILURE; + QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sme_QosStatusType status; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Modify requested by client for Flow %d", __func__, __LINE__, QosFlowID); lock_status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(lock_status)) { + if (!QDF_IS_STATUS_SUCCESS(lock_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP; @@ -752,18 +752,18 @@ sme_QosStatusType sme_qos_modify_req(tHalHandle hHal, * HDD sould invoke this API only if an explicit request for QoS release has * come from Application * - * Return: CDF_STATUS_SUCCESS - Release is successful. + * Return: QDF_STATUS_SUCCESS - Release is successful. */ sme_QosStatusType sme_qos_release_req(tHalHandle hHal, uint32_t QosFlowID) { - CDF_STATUS lock_status = CDF_STATUS_E_FAILURE; + QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sme_QosStatusType status; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Release requested by client for Flow %d", __func__, __LINE__, QosFlowID); lock_status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(lock_status)) { + if (!QDF_IS_STATUS_SUCCESS(lock_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_RELEASE_FAILURE_RSP; @@ -792,12 +792,12 @@ void qos_release_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) * sme_process_msg() calls this function for the messages that * are handled by SME QoS module. * - * Return: CDF_STATUS enumeration. + * Return: QDF_STATUS enumeration. */ -CDF_STATUS sme_qos_msg_processor(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_qos_msg_processor(tpAniSirGlobal mac_ctx, uint16_t msg_type, void *msg) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tListElem *entry = NULL; tSmeCmd *command; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, @@ -862,17 +862,17 @@ CDF_STATUS sme_qos_msg_processor(tpAniSirGlobal mac_ctx, * The SME QoS API exposed to CSR to validate AP * capabilities regarding QoS support & any other QoS parameter validation. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc) { tDot11fBeaconIEs *pIes = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: validation for QAP & APSD", __func__, __LINE__); do { - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies( pMac, pBssDesc, &pIes))) { /* err msg */ @@ -898,7 +898,7 @@ CDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, __func__, __LINE__); break; } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } while (0); CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: validated with status = %d", @@ -916,16 +916,16 @@ CDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, \param ind - The event occurred of type sme_qos_csr_event_indType. \param pEvent_info - Information related to the event - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac, uint8_t sessionId, sme_qos_csr_event_indType ind, void *pEvent_info) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On Session %d Event %d received from CSR", __func__, __LINE__, sessionId, ind); @@ -1062,7 +1062,7 @@ uint8_t sme_qos_get_acm_mask(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDes * provide the necessary Traffic Specification (TSPEC) parameters otherwise SME * is going to use the default params. * - * Return: CDF_STATUS_SUCCESS - Setup is successful. + * Return: QDF_STATUS_SUCCESS - Setup is successful. * Other status means Setup request failed */ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, @@ -1085,7 +1085,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, uint8_t tmask = 0; uint8_t new_tmask = 0; sme_QosSearchInfo search_key; - CDF_STATUS hstatus; + QDF_STATUS hstatus; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for flow %d", __func__, __LINE__, sessionId, QosFlowID); @@ -1148,7 +1148,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, cmd.u.setupCmdInfo.hoRenewal = hoRenewal; cmd.u.setupCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the setup request in state = %d", __func__, __LINE__, pACInfo->curr_state); @@ -1288,7 +1288,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, cmd.u.setupCmdInfo.hoRenewal = hoRenewal; cmd.u.setupCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d couldn't buffer the setup " "request for flow %d in state = %d", @@ -1445,7 +1445,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, &pACInfo-> requested_QoSInfo [tmask - 1]); - if (hstatus == CDF_STATUS_SUCCESS) { + if (hstatus == QDF_STATUS_SUCCESS) { hstatus = sme_qos_aggregate_params (&pACInfo-> @@ -1458,7 +1458,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, } } - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -1568,7 +1568,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_setup_fnp); - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (hstatus)) { CDF_TRACE (CDF_MODULE_ID_SME, @@ -1677,7 +1677,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, sme_QosSearchInfo search_key; sme_QosCmdInfo cmd; uint8_t sessionId; - CDF_STATUS hstatus; + QDF_STATUS hstatus; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked for flow %d", __func__, __LINE__, QosFlowID); @@ -1769,7 +1769,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, cmd.u.modifyCmdInfo.QosFlowID = QosFlowID; cmd.u.modifyCmdInfo.QoSInfo = *pQoSInfo; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the modify request in state = %d", __func__, __LINE__, pACInfo->curr_state); @@ -1824,7 +1824,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, hstatus = sme_qos_update_params(sessionId, ac, pNewEntry->tspec_mask, &Aggr_Tspec_Info); - if (CDF_IS_STATUS_SUCCESS(hstatus)) { + if (QDF_IS_STATUS_SUCCESS(hstatus)) { pACInfo->requested_QoSInfo[pNewEntry->tspec_mask - 1] = Aggr_Tspec_Info; /* if ACM, send out a new ADDTS */ @@ -1864,7 +1864,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, hstatus = sme_qos_find_all_in_flow_list(pMac, search_key, sme_qos_modify_fnp); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { status = SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP; } @@ -1890,7 +1890,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_modification_notify_fnp); - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (hstatus)) { CDF_TRACE (CDF_MODULE_ID_SME, @@ -1963,7 +1963,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, cmd.u.modifyCmdInfo.QosFlowID = QosFlowID; cmd.u.modifyCmdInfo.QoSInfo = *pQoSInfo; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the modify request in state = %d", __func__, __LINE__, pACInfo->curr_state); @@ -2003,7 +2003,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, * The SME QoS internal function to request * for releasing a QoS flow running on a particular AC. - * Return: CDF_STATUS_SUCCESS - Release is successful. + * Return: QDF_STATUS_SUCCESS - Release is successful. */ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, uint32_t QosFlowID, @@ -2023,7 +2023,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, tCsrRoamModifyProfileFields modifyProfileFields; bool deltsIssued = false; uint8_t sessionId; - CDF_STATUS hstatus; + QDF_STATUS hstatus; bool biDirectionalFlowsPresent = false; bool uplinkFlowsPresent = false; bool downlinkFlowsPresent = false; @@ -2071,7 +2071,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, cmd.sessionId = sessionId; cmd.u.releaseCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the release request in state = %d", __func__, __LINE__, pACInfo->curr_state); @@ -2196,7 +2196,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, requested_QoSInfo [SME_QOS_TSPEC_MASK_BIT_2_SET - 1] = Aggr_Tspec_Info; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd (&cmd, false))) { CDF_TRACE @@ -2232,7 +2232,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, hstatus = sme_qos_update_params(sessionId, ac, flow_info->tspec_mask, &Aggr_Tspec_Info); - if (CDF_IS_STATUS_SUCCESS(hstatus)) { + if (QDF_IS_STATUS_SUCCESS(hstatus)) { pACInfo->requested_QoSInfo[flow_info-> tspec_mask - 1] = Aggr_Tspec_Info; @@ -2293,7 +2293,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_setup_fnp); - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (hstatus)) { CDF_TRACE (CDF_MODULE_ID_SME, @@ -2426,7 +2426,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, NULL, ac, flow_info-> tspec_mask); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -2475,7 +2475,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, hstatus = sme_qos_request_reassoc(pMac, sessionId, &modifyProfileFields, false); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -2590,7 +2590,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, cmd.sessionId = sessionId; cmd.u.releaseCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the release request in state = %d", __func__, __LINE__, pACInfo->curr_state); @@ -2669,7 +2669,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, sme_QosStatusType status = SME_QOS_STATUS_SETUP_FAILURE_RSP; tDot11fBeaconIEs *pIes = NULL; tCsrRoamModifyProfileFields modifyProfileFields; - CDF_STATUS hstatus; + QDF_STATUS hstatus; if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session Id %d is invalid", @@ -2692,7 +2692,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, hstatus = csr_get_parsed_bss_description_ies(pMac, pSession->assocInfo.pBssDesc, &pIes); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unable to parse BSS IEs", __func__, __LINE__, sessionId); @@ -2743,7 +2743,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, hstatus = qos_issue_command(pMac, sessionId, eSmeCommandAddTs, pTspec_Info, ac, 0); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_add_ts_req() failed", @@ -2783,7 +2783,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, sme_qos_request_reassoc(pMac, sessionId, &modifyProfileFields, false); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -2851,7 +2851,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, sme_qos_request_reassoc(pMac, sessionId, &modifyProfileFields, false); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -2880,13 +2880,13 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, * not required as we are ok with tspec getting programmed before set_key * as the roam timings are measured without tspec in reassoc! */ -CDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "########### Set Key Complete #############"); (void)sme_qos_process_buffered_cmd(sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_WLAN_ESE @@ -2901,9 +2901,9 @@ CDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac, * This function saves the TSPEC parameters that came along in the TSPEC IE * in the reassoc response * - * Return: CDF_STATUS_SUCCESS - Release is successful. + * Return: QDF_STATUS_SUCCESS - Release is successful. */ -CDF_STATUS sme_qos_ese_save_tspec_response(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_ese_save_tspec_response(tpAniSirGlobal pMac, uint8_t sessionId, tDot11fIEWMMTSPEC *pTspec, uint8_t ac, uint8_t tspecIndex) { @@ -2930,7 +2930,7 @@ CDF_STATUS sme_qos_ese_save_tspec_response(tpAniSirGlobal pMac, uint8_t sessionI convert_wmmtspec(pMac, &pAddtsRsp->rsp.tspec, pTspec); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2945,9 +2945,9 @@ CDF_STATUS sme_qos_ese_save_tspec_response(tpAniSirGlobal pMac, uint8_t sessionI * the reasso req from the STA would carry the TSPEC parameters which were * already negotiated with the older AP. * - * Return: CDF_STATUS_SUCCESS - Release is successful. + * Return: QDF_STATUS_SUCCESS - Release is successful. */ -CDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { @@ -2956,7 +2956,7 @@ CDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, tDot11fIEWMMTSPEC *pTspecIE = NULL; tCsrRoamSession *pCsrSession = NULL; tCsrRoamConnectedInfo *pCsrConnectedInfo = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint8_t ac, numTspec, cnt; uint8_t tspec_flow_index, tspec_mask_status; uint32_t tspecIeLen; @@ -2965,7 +2965,7 @@ CDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, if (NULL == pCsrSession) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pCsrConnectedInfo = &pCsrSession->connectedInfo; pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -2986,7 +2986,7 @@ CDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("ESE Tspec IE len %d less than min %zu"), tspecIeLen, sizeof(tDot11fIEWMMTSPEC)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, @@ -2999,7 +2999,7 @@ CDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, if (ac >= SME_QOS_EDCA_AC_MAX) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("ac %d more than it`s max value"), ac); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pACInfo = &pSession->ac_info[ac]; tspec_mask_status = pACInfo->tspec_mask_status; @@ -3163,7 +3163,7 @@ uint8_t sme_qos_ese_retrieve_tspec_info(tpAniSirGlobal mac_ctx, #endif -CDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, sme_QosWmmTspecInfo *pTspec_Info, uint8_t *pRICBuffer, uint32_t *pRICLength, uint8_t *pRICIdentifier) @@ -3173,7 +3173,7 @@ CDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, if (pRICBuffer == NULL || pRICIdentifier == NULL || pRICLength == NULL) { CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_zero(&ricIE, sizeof(tDot11fIERICDataDesc)); @@ -3274,9 +3274,9 @@ CDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, * * This function Process reassoc request related to QOS * - * Return: CDF_STATUS enumeration value. + * Return: QDF_STATUS enumeration value. */ -static CDF_STATUS sme_qos_process_ft_reassoc_req_ev( +static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( uint8_t sessionId) { sme_QosSessionInfo *session; @@ -3359,7 +3359,7 @@ static CDF_STATUS sme_qos_process_ft_reassoc_req_ev( if (!entry) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("Flow List empty, nothing to update")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } do { @@ -3375,7 +3375,7 @@ static CDF_STATUS sme_qos_process_ft_reassoc_req_ev( entry = csr_ll_next(&sme_qos_cb.flow_list, entry, false); } while (entry); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3437,13 +3437,13 @@ static void sme_qos_fill_aggr_info(int ac_id, int ts_id, * * This function is used to send aggregated QOS request to HAL. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) +QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) { tSirAggrQosReq *aggr_req = NULL; sme_QosSessionInfo *session; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; int i, j = 0; uint8_t direction; @@ -3458,7 +3458,7 @@ CDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) /* err msg */ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("couldn't allocate memory for the msg buffer")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(aggr_req, sizeof(tSirAggrQosReq)); @@ -3501,8 +3501,8 @@ CDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) FL("Sending aggregated message to HAL 0x%x"), aggr_req->aggrInfo.tspecIdx); - if (CDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(aggr_req))) { - status = CDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(aggr_req))) { + status = QDF_STATUS_SUCCESS; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("sent down a AGGR QoS req to PE")); } @@ -3510,7 +3510,7 @@ CDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) return status; } -CDF_STATUS sme_qos_process_ftric_response(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_ftric_response(tpAniSirGlobal pMac, uint8_t sessionId, tDot11fIERICDataDesc *pRicDataDesc, uint8_t ac, uint8_t tspecIndex) { @@ -3564,7 +3564,7 @@ CDF_STATUS sme_qos_process_ftric_response(tpAniSirGlobal pMac, uint8_t sessionId &pRicDataDesc->WMMTSPEC); } /* return sme_qos_process_add_ts_rsp(pMac, &addtsRsp); */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3575,13 +3575,13 @@ CDF_STATUS sme_qos_process_ftric_response(tpAniSirGlobal pMac, uint8_t sessionId * * this function process the QOS aggregation response received. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) +QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) { tpSirAggrQosRsp rsp = (tpSirAggrQosRsp) msgbuf; tSirAddtsRsp addtsrsp; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; int i, j = 0; uint8_t sessionid = rsp->sessionId; @@ -3623,8 +3623,8 @@ CDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) i, j); /* post ADD TS response for each */ if (sme_qos_process_add_ts_rsp(mac_ctx, &addtsrsp) != - CDF_STATUS_SUCCESS) - status = CDF_STATUS_E_FAILURE; + QDF_STATUS_SUCCESS) + status = QDF_STATUS_E_FAILURE; } } return status; @@ -3642,14 +3642,14 @@ CDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) * This utility function is called by sme_qos_process_ft_reassoc_rsp_ev * to find the matching tspec * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, uint8_t sessionid, uint8_t ac, sme_QosACInfo *ac_info, tDot11fIERICDataDesc *ric_data_desc, uint32_t *ric_rsplen) { uint8_t tspec_flow_index; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; for (tspec_flow_index = 0; tspec_flow_index < SME_QOS_TSPEC_INDEX_MAX; tspec_flow_index++) { @@ -3693,7 +3693,7 @@ static CDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, status = sme_qos_process_ftric_response(mac_ctx, sessionid, ric_data_desc, ac, tspec_flow_index); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed with status %d for AC %d in " @@ -3720,9 +3720,9 @@ static CDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, * This utility function is called by sme_qos_process_ft_reassoc_rsp_ev * to find the matching tspec while LFR3 is enabled. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx, uint8_t sessionid, uint8_t ac, sme_QosSessionInfo *qos_session, tDot11fIERICDataDesc *ric_data_desc, uint32_t ric_rsplen) { @@ -3733,7 +3733,7 @@ static CDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx, uint8_t ac1; tDot11fIERICDataDesc *ric_data = NULL; uint32_t ric_len; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; ric_data = ric_data_desc; ric_len = ric_rsplen; @@ -3761,7 +3761,7 @@ static CDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx, status = sme_qos_process_ftric_response(mac_ctx, sessionid, ric_data, ac, tspec_flow_idx); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed with status %d for AC %d " @@ -3783,14 +3783,14 @@ sme_qos_next_ric: } #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ -CDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, uint8_t sessionid, void *event_info) { sme_QosSessionInfo *qos_session; sme_QosACInfo *ac_info; uint8_t ac; tDot11fIERICDataDesc *ric_data_desc = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *csr_session = CSR_GET_SESSION(mac_ctx, sessionid); tCsrRoamConnectedInfo *csr_conn_info = NULL; uint32_t ric_rsplen; @@ -3802,7 +3802,7 @@ CDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, if (NULL == csr_session) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("The Session pointer is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } csr_conn_info = &csr_session->connectedInfo; ric_rsplen = csr_conn_info->nRICRspLength; @@ -3871,16 +3871,16 @@ CDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, * * This function is used to send down the ADDTS request with TSPEC params to PE * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, uint8_t sessionId, sme_QosWmmTspecInfo *pTspec_Info, sme_QosEdcaAcType ac) { tSirAddtsReq *pMsg = NULL; sme_QosSessionInfo *pSession; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; #ifdef FEATURE_WLAN_ESE tCsrRoamSession *pCsrSession = CSR_GET_SESSION(pMac, sessionId); #endif @@ -3895,7 +3895,7 @@ CDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sessionId(%d) is invalid", __func__, __LINE__, sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -3905,7 +3905,7 @@ CDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the msg buffer", __func__, __LINE__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pMsg, sizeof(tSirAddtsReq)); pMsg->messageType = eWNI_SME_ADDTS_REQ; @@ -3957,7 +3957,7 @@ CDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, "%s: %d: BSS descriptor is NULL so we don't send request to PE", __func__, __LINE__); cdf_mem_free(pMsg); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&pMsg->bssid.bytes[0], &pSession->assocInfo.pBssDesc->bssId[0], @@ -3972,8 +3972,8 @@ CDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, pMsg->req.tsrsPresent = 1; } #endif - if (CDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) { - status = CDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) { + status = QDF_STATUS_SUCCESS; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: sent down a ADDTS req to PE", __func__, __LINE__); @@ -3996,12 +3996,12 @@ CDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, \param ac - Enumeration of the various EDCA Access Categories. \param tspec_mask - on which tspec per AC, the delts is requested - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, uint8_t sessionId, sme_QosEdcaAcType ac, uint8_t tspec_mask) { @@ -4009,7 +4009,7 @@ CDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, sme_QosACInfo *pACInfo; tSirDeltsReq *pMsg; sme_QosWmmTspecInfo *pTspecInfo; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; #ifdef FEATURE_WLAN_DIAG_SUPPORT WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type); #endif @@ -4022,7 +4022,7 @@ CDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the msg buffer", __func__, __LINE__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pMsg, sizeof(tSirDeltsReq)); /* get pointer to the TSPEC being deleted */ @@ -4067,7 +4067,7 @@ CDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, "%s: %d: BSS descriptor is NULL so we don't send request to PE", __func__, __LINE__); cdf_mem_free(pMsg); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&pMsg->bssid.bytes[0], &pSession->assocInfo.pBssDesc->bssId[0], @@ -4079,8 +4079,8 @@ CDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, pTspecInfo->ts_info.up, pTspecInfo->ts_info.tid); cdf_mem_zero(&pACInfo->curr_QoSInfo[tspec_mask - 1], sizeof(sme_QosWmmTspecInfo)); - if (CDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) { - status = CDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) { + status = QDF_STATUS_SUCCESS; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: sme_qos_del_ts_req:Test: sent down a DELTS req to PE", __func__, __LINE__); @@ -4105,17 +4105,17 @@ CDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, \param pMac - Pointer to the global MAC parameter structure. \param pMsgBuf - Pointer to the msg buffer came from PE. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) +QDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) { tpSirAddtsRsp paddts_rsp = (tpSirAddtsRsp) pMsgBuf; sme_QosSessionInfo *pSession; uint8_t sessionId = paddts_rsp->sessionId; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; sme_QosWmmUpType up = (sme_QosWmmUpType) paddts_rsp->rsp.tspec.tsinfo.traffic.userPrio; sme_QosACInfo *pACInfo; @@ -4137,7 +4137,7 @@ CDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pACInfo = &pSession->ac_info[ac]; if (SME_QOS_HANDOFF == pACInfo->curr_state) { @@ -4146,7 +4146,7 @@ CDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) ("ADDTS Response received for AC %d in HANDOFF State.. Dropping"), ac); pSession->readyForPowerSave = true; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, @@ -4180,12 +4180,12 @@ CDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) \param pMac - Pointer to the global MAC parameter structure. \param pMsgBuf - Pointer to the msg buffer came from PE. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) +QDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) { tpSirDeltsRsp pDeltsRsp = (tpSirDeltsRsp) pMsgBuf; sme_QosSessionInfo *pSession; @@ -4199,7 +4199,7 @@ CDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) /* we can go into powersave */ pSession->readyForPowerSave = true; (void)sme_qos_process_buffered_cmd(sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -4211,12 +4211,12 @@ CDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) \param pMac - Pointer to the global MAC parameter structure. \param pMsgBuf - Pointer to the msg buffer came from PE. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) +QDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) { tpSirDeltsRsp pdeltsind = (tpSirDeltsRsp) pMsgBuf; sme_QosSessionInfo *pSession; @@ -4238,7 +4238,7 @@ CDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession = &sme_qos_cb.sessionInfo[sessionId]; pACInfo = &pSession->ac_info[ac]; @@ -4250,13 +4250,13 @@ CDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) search_key.sessionId = sessionId; /* find all Flows on the perticular AC & delete them, also send HDD indication */ /* through the callback it registered per request */ - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_find_all_in_flow_list(pMac, search_key, sme_qos_del_ts_ind_fnp))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: no match found for ac = %d", __func__, __LINE__, search_key.key.ac_type); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* event: EVENT_WLAN_QOS */ #ifdef FEATURE_WLAN_DIAG_SUPPORT @@ -4265,7 +4265,7 @@ CDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) WLAN_HOST_DIAG_EVENT_REPORT(&qos, EVENT_WLAN_QOS); #endif /* FEATURE_WLAN_DIAG_SUPPORT */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -4273,17 +4273,17 @@ CDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) SME_QOS_CSR_ASSOC_COMPLETE event indication from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; sme_QosEdcaAcType ac = SME_QOS_EDCA_AC_BE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", @@ -4340,7 +4340,7 @@ CDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio pSession->handoffRequested = false; /* renew all flows */ (void)sme_qos_process_buffered_cmd(sessionId); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } else { for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) { pACInfo = &pSession->ac_info[ac]; @@ -4373,12 +4373,12 @@ CDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio SME_QOS_CSR_REASSOC_REQ event indication from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; @@ -4398,10 +4398,10 @@ CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) { CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_qos_process_ft_reassoc_req_ev(sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (pSession->handoffRequested) { @@ -4414,13 +4414,13 @@ CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) { CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* buffer the existing flows to be renewed after handoff is done */ sme_qos_buffer_existing_flows(pMac, sessionId); /* clean up the control block partially for handoff */ sme_qos_cleanup_ctrl_blk_for_handoff(pMac, sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* TBH: Assuming both handoff algo & 11r willn't be enabled at the same time */ if (pSession->ftHandoffInProgress) { @@ -4433,11 +4433,11 @@ CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) { CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_qos_process_ft_reassoc_req_ev(sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) { @@ -4462,7 +4462,7 @@ CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId break; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4478,9 +4478,9 @@ CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId * to update the state machine on the reception of reassoc success * notificaiton * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx, sme_QosSessionInfo *qos_session, sme_QosACInfo *ac_info, sme_QosEdcaAcType ac, uint8_t sessionid) @@ -4490,13 +4490,13 @@ CDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx, sme_QosEdcaAcType ac_index; tListElem *list_elt = NULL; sme_QosFlowInfoEntry *flow_info = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; /* return to our previous state */ sme_qos_state_transition(sessionid, ac, ac_info->prev_state); /* for which ac APSD (hence the reassoc) is requested */ if (!ac_info->reassoc_pending) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; /* * update the apsd mask in CB - make sure to take care of the @@ -4546,12 +4546,12 @@ CDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx, */ status = sme_qos_find_all_in_flow_list(mac_ctx, search_key, sme_qos_reassoc_success_ev_fnp); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("no match found for ac = %d"), search_key.key.ac_type); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ac_info->hoRenewal = false; cdf_mem_zero(&ac_info->requested_QoSInfo[SME_QOS_TSPEC_INDEX_0], @@ -4570,9 +4570,9 @@ CDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx, * Function to process the SME_QOS_CSR_REASSOC_COMPLETE event indication * from CSR * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, uint8_t sessionid, void *event_info) { @@ -4580,7 +4580,7 @@ CDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, sme_QosSessionInfo *qos_session; sme_QosACInfo *ac_info; sme_QosEdcaAcType ac; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on session %d"), sessionid); @@ -4625,7 +4625,7 @@ CDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, qos_session->handoffRequested = false; /* renew all flows */ (void)sme_qos_process_buffered_cmd(sessionid); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (qos_session->ftHandoffInProgress) { if (csr_roam_is11r_assoc(mac_ctx, sessionid)) { @@ -4664,7 +4664,7 @@ CDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, case SME_QOS_INIT: case SME_QOS_CLOSED: /* NOP */ - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case SME_QOS_LINK_UP: case SME_QOS_REQUESTED: @@ -4686,12 +4686,12 @@ CDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, SME_QOS_CSR_REASSOC_FAILURE event indication from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; @@ -4747,7 +4747,7 @@ CDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, } /* need to clean up flows */ sme_qos_delete_existing_flows(pMac, sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -4755,12 +4755,12 @@ CDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, SME_QOS_CSR_HANDOFF_ASSOC_REQ event indication from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; @@ -4814,7 +4814,7 @@ CDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, /* do any sessions still require UAPSD? */ sme_ps_uapsd_disable(pMac, sessionId); pSession->uapsdAlreadyRequested = false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -4822,18 +4822,18 @@ CDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, SME_QOS_CSR_HANDOFF_COMPLETE event indication from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; uint8_t ac; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); @@ -4849,7 +4849,7 @@ CDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, if (SME_QOS_REQUESTED == pACInfo->curr_state) { pACInfo->curr_state = SME_QOS_LINK_UP; } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; /* FT logic, has already moved it to QOS_REQUESTED state during the */ /* reassoc request event, which would include the Qos (TSPEC) params */ @@ -4881,12 +4881,12 @@ CDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, SME_QOS_CSR_HANDOFF_FAILURE event indication from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; @@ -4940,7 +4940,7 @@ CDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, cdf_mem_free(pSession->assocInfo.pBssDesc); pSession->assocInfo.pBssDesc = NULL; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -4949,12 +4949,12 @@ CDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; @@ -4976,10 +4976,10 @@ CDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) { CDF_ASSERT(0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } sme_qos_init_a_cs(pMac, sessionId); /* this session doesn't require UAPSD */ @@ -5001,7 +5001,7 @@ CDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, pSession->assocInfo.pBssDesc = NULL; } sme_qos_cb.sessionInfo[sessionId].sessionActive = false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -5009,12 +5009,12 @@ CDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, SME_QOS_CSR_JOIN_REQ event indication from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; @@ -5038,7 +5038,7 @@ CDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, sme_qos_buffer_existing_flows(pMac, sessionId); /* clean up the control block partially for handoff */ sme_qos_cleanup_ctrl_blk_for_handoff(pMac, sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) { @@ -5049,7 +5049,7 @@ CDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, cdf_mem_free(pSession->assocInfo.pBssDesc); pSession->assocInfo.pBssDesc = NULL; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5061,16 +5061,16 @@ CDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, * Function to process the SME_QOS_CSR_PREAUTH_SUCCESS_IND event indication * from CSR * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, uint8_t sessionid, void *event_info) { sme_QosSessionInfo *qos_session; tCsrRoamSession *sme_session = CSR_GET_SESSION(mac_ctx, sessionid); sme_QosACInfo *ac_info; uint8_t ac; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint16_t ric_offset = 0; uint32_t ric_ielen = 0; uint8_t *ric_ie; @@ -5083,7 +5083,7 @@ CDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, if (NULL == sme_session) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_session is NULL")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } qos_session = &sme_qos_cb.sessionInfo[sessionid]; @@ -5120,7 +5120,7 @@ CDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, if (NULL == sme_session->ftSmeContext.psavedFTPreAuthRsp) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("psavedFTPreAuthRsp is NULL")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* @@ -5190,12 +5190,12 @@ add_next_ric: \param pMac - Pointer to the global MAC parameter structure. \param pRsp - Pointer to the addts response structure came from PE. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, uint8_t sessionId, tSirAddtsRspInfo *pRsp) { @@ -5215,7 +5215,7 @@ CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession = &sme_qos_cb.sessionInfo[sessionId]; pACInfo = &pSession->ac_info[ac]; @@ -5226,7 +5226,7 @@ CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, "%s: %d: On session %d an AddTS is not pending on AC %d", __func__, __LINE__, sessionId, ac); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); @@ -5234,7 +5234,7 @@ CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, search_key.key.ac_type = ac; search_key.index = SME_QOS_SEARCH_KEY_INDEX_2; search_key.sessionId = sessionId; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_add_ts_failure_fnp))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -5242,7 +5242,7 @@ CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, __func__, __LINE__, sessionId, search_key.key.ac_type); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_zero(&pACInfo->requested_QoSInfo[tspec_pending - 1], sizeof(sme_QosWmmTspecInfo)); @@ -5258,7 +5258,7 @@ CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, (void)sme_qos_process_buffered_cmd(sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5270,9 +5270,9 @@ CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, * Typical usage while aggregating unidirectional flows into a bi-directional * flow on AC which is running multiple flows * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, +static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, sme_QosSearchInfo search_key, uint8_t new_tspec_mask) { @@ -5293,14 +5293,14 @@ static CDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Exceeded the array bounds")); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_elt) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Flow List empty, nothing to update")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } while (list_elt) { @@ -5338,7 +5338,7 @@ static CDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, list_elt = list_next_elt; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -5351,12 +5351,12 @@ static CDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, \param pMac - Pointer to the global MAC parameter structure. \param pRsp - Pointer to the addts response structure came from PE. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, uint8_t sessionId, tSirAddtsRspInfo *pRsp) { @@ -5384,7 +5384,7 @@ CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pACInfo = &pSession->ac_info[ac]; /* is there a TSPEC request pending on this AC? */ @@ -5393,7 +5393,7 @@ CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d an AddTS is not pending on AC %d", __func__, __LINE__, sessionId, ac); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* App is looking for APSD or the App which was looking for APSD has been */ /* released, so STA re-negotiated with AP */ @@ -5416,7 +5416,7 @@ CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, "%s: %d: Exceeded the array bounds of pACInfo->requested_QosInfo", __func__, __LINE__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } @@ -5507,7 +5507,7 @@ CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, search_key.sessionId = sessionId; /* notify HDD the success for the requested flow */ /* notify all the other flows running on the AC that QoS got modified */ - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_add_ts_success_fnp))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -5515,7 +5515,7 @@ CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, __func__, __LINE__, sessionId, search_key.key.ac_type); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pACInfo->hoRenewal = false; cdf_mem_zero(&pACInfo->requested_QoSInfo[tspec_pending - 1], @@ -5586,7 +5586,7 @@ CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, &pRsp->tspec.tsinfo, sessionId); (void)sme_qos_process_buffered_cmd(sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -5599,12 +5599,12 @@ CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, \param pCurrent_Tspec_Info - Pointer to sme_QosWmmTspecInfo which contains current the WMM TSPEC related info - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, +QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, sme_QosWmmTspecInfo *pCurrent_Tspec_Info, sme_QosWmmTspecInfo *pUpdated_Tspec_Info) { @@ -5615,13 +5615,13 @@ CDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: input is NULL, nothing to aggregate", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!pCurrent_Tspec_Info) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Current is NULL, can't aggregate", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&TspecInfo, pCurrent_Tspec_Info, sizeof(sme_QosWmmTspecInfo)); @@ -5761,7 +5761,7 @@ CDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, cdf_mem_copy(pCurrent_Tspec_Info, &TspecInfo, sizeof(sme_QosWmmTspecInfo)); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -5773,12 +5773,12 @@ CDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, \param ac - Enumeration of the various EDCA Access Categories. \param tspec_mask - on which tspec per AC, the update is requested - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -static CDF_STATUS sme_qos_update_params(uint8_t sessionId, +static QDF_STATUS sme_qos_update_params(uint8_t sessionId, sme_QosEdcaAcType ac, uint8_t tspec_mask, sme_QosWmmTspecInfo *pTspec_Info) @@ -5795,7 +5795,7 @@ static CDF_STATUS sme_qos_update_params(uint8_t sessionId, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: output is NULL, can't aggregate", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_zero(&Tspec_Info, sizeof(sme_QosWmmTspecInfo)); pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); @@ -5803,7 +5803,7 @@ static CDF_STATUS sme_qos_update_params(uint8_t sessionId, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Flow List empty, nothing to update", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession = &sme_qos_cb.sessionInfo[sessionId]; pACInfo = &pSession->ac_info[ac]; @@ -5833,7 +5833,7 @@ static CDF_STATUS sme_qos_update_params(uint8_t sessionId, "for release/modify", __func__, __LINE__, flow_info->QosFlowID); } else - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_aggregate_params (&flow_info->QoSInfo, &Tspec_Info, NULL))) { /* err msg */ @@ -5847,7 +5847,7 @@ static CDF_STATUS sme_qos_update_params(uint8_t sessionId, } /* return the aggregate */ *pTspec_Info = Tspec_Info; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -6007,21 +6007,21 @@ tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key) * * Return: None */ -CDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx, sme_QosSearchInfo search_key, sme_QosProcessSearchEntry fnp) { tListElem *list_elt = NULL, *list_next_elt = NULL; sme_QosSessionInfo *qos_session; sme_QosFlowInfoEntry *flow_info = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; sme_QosEdcaAcType ac_type; list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_elt) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Flow List empty, can't search")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } while (list_elt) { @@ -6040,7 +6040,7 @@ CDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("match found on flowID, ending search")); status = fnp(mac_ctx, list_elt); - if (CDF_STATUS_E_FAILURE == status) { + if (QDF_STATUS_E_FAILURE == status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to process entry")); @@ -6054,7 +6054,7 @@ CDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx, flow_info->hoRenewal = qos_session->ac_info[ac_type].hoRenewal; status = fnp(mac_ctx, list_elt); - if (CDF_STATUS_E_FAILURE == status) { + if (QDF_STATUS_E_FAILURE == status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to process entry")); @@ -6092,7 +6092,7 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, pIesLocal = pIes; } else { /* IEs were not provided so parse them ourselves */ - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies (pMac, pSirBssDesc, &pIesLocal))) { /* err msg */ @@ -6150,9 +6150,9 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, * Utility function to buffer the existing flows in flow_list, * so that we can renew them after handoff is done. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, uint8_t sessionid) { tListElem *list_entry = NULL, *list_nextentry = NULL; @@ -6165,7 +6165,7 @@ static CDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, if (!list_entry) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Flow List empty, nothing to buffer")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } while (list_entry) { @@ -6196,7 +6196,7 @@ static CDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, else setupinfo->hoRenewal = true; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd(&cmd, true))) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -6214,7 +6214,7 @@ static CDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, cmd.pMac = mac_ctx; cmd.sessionId = sessionid; cmd.u.releaseCmdInfo.QosFlowID = flow_info->QosFlowID; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd(&cmd, true))) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -6234,7 +6234,7 @@ static CDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, cmd.sessionId = sessionid; cmd.u.modifyCmdInfo.QosFlowID = flow_info->QosFlowID; cmd.u.modifyCmdInfo.QoSInfo = flow_info->QoSInfo; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd(&cmd, true))) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -6259,19 +6259,19 @@ static CDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, } qos_session = &sme_qos_cb.sessionInfo[sessionid]; qos_session->uapsdAlreadyRequested = false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- \brief sme_qos_delete_existing_flows() - Utility function to Delete the existing flows in flow_list, if we lost connectivity. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -static CDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, +static QDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, uint8_t sessionId) { tListElem *pEntry = NULL, *pNextEntry = NULL; @@ -6281,7 +6281,7 @@ static CDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "%s: %d: Flow List empty, nothing to delete", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } while (pEntry) { pNextEntry = csr_ll_next(&sme_qos_cb.flow_list, pEntry, true); @@ -6308,7 +6308,7 @@ static CDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, } pEntry = pNextEntry; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6320,9 +6320,9 @@ static CDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, * Utility function to buffer a request (setup/modify/release) from client * while processing another one on the same AC. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head) +QDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head) { sme_QosSessionInfo *pSession; sme_QosCmdInfoEntry *pentry = NULL; @@ -6335,7 +6335,7 @@ CDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Memory allocation failure", __func__, __LINE__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /* copy the entire CmdInfo */ pentry->cmdInfo = *pcmd; @@ -6348,7 +6348,7 @@ CDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head) csr_ll_insert_tail(&pSession->bufferedCommandList, &pentry->link, true); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6358,15 +6358,15 @@ CDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head) * Utility function to process a buffered request (setup/modify/release) * initially came from the client. * - * Return:CDF_STATUS + * Return:QDF_STATUS */ -static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) +static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) { sme_QosSessionInfo *qos_session; sme_QosCmdInfoEntry *pcmd = NULL; tListElem *list_elt = NULL; sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_FAILURE_RSP; - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; sme_QosCmdInfo *qos_cmd = NULL; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, @@ -6380,7 +6380,7 @@ static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) FL("no more buffered commands on session %d"), session_id); qos_session->readyForPowerSave = true; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pcmd = GET_BASE_ADDR(list_elt, sme_QosCmdInfoEntry, link); qos_cmd = &pcmd->cmdInfo; @@ -6399,7 +6399,7 @@ static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) CDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_setup_req failed on session %d"), session_id); - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case SME_QOS_RELEASE_REQ: @@ -6411,7 +6411,7 @@ static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) CDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_release_req failed on session %d"), session_id); - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case SME_QOS_MODIFY_REQ: @@ -6425,7 +6425,7 @@ static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) CDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_modify_req failed on session %d"), session_id); - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case SME_QOS_RESEND_REQ: @@ -6440,7 +6440,7 @@ static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) CDF_TRACE_LEVEL_ERROR, FL("sme_qos_re_request_add_ts failed on session %d"), session_id); - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; default: @@ -6464,12 +6464,12 @@ static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) \brief sme_qos_delete_buffered_requests() - Utility function to Delete the buffered requests in the buffered_cmd_list, if we lost connectivity. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -static CDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, +static QDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, uint8_t sessionId) { sme_QosSessionInfo *pSession; @@ -6484,7 +6484,7 @@ static CDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "%s: %d: Buffered List empty, nothing to delete on session %d", __func__, __LINE__, sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } while (pEntry) { pNextEntry = @@ -6500,7 +6500,7 @@ static CDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, cdf_mem_free(pcmd); pEntry = pNextEntry; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6514,9 +6514,9 @@ static CDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, * of the AP, the profile that HDD sent down with the connect request, * while CSR notifies for assoc/reassoc success. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, +QDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, sme_QosAssocInfo *pAssoc_info) { tSirBssDescription *pBssDesc = NULL; @@ -6524,7 +6524,7 @@ CDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, if (NULL == pAssoc_info) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: pAssoc_info is NULL", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* clean up the assoc info if already set */ if (pSession->assocInfo.pBssDesc) { @@ -6539,7 +6539,7 @@ CDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the bss Descriptor", __func__, __LINE__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(pBssDesc, pAssoc_info->pBssDesc, bssLen); pSession->assocInfo.pBssDesc = pBssDesc; @@ -6548,7 +6548,7 @@ CDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, pSession->apsdMask |= pAssoc_info->pProfile->uapsd_mask; } /* [TODO] Do we need to update the global APSD bitmap? */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -6557,12 +6557,12 @@ CDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, \param pMac - Pointer to the global MAC parameter structure. \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure) - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) +QDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; @@ -6573,7 +6573,7 @@ CDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link); ac = flow_info->ac_type; @@ -6589,7 +6589,7 @@ CDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) "%s: %d: Entry with flowID = %d getting notified", __func__, __LINE__, flow_info->QosFlowID); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -6598,12 +6598,12 @@ CDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) \param pMac - Pointer to the global MAC parameter structure. \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure) - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) +QDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; @@ -6614,7 +6614,7 @@ CDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntr CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link); ac = flow_info->ac_type; @@ -6630,7 +6630,7 @@ CDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntr "%s: %d: Entry with flowID = %d getting notified", __func__, __LINE__, flow_info->QosFlowID); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -6639,19 +6639,19 @@ CDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntr \param pMac - Pointer to the global MAC parameter structure. \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure) - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) +QDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) { sme_QosFlowInfoEntry *flow_info = NULL; if (!pEntry) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link); switch (flow_info->reason) { @@ -6671,7 +6671,7 @@ CDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) default: break; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -6681,25 +6681,25 @@ CDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) \param pMac - Pointer to the global MAC parameter structure. \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure) - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) +QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; sme_QosFlowInfoEntry *flow_info = NULL; sme_QosEdcaAcType ac; - CDF_STATUS lock_status = CDF_STATUS_E_FAILURE; + QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; sme_QosStatusType status; if (!pEntry) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* delete the entry from Flow List */ flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link); @@ -6709,7 +6709,7 @@ CDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) pACInfo->relTrig = SME_QOS_RELEASE_BY_AP; lock_status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(lock_status)) { + if (!QDF_IS_STATUS_SUCCESS(lock_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_RELEASE_FAILURE_RSP; @@ -6722,7 +6722,7 @@ CDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) "%s: %d: QoS Release return status on Flow %d is %d", __func__, __LINE__, flow_info->QosFlowID, status); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6735,9 +6735,9 @@ CDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) * the success for the requested flow & notify all the other flows * running on the same AC that QoS params got modified * - * Return: CDF_STATUS enumaration + * Return: QDF_STATUS enumaration */ -CDF_STATUS +QDF_STATUS sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, tListElem *entry) { @@ -6747,12 +6747,12 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, bool delete_entry = false; sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_FAILURE_RSP; sme_QosEdcaAcType ac; - CDF_STATUS pmc_status = CDF_STATUS_E_FAILURE; + QDF_STATUS pmc_status = QDF_STATUS_E_FAILURE; if (!entry) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(entry, sme_QosFlowInfoEntry, link); ac = flow_info->ac_type; @@ -6779,12 +6779,12 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, /* if PMC doesn't return success right away means * it is yet to put the module in BMPS state & later * to UAPSD state */ - if (CDF_STATUS_E_FAILURE == pmc_status) { + if (QDF_STATUS_E_FAILURE == pmc_status) { hdd_status = SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_SET_FAILED; /* we need to always notify this case */ flow_info->hoRenewal = false; - } else if (CDF_STATUS_PMC_PENDING == pmc_status) { + } else if (QDF_STATUS_PMC_PENDING == pmc_status) { /* let other flows know PMC has been notified */ qos_session->uapsdAlreadyRequested = true; @@ -6814,12 +6814,12 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, /* if PMC doesn't return success right away means * it is yet to put the module in BMPS state & * later to UAPSD state */ - if (CDF_STATUS_E_FAILURE == pmc_status) { + if (QDF_STATUS_E_FAILURE == pmc_status) { hdd_status = SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_SET_FAILED; /* we need to always notify this case */ flow_info->hoRenewal = false; - } else if (CDF_STATUS_PMC_PENDING == pmc_status) { + } else if (QDF_STATUS_PMC_PENDING == pmc_status) { qos_session->uapsdAlreadyRequested = true; } @@ -6850,7 +6850,7 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, /* reclaim the memory */ cdf_mem_free(flow_info); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -6866,12 +6866,12 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, \param pMac - Pointer to the global MAC parameter structure. \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure) - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) +QDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; @@ -6883,7 +6883,7 @@ CDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link); ac = flow_info->ac_type; @@ -6937,7 +6937,7 @@ CDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) /* reclaim the memory */ cdf_mem_free(flow_info); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6961,7 +6961,7 @@ CDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) * Return: Status */ -CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, tListElem *entry) { sme_QosSessionInfo *qos_session; @@ -6971,7 +6971,7 @@ CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, bool delete_entry = false; sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_FAILURE_RSP; sme_QosEdcaAcType ac; - CDF_STATUS pmc_status = CDF_STATUS_E_FAILURE; + QDF_STATUS pmc_status = QDF_STATUS_E_FAILURE; tCsrRoamModifyProfileFields profile_fields; uint8_t psb; uint8_t tspec_index; @@ -6980,7 +6980,7 @@ CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Entry is NULL")); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(entry, sme_QosFlowInfoEntry, link); ac = flow_info->ac_type; @@ -6992,7 +6992,7 @@ CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, FL(" No need to notify the HDD, the ADDTS " "success is not for index = %d of the AC = %d"), flow_info->tspec_mask, ac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } switch (flow_info->reason) { case SME_QOS_REASON_SETUP: @@ -7014,12 +7014,12 @@ CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, /* if PMC doesn't return success right away means * it is yet to put the module in BMPS state & later * to UAPSD state */ - if (CDF_STATUS_E_FAILURE == pmc_status) { + if (QDF_STATUS_E_FAILURE == pmc_status) { hdd_status = SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_SET_FAILED; /* we need to always notify this case */ flow_info->hoRenewal = false; - } else if (CDF_STATUS_PMC_PENDING == pmc_status) { + } else if (QDF_STATUS_PMC_PENDING == pmc_status) { /* let other flows know PMC has been notified */ qos_session->uapsdAlreadyRequested = true; @@ -7057,12 +7057,12 @@ CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, /* if PMC doesn't return success right * away means it is yet to put * the module in BMPS state & later to UAPSD state */ - if (CDF_STATUS_E_FAILURE == pmc_status) { + if (QDF_STATUS_E_FAILURE == pmc_status) { hdd_status = SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_SET_FAILED; /* we need to always notify this case */ flow_info->hoRenewal = false; - } else if (CDF_STATUS_PMC_PENDING == pmc_status) { + } else if (QDF_STATUS_PMC_PENDING == pmc_status) { /* let other flows know PMC has been notified */ qos_session->uapsdAlreadyRequested = true; @@ -7118,7 +7118,7 @@ CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, /* reclaim the memory */ cdf_mem_free(flow_info); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -7207,7 +7207,7 @@ static bool sme_qos_is_uapsd_active(void) to notify SME-QoS when it puts the chip into UAPSD mode \param callbackContext - The context passed to PMC during pmc_start_uapsd call. - \param status - CDF_STATUS returned by PMC. + \param status - QDF_STATUS returned by PMC. \return None @@ -7215,7 +7215,7 @@ static bool sme_qos_is_uapsd_active(void) --------------------------------------------------------------------------*/ void sme_qos_pmc_offload_start_uapsd_callback(void *callbackContext, - uint32_t sessionId, CDF_STATUS status) + uint32_t sessionId, QDF_STATUS status) { sme_QosSessionInfo *pSession = callbackContext; pSession->uapsdAlreadyRequested = false; @@ -7233,7 +7233,7 @@ bool sme_qos_pmc_offload_check_routine(void *callbackContext, uint32_t sessionId } -CDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal pMac, +QDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal pMac, uint32_t sessionId) { sme_QosSessionInfo *pSession; @@ -7245,7 +7245,7 @@ CDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Flow List empty, can't search", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } while (pEntry) { pNextEntry = csr_ll_next(&sme_qos_cb.flow_list, pEntry, false); @@ -7265,10 +7265,10 @@ CDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal pMac, } pEntry = pNextEntry; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal pMac, +QDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal pMac, uint32_t sessionId) { sme_QosSessionInfo *pSession; @@ -7280,7 +7280,7 @@ CDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Flow List empty, can't search", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } while (pEntry) { pNextEntry = csr_ll_next(&sme_qos_cb.flow_list, pEntry, false); @@ -7300,7 +7300,7 @@ CDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal pMac, } pEntry = pNextEntry; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void sme_qos_cleanup_ctrl_blk_for_handoff(tpAniSirGlobal pMac, uint8_t sessionId) @@ -7346,7 +7346,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, { tDot11fBeaconIEs *pIes = NULL; sme_QosSessionInfo *pSession; - CDF_STATUS hstatus; + QDF_STATUS hstatus; if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session Id %d is invalid", @@ -7373,7 +7373,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, hstatus = csr_get_parsed_bss_description_ies(pMac, pSession->assocInfo.pBssDesc, &pIes); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unable to parse BSS IEs", __func__, __LINE__, sessionId); @@ -7414,12 +7414,12 @@ bool sme_qos_validate_requested_params(tpAniSirGlobal pMac, return rc; } -static CDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, +static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, eSmeCommandType cmdType, sme_QosWmmTspecInfo *pQoSInfo, sme_QosEdcaAcType ac, uint8_t tspec_mask) { - CDF_STATUS status = CDF_STATUS_E_RESOURCES; + QDF_STATUS status = QDF_STATUS_E_RESOURCES; tSmeCmd *pCommand = NULL; do { pCommand = sme_get_command_buffer(pMac); @@ -7434,7 +7434,7 @@ static CDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, switch (cmdType) { case eSmeCommandAddTs: if (pQoSInfo) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; pCommand->u.qosCmd.tspecInfo = *pQoSInfo; pCommand->u.qosCmd.ac = ac; } else { @@ -7442,11 +7442,11 @@ static CDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, CDF_TRACE_LEVEL_ERROR, "%s: %d: NULL pointer passed", __func__, __LINE__); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } break; case eSmeCommandDelTs: - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; pCommand->u.qosCmd.ac = ac; pCommand->u.qosCmd.tspec_mask = tspec_mask; break; @@ -7454,11 +7454,11 @@ static CDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid command type %d", __func__, __LINE__, cmdType); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; break; } } while (0); - if (CDF_IS_STATUS_SUCCESS(status) && pCommand) { + if (QDF_IS_STATUS_SUCCESS(status) && pCommand) { sme_push_command(pMac, pCommand, false); } else if (pCommand) { qos_release_command(pMac, pCommand); @@ -7468,7 +7468,7 @@ static CDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, bool qos_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; bool fRemoveCmd = true; do { switch (pCommand->command) { @@ -7477,7 +7477,7 @@ bool qos_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) sme_qos_add_ts_req(pMac, (uint8_t) pCommand->sessionId, &pCommand->u.qosCmd.tspecInfo, pCommand->u.qosCmd.ac); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { fRemoveCmd = false; status = SME_QOS_STATUS_SETUP_REQ_PENDING_RSP; } @@ -7487,7 +7487,7 @@ bool qos_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) sme_qos_del_ts_req(pMac, (uint8_t) pCommand->sessionId, pCommand->u.qosCmd.ac, pCommand->u.qosCmd.tspec_mask); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { fRemoveCmd = false; } break; @@ -7554,7 +7554,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, cmd.u.resendCmdInfo.ac = ac; cmd.u.resendCmdInfo.tspecMask = tspec_mask; cmd.u.resendCmdInfo.QoSInfo = *qos_info; - if (!CDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) { + if (!QDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("On session %d unable to buffer the AddTS " @@ -7615,7 +7615,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, cmd.u.resendCmdInfo.ac = ac; cmd.u.resendCmdInfo.tspecMask = tspec_mask; cmd.u.resendCmdInfo.QoSInfo = *qos_info; - if (!CDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) { + if (!QDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL(" couldn't buf the read request state = %d"), ac_info->curr_state); @@ -7659,20 +7659,20 @@ static void sme_qos_init_a_cs(tpAniSirGlobal pMac, uint8_t sessionId) } } -static CDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId, +static QDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId, tCsrRoamModifyProfileFields * pModFields, bool fForce) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; - CDF_STATUS status; + QDF_STATUS status; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d with UAPSD mask 0x%X", __func__, __LINE__, sessionId, pModFields->uapsd_mask); pSession = &sme_qos_cb.sessionInfo[sessionId]; status = csr_reassoc(pMac, sessionId, pModFields, &pSession->roamID, fForce); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Update the state to Handoff so subsequent requests are queued until */ /* this one is finished */ sme_QosEdcaAcType ac; diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index 88168bf5af..f6fa055d23 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.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. * @@ -105,7 +105,7 @@ static void rrm_ll_purge_neighbor_cache(tpAniSirGlobal pMac, * rrm_indicate_neighbor_report_result() -calls the callback registered for * neighbor report * @pMac: Pointer to the Hal Handle. - * @cdf_status - CDF_STATUS_SUCCESS/CDF_STATUS_FAILURE based on whether a valid + * @qdf_status - QDF_STATUS_SUCCESS/CDF_STATUS_FAILURE based on whether a valid * report is received or neighbor timer expired * * This function calls the callback register by the caller while requesting for @@ -114,7 +114,7 @@ static void rrm_ll_purge_neighbor_cache(tpAniSirGlobal pMac, * * Return: void */ -void rrm_indicate_neighbor_report_result(tpAniSirGlobal pMac, CDF_STATUS cdf_status) +void rrm_indicate_neighbor_report_result(tpAniSirGlobal pMac, QDF_STATUS qdf_status) { NeighborReportRspCallback callback; void *callbackContext; @@ -148,7 +148,7 @@ void rrm_indicate_neighbor_report_result(tpAniSirGlobal pMac, CDF_STATUS cdf_sta /* Call the callback with the status received from caller */ if (callback) - callback(callbackContext, cdf_status); + callback(callbackContext, qdf_status); return; @@ -166,7 +166,7 @@ void rrm_indicate_neighbor_report_result(tpAniSirGlobal pMac, CDF_STATUS cdf_sta * Return: status */ -static CDF_STATUS +static QDF_STATUS sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, tCsrScanResultInfo **result_arr, uint8_t msrmnt_status, uint8_t bss_count) @@ -176,7 +176,7 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, uint16_t length, ie_len; uint8_t i = 0, j = 0; tCsrScanResultInfo *cur_result = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpRrmSMEContext rrm_ctx = &mac_ctx->rrm.rrmSmeContext; #if defined WLAN_VOWIFI_DEBUG @@ -185,7 +185,7 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, if (NULL == result_arr && !msrmnt_status) { sms_log(mac_ctx, LOGE, "Beacon report xmit Ind to PE Failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (result_arr) @@ -197,7 +197,7 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, if (NULL == beacon_rep) { sms_log(mac_ctx, LOGP, "Unable to allocate memory for beacon report"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(beacon_rep, length); #if defined WLAN_VOWIFI_DEBUG @@ -281,12 +281,12 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, * * Return: status */ -static CDF_STATUS sme_ese_send_beacon_req_scan_results( +static QDF_STATUS sme_ese_send_beacon_req_scan_results( tpAniSirGlobal mac_ctx, uint32_t session_id, uint8_t channel, tCsrScanResultInfo **result_arr, uint8_t msrmnt_status, uint8_t bss_count) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tSirRetStatus fill_ie_status; tpSirBssDescription bss_desc = NULL; uint32_t ie_len = 0; @@ -303,12 +303,12 @@ static CDF_STATUS sme_ese_send_beacon_req_scan_results( if (NULL == rrm_ctx) { sms_log(mac_ctx, LOGE, "rrm_ctx is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (NULL == result_arr && !msrmnt_status) { sms_log(mac_ctx, LOGE, "Beacon report xmit Ind to HDD Failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (result_arr) @@ -422,9 +422,9 @@ static CDF_STATUS sme_ese_send_beacon_req_scan_results( * This function is called to get the scan result from CSR and send the beacon * report xmit ind message to PE * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, uint8_t num_chan, uint8_t *chan_list, uint8_t measurementdone) @@ -433,7 +433,7 @@ static CDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, tScanResultHandle result_handle; tCsrScanResultInfo *scan_results, *next_result; tCsrScanResultInfo *scanresults_arr[SIR_BCN_REPORT_MAX_BSS_DESC]; - CDF_STATUS status; + QDF_STATUS status; uint8_t counter = 0; tpRrmSMEContext rrm_ctx = &mac_ctx->rrm.rrmSmeContext; uint32_t session_id; @@ -453,7 +453,7 @@ static CDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, (tCsrSSIDInfo *) cdf_mem_malloc(sizeof(tCsrSSIDInfo)); if (filter.SSIDs.SSIDList == NULL) { sms_log(mac_ctx, LOGP, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } #if defined WLAN_VOWIFI_DEBUG sms_log(mac_ctx, LOGE, FL("Allocated memory for SSIDList")); @@ -478,7 +478,7 @@ static CDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, * following call to csr_roam_get_session_id_from_bssid will fail, * hence use current session ID instead of one stored in SME rrm context */ - if (CDF_STATUS_E_FAILURE == csr_roam_get_session_id_from_bssid(mac_ctx, + if (QDF_STATUS_E_FAILURE == csr_roam_get_session_id_from_bssid(mac_ctx, &rrm_ctx->sessionBssId, &session_id)) { sms_log(mac_ctx, LOG1, FL("BSSID mismatch, using current session_id")); @@ -580,7 +580,7 @@ static CDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, * Return : 0 for success, non zero for failure */ -static CDF_STATUS sme_rrm_scan_request_callback(tHalHandle halHandle, +static QDF_STATUS sme_rrm_scan_request_callback(tHalHandle halHandle, void *pContext, uint8_t sessionId, uint32_t scanId, @@ -632,7 +632,7 @@ static CDF_STATUS sme_rrm_scan_request_callback(tHalHandle halHandle, #endif } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -641,22 +641,22 @@ static CDF_STATUS sme_rrm_scan_request_callback(tHalHandle halHandle, * * This routine is called to issue rrm scan request * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) +QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) { /* Issue scan request. */ tCsrScanRequest scan_req; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpRrmSMEContext sme_rrm_ctx = &mac_ctx->rrm.rrmSmeContext; uint32_t session_id; tSirScanType scan_type; status = csr_roam_get_session_id_from_bssid(mac_ctx, &sme_rrm_ctx->sessionBssId, &session_id); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(mac_ctx, LOGE, FL("Invalid sme Session ID")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if ((sme_rrm_ctx->currentIndex) >= @@ -688,7 +688,7 @@ CDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) if (NULL == scan_req.SSIDs.SSIDList) { sms_log(mac_ctx, LOGP, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } #if defined WLAN_VOWIFI_DEBUG sms_log(mac_ctx, LOGE, @@ -801,14 +801,14 @@ CDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) * This is called to process the Beacon * report request from peer AP forwarded through PE . * - * Return : CDF_STATUS_SUCCESS - Validation is successful. + * Return : QDF_STATUS_SUCCESS - Validation is successful. */ -CDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsgBuf) +QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsgBuf) { tpSirBeaconReportReqInd pBeaconReq = (tpSirBeaconReportReqInd) pMsgBuf; tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext; uint32_t len = 0, i = 0; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; #if defined WLAN_VOWIFI_DEBUG sms_log(pMac, LOGE, "Received Beacon report request ind Channel = %d", @@ -824,7 +824,7 @@ CDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg pSmeRrmContext->channelList.ChannelList = cdf_mem_malloc(len); if (pSmeRrmContext->channelList.ChannelList == NULL) { sms_log(pMac, LOGP, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } #if defined WLAN_VOWIFI_DEBUG sms_log(pMac, LOGE, FL("Allocated memory for ChannelList")); @@ -854,7 +854,7 @@ CDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg pSmeRrmContext->channelList.ChannelList = cdf_mem_malloc(len); if (pSmeRrmContext->channelList.ChannelList == NULL) { sms_log(pMac, LOGP, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } #if defined WLAN_VOWIFI_DEBUG sms_log(pMac, LOGE, FL("Allocated memory for ChannelList")); @@ -929,14 +929,14 @@ CDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg * * This is API can be used to trigger a Neighbor report from the peer. * - * Return: CDF_STATUS_SUCCESS - Validation is successful. + * Return: QDF_STATUS_SUCCESS - Validation is successful. */ -CDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionId, tpRrmNeighborReq pNeighborReq, tpRrmNeighborRspCallbackInfo callbackInfo) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpSirNeighborReportReqInd pMsg; tCsrRoamSession *pSession; @@ -946,7 +946,7 @@ CDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionI #endif if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { sms_log(pMac, LOGE, FL("Invalid session %d"), sessionId); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } pSession = CSR_GET_SESSION(pMac, sessionId); @@ -956,14 +956,14 @@ CDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionI isNeighborRspPending) { sms_log(pMac, LOGE, FL("Neighbor request already pending.. Not allowed")); - return CDF_STATUS_E_AGAIN; + return QDF_STATUS_E_AGAIN; } pMsg = cdf_mem_malloc(sizeof(tSirNeighborReportReqInd)); if (NULL == pMsg) { sms_log(pMac, LOGE, "Unable to allocate memory for Neighbor request"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pMsg, sizeof(tSirNeighborReportReqInd)); @@ -989,8 +989,8 @@ CDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionI cdf_mem_copy(&pMsg->ucSSID, &pNeighborReq->ssid, sizeof(tSirMacSSid)); status = cds_send_mb_message_to_mac(pMsg); - if (status != CDF_STATUS_SUCCESS) - return CDF_STATUS_E_FAILURE; + if (status != QDF_STATUS_SUCCESS) + return QDF_STATUS_E_FAILURE; /* Neighbor report request message sent successfully to PE. Now register the callbacks */ pMac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo. @@ -1005,7 +1005,7 @@ CDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionI cdf_mc_timer_start(&pMac->rrm.rrmSmeContext.neighborReqControlInfo. neighborRspWaitTimer, callbackInfo->timeout); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1169,15 +1169,15 @@ void rrm_store_neighbor_rpt_by_roam_score(tpAniSirGlobal pMac, * The beginning of the buffer can always map to tSirSmeRsp. * This is called to process the Neighbor report received from PE. * - * Return: CDF_STATUS_SUCCESS - Validation is successful + * Return: QDF_STATUS_SUCCESS - Validation is successful */ -CDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) +QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpSirNeighborReportInd pNeighborRpt = (tpSirNeighborReportInd) pMsgBuf; tpRrmNeighborReportDesc pNeighborReportDesc; uint8_t i = 0; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; uint8_t sessionId; /* Get the session id */ @@ -1185,7 +1185,7 @@ CDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) csr_roam_get_session_id_from_bssid(pMac, (struct cdf_mac_addr *) pNeighborRpt->bssId, (uint32_t *) &sessionId); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { #ifdef FEATURE_WLAN_ESE /* Clear the cache for ESE. */ if (csr_neighbor_roam_is_ese_assoc(pMac, sessionId)) { @@ -1202,7 +1202,7 @@ CDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) if (NULL == pNeighborReportDesc) { sms_log(pMac, LOGE, "Failed to allocate memory for RRM Neighbor report desc"); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } @@ -1215,7 +1215,7 @@ CDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) sms_log(pMac, LOGE, "Failed to allocate memory for RRM Neighbor report BSS Description"); cdf_mem_free(pNeighborReportDesc); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } cdf_mem_zero(pNeighborReportDesc->pNeighborBssDescription, @@ -1255,10 +1255,10 @@ CDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) end: if (!csr_ll_count(&pMac->rrm.rrmSmeContext.neighborReportCache)) - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; /* Received a report from AP. Indicate SUCCESS to the caller if there are some valid reports */ - rrm_indicate_neighbor_report_result(pMac, cdf_status); + rrm_indicate_neighbor_report_result(pMac, qdf_status); return status; } @@ -1273,9 +1273,9 @@ end: * sme_process_msg() calls this function for the * messages that are handled by SME RRM module. * - * Return: CDF_STATUS_SUCCESS - Validation is successful. + * Return: QDF_STATUS_SUCCESS - Validation is successful. */ -CDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, +QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1300,7 +1300,7 @@ CDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, break; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1338,7 +1338,7 @@ void rrm_neighbor_rsp_timeout_handler(void *userData) #if defined WLAN_VOWIFI_DEBUG sms_log(pMac, LOGE, "Neighbor Response timed out "); #endif - rrm_indicate_neighbor_report_result(pMac, CDF_STATUS_E_FAILURE); + rrm_indicate_neighbor_report_result(pMac, QDF_STATUS_E_FAILURE); return; } @@ -1348,53 +1348,53 @@ void rrm_neighbor_rsp_timeout_handler(void *userData) * * Initialze all RRM module. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS rrm_open(tpAniSirGlobal pMac) +QDF_STATUS rrm_open(tpAniSirGlobal pMac) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext; - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; pSmeRrmContext->rrmConfig.max_randn_interval = 50; /* ms */ - cdf_status = cdf_mc_timer_init(&pSmeRrmContext->IterMeasTimer, + qdf_status = cdf_mc_timer_init(&pSmeRrmContext->IterMeasTimer, CDF_TIMER_TYPE_SW, rrm_iter_meas_timer_handle, (void *)pMac); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to init timer"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - cdf_status = + qdf_status = cdf_mc_timer_init(&pSmeRrmContext->neighborReqControlInfo. neighborRspWaitTimer, CDF_TIMER_TYPE_SW, rrm_neighbor_rsp_timeout_handler, (void *)pMac); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to init timer"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSmeRrmContext->neighborReqControlInfo.isNeighborRspPending = false; cdf_ret_status = csr_ll_open(pMac->hHdd, &pSmeRrmContext->neighborReportCache); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to open neighbor cache result"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1403,28 +1403,28 @@ CDF_STATUS rrm_open(tpAniSirGlobal pMac) * * Release all RRM modules and their resources. * - * Return: CDF_STATUS - * CDF_STATUS_E_FAILURE success - * CDF_STATUS_SUCCESS failure + * Return: QDF_STATUS + * QDF_STATUS_E_FAILURE success + * QDF_STATUS_SUCCESS failure */ -CDF_STATUS rrm_close(tpAniSirGlobal pMac) +QDF_STATUS rrm_close(tpAniSirGlobal pMac) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext; if (CDF_TIMER_STATE_RUNNING == cdf_mc_timer_get_current_state(&pSmeRrmContext->IterMeasTimer)) { - cdf_status = cdf_mc_timer_stop(&pSmeRrmContext->IterMeasTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cdf_mc_timer_stop(&pSmeRrmContext->IterMeasTimer); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Timer stop fail")); } } - cdf_status = cdf_mc_timer_destroy(&pSmeRrmContext->IterMeasTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cdf_mc_timer_destroy(&pSmeRrmContext->IterMeasTimer); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Fail to destroy timer")); @@ -1435,19 +1435,19 @@ CDF_STATUS rrm_close(tpAniSirGlobal pMac) cdf_mc_timer_get_current_state(&pSmeRrmContext-> neighborReqControlInfo. neighborRspWaitTimer)) { - cdf_status = + qdf_status = cdf_mc_timer_stop(&pSmeRrmContext->neighborReqControlInfo. neighborRspWaitTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, FL("Timer stop fail")); } } - cdf_status = + qdf_status = cdf_mc_timer_destroy(&pSmeRrmContext->neighborReqControlInfo. neighborRspWaitTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, FL("Fail to destroy timer")); @@ -1457,7 +1457,7 @@ CDF_STATUS rrm_close(tpAniSirGlobal pMac) csr_ll_close(&pSmeRrmContext->neighborReportCache); - return cdf_status; + return qdf_status; } @@ -1469,14 +1469,14 @@ CDF_STATUS rrm_close(tpAniSirGlobal pMac) \param pMac - The handle returned by mac_open. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS rrm_ready(tpAniSirGlobal pMac) +QDF_STATUS rrm_ready(tpAniSirGlobal pMac) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- @@ -1487,16 +1487,16 @@ CDF_STATUS rrm_ready(tpAniSirGlobal pMac) \param pMac - The handle returned by mac_open. \param pRrmConfig - pointer to new rrm configs. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS rrm_change_default_config_param(tpAniSirGlobal pMac, +QDF_STATUS rrm_change_default_config_param(tpAniSirGlobal pMac, struct rrm_config_param *rrm_config) { cdf_mem_copy(&pMac->rrm.rrmSmeContext.rrmConfig, rrm_config, sizeof(struct rrm_config_param)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- diff --git a/core/utils/logging/inc/wlan_logging_sock_svc.h b/core/utils/logging/inc/wlan_logging_sock_svc.h index 5aa5245926..d6c94930ba 100644 --- a/core/utils/logging/inc/wlan_logging_sock_svc.h +++ b/core/utils/logging/inc/wlan_logging_sock_svc.h @@ -34,7 +34,6 @@ #define WLAN_LOGGING_SOCK_SVC_H #include -#include #include #include #include diff --git a/core/utils/pktlog/pktlog_ac.c b/core/utils/pktlog/pktlog_ac.c index 1632adbfd9..dfde60ddd6 100644 --- a/core/utils/pktlog/pktlog_ac.c +++ b/core/utils/pktlog/pktlog_ac.c @@ -75,7 +75,7 @@ static A_STATUS pktlog_wma_post_msg(WMI_PKTLOG_EVENT event_types, WMI_CMD_ID cmd_id) { cds_msg_t msg = { 0 }; - CDF_STATUS status; + QDF_STATUS status; struct ath_pktlog_wmi_params *param; param = cdf_mem_malloc(sizeof(struct ath_pktlog_wmi_params)); @@ -92,7 +92,7 @@ static A_STATUS pktlog_wma_post_msg(WMI_PKTLOG_EVENT event_types, status = cds_mq_post_message(CDS_MQ_ID_WMA, &msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cdf_mem_free(param); return A_ERROR; } diff --git a/core/utils/ptt/inc/wlan_ptt_sock_svc.h b/core/utils/ptt/inc/wlan_ptt_sock_svc.h index cc84385661..c59b92fcef 100644 --- a/core/utils/ptt/inc/wlan_ptt_sock_svc.h +++ b/core/utils/ptt/inc/wlan_ptt_sock_svc.h @@ -33,7 +33,6 @@ #define PTT_SOCK_SVC_H #include #include -#include #include #include #include diff --git a/core/utils/ptt/src/wlan_ptt_sock_svc.c b/core/utils/ptt/src/wlan_ptt_sock_svc.c index 409d3cfe24..dce3cfd80f 100644 --- a/core/utils/ptt/src/wlan_ptt_sock_svc.c +++ b/core/utils/ptt/src/wlan_ptt_sock_svc.c @@ -32,7 +32,6 @@ #ifdef PTT_SOCK_SVC_ENABLE #include #include -#include #include #include #include diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 7f184f5d53..eb38ae56f7 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -38,7 +38,6 @@ #include "wmi_version.h" #include "cdf_types.h" #include "cfg_api.h" -#include "cdf_status.h" #include "qdf_status.h" #include "cds_sched.h" #include "ol_txrx_api.h" @@ -1347,7 +1346,7 @@ typedef struct { void (*csr_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr, uint8_t reason); - CDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, + QDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr); cdf_wake_lock_t wmi_cmd_rsp_wake_lock; @@ -1855,7 +1854,7 @@ enum uapsd_ac { UAPSD_VO }; -CDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, +QDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, uint32_t vdev_id, enum uapsd_ac ac); /** @@ -1945,32 +1944,32 @@ int wma_dfs_indicate_radar(struct ieee80211com *ic, struct dfs_ieee80211_channel *ichan); uint16_t dfs_usenol(struct ieee80211com *ic); -CDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, +QDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, tp_wma_trigger_uapsd_params trigger_uapsd_params); /* added to get average snr for both data and beacon */ -CDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, void *pGetRssiReq); +QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, void *pGetRssiReq); -CDF_STATUS wma_update_vdev_tbl(tp_wma_handle wma_handle, uint8_t vdev_id, +QDF_STATUS wma_update_vdev_tbl(tp_wma_handle wma_handle, uint8_t vdev_id, ol_txrx_vdev_handle tx_rx_vdev_handle, uint8_t *mac, uint32_t vdev_type, bool add_del); void wma_send_flush_logs_to_fw(tp_wma_handle wma_handle); void wma_log_completion_timeout(void *data); -CDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, +QDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, struct rssi_monitor_req *req); -CDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, struct sir_pcl_list *msg); -CDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, struct sir_hw_mode *msg); -CDF_STATUS wma_get_scan_id(uint32_t *scan_id); +QDF_STATUS wma_get_scan_id(uint32_t *scan_id); -CDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, +QDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, struct sir_dual_mac_config *msg); int wma_crash_inject(tp_wma_handle wma_handle, uint32_t type, uint32_t delay_time_ms); @@ -1984,7 +1983,7 @@ struct wma_target_req *wma_fill_hold_req(tp_wma_handle wma, uint8_t type, void *params, uint32_t timeout); -CDF_STATUS wma_vdev_start(tp_wma_handle wma, +QDF_STATUS wma_vdev_start(tp_wma_handle wma, struct wma_vdev_start_req *req, bool isRestart); void wma_remove_vdev_req(tp_wma_handle wma, uint8_t vdev_id, @@ -2000,24 +1999,24 @@ void wma_set_dfs_region(tp_wma_handle wma, uint8_t dfs_region); uint32_t wma_get_vht_ch_width(void); #ifdef FEATURE_LFR_SUBNET_DETECTION -CDF_STATUS wma_set_gateway_params(tp_wma_handle wma, +QDF_STATUS wma_set_gateway_params(tp_wma_handle wma, struct gateway_param_update_req *req); #else -static inline CDF_STATUS wma_set_gateway_params(tp_wma_handle wma, +static inline QDF_STATUS wma_set_gateway_params(tp_wma_handle wma, struct gateway_param_update_req *req) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_LFR_SUBNET_DETECTION */ #if defined(FEATURE_LRO) -CDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, struct wma_lro_config_cmd_t *wma_lro_cmd); #else -static inline CDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, +static inline QDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, struct wma_lro_config_cmd_t *wma_lro_cmd) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif void diff --git a/core/wma/inc/wma_api.h b/core/wma/inc/wma_api.h index a0d73deec6..164ec4d5f5 100644 --- a/core/wma/inc/wma_api.h +++ b/core/wma/inc/wma_api.h @@ -78,19 +78,19 @@ typedef enum { typedef void (*wma_peer_authorized_fp) (uint32_t vdev_id); -CDF_STATUS wma_pre_start(void *cds_context); +QDF_STATUS wma_pre_start(void *cds_context); -CDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg); +QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg); -CDF_STATUS wma_start(void *cds_context); +QDF_STATUS wma_start(void *cds_context); -CDF_STATUS wma_stop(void *cds_context, uint8_t reason); +QDF_STATUS wma_stop(void *cds_context, uint8_t reason); -CDF_STATUS wma_close(void *cds_context); +QDF_STATUS wma_close(void *cds_context); -CDF_STATUS wma_wmi_service_close(void *cds_context); +QDF_STATUS wma_wmi_service_close(void *cds_context); -CDF_STATUS wma_wmi_work_close(void *cds_context); +QDF_STATUS wma_wmi_work_close(void *cds_context); void wma_rx_ready_event(WMA_HANDLE handle, void *ev); @@ -102,7 +102,7 @@ void wma_setneedshutdown(void *cds_context); bool wma_needshutdown(void *cds_context); -CDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle); +QDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle); uint8_t wma_map_channel(uint8_t mapChannel); @@ -111,10 +111,10 @@ int wma_cli_set_command(int vdev_id, int param_id, int sval, int vpdev); int wma_cli_set2_command(int vdev_id, int param_id, int sval1, int sval2, int vpdev); -CDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value); -CDF_STATUS wma_set_reg_domain(void *clientCtxt, v_REGDOMAIN_t regId); +QDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value); +QDF_STATUS wma_set_reg_domain(void *clientCtxt, v_REGDOMAIN_t regId); -CDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, +QDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, uint8_t *pVersion, uint32_t versionBufferSize); int wma_runtime_suspend(void); @@ -124,17 +124,17 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr); void wma_target_suspend_acknowledge(void *context); int wma_bus_resume(void); int wma_resume_target(WMA_HANDLE handle); -CDF_STATUS wma_disable_wow_in_fw(WMA_HANDLE handle); -CDF_STATUS wma_disable_d0wow_in_fw(WMA_HANDLE handle); +QDF_STATUS wma_disable_wow_in_fw(WMA_HANDLE handle); +QDF_STATUS wma_disable_d0wow_in_fw(WMA_HANDLE handle); bool wma_is_wow_mode_selected(WMA_HANDLE handle); -CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle); -CDF_STATUS wma_enable_d0wow_in_fw(WMA_HANDLE handle); +QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle); +QDF_STATUS wma_enable_d0wow_in_fw(WMA_HANDLE handle); bool wma_check_scan_in_progress(WMA_HANDLE handle); void wma_set_peer_authorized_cb(void *wma_ctx, wma_peer_authorized_fp auth_cb); int wma_set_peer_param(void *wma_ctx, uint8_t *peer_addr, uint32_t param_id, uint32_t param_value, uint32_t vdev_id); #ifdef NOT_YET -CDF_STATUS wma_update_channel_list(WMA_HANDLE handle, void *scan_chan_info); +QDF_STATUS wma_update_channel_list(WMA_HANDLE handle, void *scan_chan_info); #endif uint8_t *wma_get_vdev_address_by_vdev_id(uint8_t vdev_id); @@ -159,7 +159,7 @@ int8_t wma_get_hw_mode_idx_from_dbs_hw_list(enum hw_mode_ss_config mac0_ss, enum hw_mode_bandwidth mac1_bw, enum hw_mode_dbs_capab dbs, enum hw_mode_agile_dfs_capab dfs); -CDF_STATUS wma_get_hw_mode_from_idx(uint32_t idx, +QDF_STATUS wma_get_hw_mode_from_idx(uint32_t idx, struct sir_hw_mode_params *hw_mode); int8_t wma_get_num_dbs_hw_modes(void); bool wma_is_hw_dbs_capable(void); @@ -167,18 +167,18 @@ bool wma_is_hw_agile_dfs_capable(void); int8_t wma_get_mac_id_of_vdev(uint32_t vdev_id); void wma_update_intf_hw_mode_params(uint32_t vdev_id, uint32_t mac_id, uint32_t cfgd_hw_mode_index); -CDF_STATUS wma_get_old_and_new_hw_index(uint32_t *old_hw_mode_index, +QDF_STATUS wma_get_old_and_new_hw_index(uint32_t *old_hw_mode_index, uint32_t *new_hw_mode_index); void wma_set_dbs_capability_ut(uint32_t dbs); -CDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs); -CDF_STATUS wma_get_current_hw_mode(struct sir_hw_mode_params *hw_mode); +QDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs); +QDF_STATUS wma_get_current_hw_mode(struct sir_hw_mode_params *hw_mode); bool wma_is_dbs_enable(void); bool wma_is_agile_dfs_enable(void); -CDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, +QDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, bool dbs_scan, bool dbs_plus_agile_scan, bool single_mac_scan_with_dfs); -CDF_STATUS wma_get_updated_fw_mode_config(uint32_t *fw_mode_config, +QDF_STATUS wma_get_updated_fw_mode_config(uint32_t *fw_mode_config, bool dbs, bool agile_dfs); bool wma_get_dbs_scan_config(void); @@ -225,18 +225,18 @@ bool wma_is_scan_simultaneous_capable(void); #ifdef FEATURE_GREEN_AP void wma_setup_egap_support(struct wma_tgt_cfg *tgt_cfg, WMA_HANDLE handle); void wma_register_egap_event_handle(WMA_HANDLE handle); -CDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, +QDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, struct egap_conf_params *egap_params); #else static inline void wma_setup_egap_support(struct wma_tgt_cfg *tgt_cfg, WMA_HANDLE handle) {} static inline void wma_register_egap_event_handle(WMA_HANDLE handle) {} -static inline CDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, +static inline QDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, struct egap_conf_params *egap_params) { - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } #endif -CDF_STATUS wma_set_tx_power_scale(uint8_t vdev_id, int value); -CDF_STATUS wma_set_tx_power_scale_decr_db(uint8_t vdev_id, int value); +QDF_STATUS wma_set_tx_power_scale(uint8_t vdev_id, int value); +QDF_STATUS wma_set_tx_power_scale_decr_db(uint8_t vdev_id, int value); #endif diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index 5abd40bbd8..554e915b6f 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -278,9 +278,9 @@ typedef struct { * HAL to PE via response message. HAL does not read them. */ /* The return status of SIR_HAL_ADD_STA_REQ is reported here */ - CDF_STATUS status; + QDF_STATUS status; /* Station index; valid only when 'status' field value is - * CDF_STATUS_SUCCESS + * QDF_STATUS_SUCCESS */ uint8_t staIdx; /* BSSID of BSS to which the station is associated. @@ -338,7 +338,7 @@ typedef struct { typedef struct { uint16_t staIdx; uint16_t assocId; - CDF_STATUS status; + QDF_STATUS status; uint8_t respReqd; uint8_t sessionId; uint8_t smesessionId; @@ -374,7 +374,7 @@ typedef struct { uint8_t singleTidRc; uint8_t smesessionId; struct cdf_mac_addr peer_macaddr; - CDF_STATUS status; + QDF_STATUS status; uint8_t sessionId; uint8_t sendRsp; } tSetStaKeyParams, *tpSetStaKeyParams; @@ -476,7 +476,7 @@ typedef struct { uint8_t txChannelWidthSet; uint8_t currentOperChannel; tAddStaParams staContext; - CDF_STATUS status; + QDF_STATUS status; uint16_t bssIdx; /* HAL should update the existing BSS entry, if this flag is set. * PE will set this flag in case of reassoc, where we want to resue the @@ -525,7 +525,7 @@ typedef struct { */ typedef struct { uint8_t bssIdx; - CDF_STATUS status; + QDF_STATUS status; uint8_t respReqd; uint8_t sessionId; tSirMacAddr bssid; @@ -568,7 +568,7 @@ typedef struct { tSirMacMgmtHdr macMgmtHdr; tSirScanEntry scanEntry; tSirLinkTrafficCheck checkLinkTraffic; - CDF_STATUS status; + QDF_STATUS status; } tInitScanParams, *tpInitScanParams; typedef enum eDelStaReasonCode { @@ -612,7 +612,7 @@ typedef struct { */ typedef struct { uint8_t scanChannel; - CDF_STATUS status; + QDF_STATUS status; #if defined WLAN_FEATURE_VOWIFI uint32_t startTSF[2]; int8_t txMgmtPower; @@ -626,7 +626,7 @@ typedef struct { */ typedef struct { uint8_t scanChannel; - CDF_STATUS status; + QDF_STATUS status; } tEndScanParams, *tpEndScanParams; /** @@ -659,7 +659,7 @@ typedef struct { uint8_t frameType; tSirMacMgmtHdr macMgmtHdr; tSirScanEntry scanEntry; - CDF_STATUS status; + QDF_STATUS status; } tFinishScanParams, *tpFinishScanParams; #ifdef FEATURE_OEM_DATA_SUPPORT @@ -679,7 +679,7 @@ typedef struct { */ typedef struct { struct cdf_mac_addr selfMacAddr; - CDF_STATUS status; + QDF_STATUS status; uint8_t data_len; uint8_t *data; } tStartOemDataReq, *tpStartOemDataReq; @@ -765,7 +765,7 @@ typedef struct { tSirKeys key[SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS]; uint8_t singleTidRc; uint8_t smesessionId; - CDF_STATUS status; + QDF_STATUS status; uint8_t sessionId; } tSetBssKeyParams, *tpSetBssKeyParams; @@ -915,7 +915,7 @@ typedef struct { * this struct */ tSirMacAddr bssId; - CDF_STATUS status; + QDF_STATUS status; uint16_t chainMask; uint16_t smpsMode; uint8_t isDfsChannel; @@ -992,7 +992,7 @@ typedef struct { uint16_t staIdx; uint16_t tspecIdx; tSirMacTspecIE tspec; - CDF_STATUS status; + QDF_STATUS status; uint8_t sessionId; #ifdef FEATURE_WLAN_ESE uint16_t tsm_interval; @@ -1042,7 +1042,7 @@ typedef struct { uint16_t staIdx; uint16_t tspecIdx; tSirMacTspecIE tspec[HAL_QOS_NUM_AC_MAX]; - CDF_STATUS status[HAL_QOS_NUM_AC_MAX]; + QDF_STATUS status[HAL_QOS_NUM_AC_MAX]; uint8_t sessionId; } tAggrAddTsParams, *tpAggrAddTsParams; @@ -1079,7 +1079,7 @@ typedef struct { typedef struct sSet_MIMOPS { uint16_t staIdx; tSirMacHTMIMOPowerSaveState htMIMOPSState; - CDF_STATUS status; + QDF_STATUS status; uint8_t fsendRsp; tSirMacAddr peerMac; uint8_t sessionId; @@ -1108,7 +1108,7 @@ typedef struct sUapsdParams { uint8_t beTriggerEnabled:1; uint8_t viTriggerEnabled:1; uint8_t voTriggerEnabled:1; - CDF_STATUS status; + QDF_STATUS status; uint8_t bssIdx; } tUapsdParams, *tpUapsdParams; diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index d2788103f8..0a7a646ff1 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -158,7 +158,7 @@ void wma_send_msg(tp_wma_handle wma_handle, uint16_t msg_type, void wma_data_tx_ack_comp_hdlr(void *wma_context, cdf_nbuf_t netbuf, int32_t status); -CDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param, +QDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param, int value); /* @@ -176,52 +176,52 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event, uint32_t len); #endif -CDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, tSirScanOffloadReq *scan_req, wmi_buf_t *buf, int *buf_len); -CDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle, wmi_buf_t *buf, int *buf_len, tAbortScanParams *abort_scan_req); -CDF_STATUS wma_start_scan(tp_wma_handle wma_handle, +QDF_STATUS wma_start_scan(tp_wma_handle wma_handle, tSirScanOffloadReq *scan_req, uint16_t msg_type); -CDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, +QDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, tAbortScanParams *abort_scan_req); -CDF_STATUS wma_update_channel_list(WMA_HANDLE handle, +QDF_STATUS wma_update_channel_list(WMA_HANDLE handle, tSirUpdateChanList *chan_list); #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, wmi_roam_offload_tlv_param * roam_offload_params, tSirRoamOffloadScanReq *roam_req); #endif -CDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, wmi_start_scan_cmd_fixed_param * scan_cmd_fp, tSirRoamOffloadScanReq *roam_req, uint32_t mode, uint32_t vdev_id); -CDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req); -CDF_STATUS wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, uint32_t scan_period, uint32_t scan_age, uint32_t vdev_id); -CDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, uint32_t vdev_id, int32_t rssi_change_thresh, uint32_t bcn_rssi_weight, uint32_t hirssi_delay_btw_scans); -CDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, uint8_t chan_count, uint8_t *chan_list, uint8_t list_type, uint32_t vdev_id); @@ -242,25 +242,25 @@ void wma_roam_scan_fill_scan_params(tp_wma_handle wma_handle, wmi_start_scan_cmd_fixed_param * scan_params); -CDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, wmi_ap_profile *ap_profile_p, uint32_t vdev_id); -CDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, A_INT32 first_bcnt, A_UINT32 final_bcnt, uint32_t vdev_id); -CDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, uint32_t command, uint32_t vdev_id); -CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req); -CDF_STATUS wma_roam_preauth_chan_set(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_preauth_chan_set(tp_wma_handle wma_handle, tpSwitchChannelParams params, uint8_t vdev_id); -CDF_STATUS wma_roam_preauth_chan_cancel(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_preauth_chan_cancel(tp_wma_handle wma_handle, tpSwitchChannelParams params, uint8_t vdev_id); @@ -272,9 +272,9 @@ void wma_roam_preauth_scan_event_handler(tp_wma_handle wma_handle, void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params); #ifdef FEATURE_WLAN_SCAN_PNO -CDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno); +QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno); -CDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id); +QDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id); void wma_config_pno(tp_wma_handle wma, tpSirPNOScanReq pno); void wma_set_pno_channel_prediction(uint8_t *buf_ptr, @@ -289,9 +289,9 @@ static inline void wma_set_pno_channel_prediction(uint8_t *buf_ptr, } #endif #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm); +QDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm); -CDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm); +QDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm); void wma_config_plm(tp_wma_handle wma, tpSirPlmReq plm); #endif @@ -343,70 +343,70 @@ wma_extscan_hotlist_ssid_match_event_handler(void *handle, void wma_register_extscan_event_handler(tp_wma_handle wma_handle); #ifdef FEATURE_WLAN_EXTSCAN -CDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, tSirWifiScanCmdReqParams *pstart, wmi_buf_t *buf, int *buf_len); -CDF_STATUS wma_start_extscan(tp_wma_handle wma, +QDF_STATUS wma_start_extscan(tp_wma_handle wma, tSirWifiScanCmdReqParams *pstart); -CDF_STATUS wma_stop_extscan(tp_wma_handle wma, +QDF_STATUS wma_stop_extscan(tp_wma_handle wma, tSirExtScanStopReqParams *pstopcmd); -CDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, tSirExtScanSetBssidHotListReqParams * photlist, int *buf_len); -CDF_STATUS wma_extscan_start_hotlist_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_start_hotlist_monitor(tp_wma_handle wma, tSirExtScanSetBssidHotListReqParams *photlist); -CDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, tSirExtScanResetBssidHotlistReqParams *photlist_reset); -CDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, tSirExtScanSetSigChangeReqParams *psigchange, wmi_buf_t *buf, int *buf_len); -CDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma, tSirExtScanSetSigChangeReqParams * psigchange); -CDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, tSirExtScanResetSignificantChangeReqParams *pResetReq); -CDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, +QDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, tSirExtScanGetCachedResultsReqParams * pcached_results); -CDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, +QDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, tSirGetExtScanCapabilitiesReqParams * pgetcapab); -CDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, +QDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, struct wifi_epno_params *req); -CDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, +QDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, struct wifi_passpoint_req *req); -CDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, +QDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, struct wifi_passpoint_req *req); -CDF_STATUS +QDF_STATUS wma_set_ssid_hotlist(tp_wma_handle wma, struct sir_set_ssid_hotlist_request *request); #endif -CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, +QDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, struct sir_ipa_offload_enable_disable *ipa_offload); #ifdef WLAN_FEATURE_ROAM_OFFLOAD void wma_process_unit_test_cmd(WMA_HANDLE handle, - t_wma_unit_test_cmd *wma_utest); + t_wma_unit_test_cmd * wma_utest); #endif -CDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui); +QDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui); int wma_scan_event_callback(WMA_HANDLE handle, uint8_t *data, uint32_t len); @@ -536,7 +536,7 @@ int wma_unified_vdev_create_send(wmi_unified_t wmi_handle, uint8_t if_id, uint32_t type, uint32_t subtype, uint8_t macaddr[IEEE80211_ADDR_LEN]); -CDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle, +QDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle, struct del_sta_self_params *pdel_sta_self_req_param, uint8_t generateRsp); @@ -556,7 +556,7 @@ void wma_remove_peer(tp_wma_handle wma, uint8_t *bssid, uint8_t vdev_id, ol_txrx_peer_handle peer, bool roam_synch_in_progress); -CDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, +QDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, ol_txrx_vdev_handle vdev, u8 peer_addr[IEEE80211_ADDR_LEN], uint32_t peer_type, uint8_t vdev_id, @@ -569,7 +569,7 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, struct add_sta_self_params *self_sta_req, uint8_t generateRsp); -CDF_STATUS wma_vdev_start(tp_wma_handle wma, +QDF_STATUS wma_vdev_start(tp_wma_handle wma, struct wma_vdev_start_req *req, bool isRestart); void wma_vdev_resp_timer(void *data); @@ -656,7 +656,7 @@ void wma_adjust_ibss_heart_beat_timer(tp_wma_handle wma, void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info); -CDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, +QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, tEdcaParams *edca_params); int wma_tbttoffset_update_event_handler(void *handle, uint8_t *event, @@ -697,7 +697,7 @@ int32_t wmi_unified_set_sta_ps_param(wmi_unified_t wmi_handle, uint32_t vdev_id, uint32_t param, uint32_t value); -CDF_STATUS +QDF_STATUS wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id); int32_t wma_set_ap_peer_uapsd(tp_wma_handle wma, uint32_t vdev_id, @@ -723,12 +723,12 @@ void wma_enable_uapsd_mode(tp_wma_handle wma, tpEnableUapsdParams ps_req); void wma_disable_uapsd_mode(tp_wma_handle wma, tpDisableUapsdParams ps_req); -CDF_STATUS wma_get_temperature(tp_wma_handle wma_handle); +QDF_STATUS wma_get_temperature(tp_wma_handle wma_handle); int wma_pdev_temperature_evt_handler(void *handle, uint8_t *event, uint32_t len); -CDF_STATUS wma_process_tx_power_limits(WMA_HANDLE handle, +QDF_STATUS wma_process_tx_power_limits(WMA_HANDLE handle, tSirTxPowerLimit *ptxlim); void wma_update_noa(struct beacon_info *beacon, @@ -746,12 +746,12 @@ void wma_process_set_p2pgo_noa_req(tp_wma_handle wma, void wma_process_set_mimops_req(tp_wma_handle wma_handle, tSetMIMOPS *mimops); -CDF_STATUS wma_set_mimops(tp_wma_handle wma, uint8_t vdev_id, int value); +QDF_STATUS wma_set_mimops(tp_wma_handle wma, uint8_t vdev_id, int value); -CDF_STATUS wma_notify_modem_power_state(void *wma_ptr, +QDF_STATUS wma_notify_modem_power_state(void *wma_ptr, tSirModemPowerStateInd *pReq); -CDF_STATUS wma_set_smps_params(tp_wma_handle wma, uint8_t vdev_id, +QDF_STATUS wma_set_smps_params(tp_wma_handle wma, uint8_t vdev_id, int value); void wma_set_suspend_dtim(tp_wma_handle wma); @@ -774,14 +774,14 @@ int wma_peer_state_change_event_handler(void *handle, uint8_t *event_buff, uint32_t len); -CDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t +QDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t mcc_adaptive_scheduler); -CDF_STATUS wma_set_mcc_channel_time_latency +QDF_STATUS wma_set_mcc_channel_time_latency (tp_wma_handle wma, uint32_t mcc_channel, uint32_t mcc_channel_time_latency); -CDF_STATUS wma_set_mcc_channel_time_quota +QDF_STATUS wma_set_mcc_channel_time_quota (tp_wma_handle wma, uint32_t adapter_1_chan_number, uint32_t adapter_1_quota, uint32_t adapter_2_chan_number); @@ -790,26 +790,26 @@ void wma_set_linkstate(tp_wma_handle wma, tpLinkStateParams params); void wma_unpause_vdev(tp_wma_handle wma); -CDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, +QDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, tSirRateUpdateInd * pRateUpdateParams); -CDF_STATUS wma_tx_attach(tp_wma_handle wma_handle); +QDF_STATUS wma_tx_attach(tp_wma_handle wma_handle); -CDF_STATUS wma_tx_detach(tp_wma_handle wma_handle); +QDF_STATUS wma_tx_detach(tp_wma_handle wma_handle); #if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) || defined(QCA_LL_TX_FLOW_CONTROL_V2) int wma_mcc_vdev_tx_pause_evt_handler(void *handle, uint8_t *event, uint32_t len); #endif -CDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, +QDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, t_thermal_mgmt *pThermalParams); -CDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, +QDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, uint8_t thermal_level); -CDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle, +QDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle, t_thermal_cmd_params thermal_info); int wma_thermal_mgmt_evt_handler(void *handle, uint8_t *event, @@ -829,13 +829,13 @@ tSmpsModeValue host_map_smps_mode(A_UINT32 fw_smps_mode); #ifdef WLAN_FEATURE_LINK_LAYER_STATS void wma_register_ll_stats_event_handler(tp_wma_handle wma_handle); -CDF_STATUS wma_process_ll_stats_clear_req +QDF_STATUS wma_process_ll_stats_clear_req (tp_wma_handle wma, const tpSirLLStatsClearReq clearReq); -CDF_STATUS wma_process_ll_stats_set_req +QDF_STATUS wma_process_ll_stats_set_req (tp_wma_handle wma, const tpSirLLStatsSetReq setReq); -CDF_STATUS wma_process_ll_stats_get_req +QDF_STATUS wma_process_ll_stats_get_req (tp_wma_handle wma, const tpSirLLStatsGetReq getReq) ; int wma_unified_link_iface_stats_event_handler(void *handle, @@ -852,12 +852,12 @@ int wma_link_status_event_handler(void *handle, uint8_t *cmd_param_info, int wma_stats_event_handler(void *handle, uint8_t *cmd_param_info, uint32_t len); -CDF_STATUS wma_send_link_speed(uint32_t link_speed); +QDF_STATUS wma_send_link_speed(uint32_t link_speed); int wma_link_speed_event_handler(void *handle, uint8_t *cmd_param_info, uint32_t len); -CDF_STATUS wma_wni_cfg_dnld(tp_wma_handle wma_handle); +QDF_STATUS wma_wni_cfg_dnld(tp_wma_handle wma_handle); int wma_unified_debug_print_event_handler(void *handle, uint8_t *datap, uint32_t len); @@ -891,7 +891,7 @@ void wma_utf_detach(tp_wma_handle wma_handle); void wma_utf_attach(tp_wma_handle wma_handle); -CDF_STATUS +QDF_STATUS wma_process_ftm_command(tp_wma_handle wma_handle, struct ar6k_testmode_cmd_data *msg_buffer); #endif @@ -904,18 +904,18 @@ void wma_process_link_status_req(tp_wma_handle wma, tAniGetLinkStatus *pGetLinkStatus); #ifdef FEATURE_WLAN_LPHB -CDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req); #endif -CDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, +QDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, tAniDHCPInd *ta_dhcp_ind); WLAN_PHY_MODE wma_chan_to_mode(u8 chan, phy_ch_width chan_width, u8 vht_capable, u8 dot11_mode); -CDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed); +QDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed); #ifdef FEATURE_GREEN_AP int32_t wmi_unified_pdev_green_ap_ps_enable_cmd(wmi_unified_t wmi_handle, @@ -968,7 +968,7 @@ int wma_unified_dfs_phyerr_filter_offload_enable(tp_wma_handle wma_handle); #if !defined(REMOVE_PKT_LOG) -CDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, +QDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, struct ath_pktlog_wmi_params *params); #endif @@ -988,19 +988,19 @@ static inline int wma_get_wow_bus_suspend(tp_wma_handle wma) return cdf_atomic_read(&wma->is_wow_bus_suspended); } -CDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type); +QDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type); -CDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, +QDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn); -CDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma, +QDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma, struct wow_delete_pattern *pattern); -CDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info); +QDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info); -CDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info); +QDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info); -CDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type); +QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type); void wma_calculate_and_update_conn_state(tp_wma_handle wma); void wma_update_conn_state(tp_wma_handle wma, uint32_t conn_mask); void wma_update_conn_state(tp_wma_handle wma, uint32_t conn_mask); @@ -1022,43 +1022,43 @@ int wma_process_receive_filter_clear_filter_req(tp_wma_handle wma_handle, #ifdef FEATURE_OEM_DATA_SUPPORT void wma_start_oem_data_req(tp_wma_handle wma_handle, - tStartOemDataReq *startOemDataReq); + tStartOemDataReq * startOemDataReq); #endif #ifdef FEATURE_WLAN_ESE -CDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, +QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, void *pTsmStatsMsg); #endif -CDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle, - tSirRcvFltMcAddrList *mcbc_param); +QDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle, + tSirRcvFltMcAddrList * mcbc_param); #ifdef WLAN_FEATURE_GTK_OFFLOAD -CDF_STATUS wma_process_gtk_offload_req(tp_wma_handle wma, +QDF_STATUS wma_process_gtk_offload_req(tp_wma_handle wma, tpSirGtkOffloadParams params); -CDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, +QDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, tpSirGtkOffloadGetInfoRspParams params); #endif -CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, +QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, tpSirHostOffloadReq pHostOffloadParams, bool bArpOnly); -CDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, +QDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, tSirAddPeriodicTxPtrn * pAddPeriodicTxPtrnParams); -CDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, +QDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, tSirDelPeriodicTxPtrn * pDelPeriodicTxPtrnParams); #ifdef WLAN_FEATURE_STATS_EXT -CDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq); +QDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq); #endif -CDF_STATUS wma_process_ibss_route_table_update_ind(void *wma_handle, - tAniIbssRouteTable *pData); +QDF_STATUS wma_process_ibss_route_table_update_ind(void *wma_handle, + tAniIbssRouteTable * pData); #ifdef WLAN_FEATURE_EXTWOW_SUPPORT int wma_enable_ext_wow(tp_wma_handle wma, tpSirExtWoWParams params); @@ -1074,14 +1074,14 @@ int wma_set_app_type2_params_in_fw(tp_wma_handle wma, int wma_auto_shutdown_event_handler(void *handle, uint8_t *event, uint32_t len); -CDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, +QDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, tSirAutoShutdownCmdParams * auto_sh_cmd); #endif #ifdef WLAN_FEATURE_NAN -CDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req); +QDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req); #endif #ifdef DHCP_SERVER_OFFLOAD @@ -1091,7 +1091,7 @@ int wma_process_dhcpserver_offload(tp_wma_handle wma_handle, #endif #ifdef WLAN_FEATURE_GPIO_LED_FLASHING -CDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, +QDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, tSirLedFlashingReq *flashing); #endif @@ -1099,7 +1099,7 @@ CDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, int wma_channel_avoid_evt_handler(void *handle, uint8_t *event, uint32_t len); -CDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, tSirChAvoidUpdateReq * ch_avoid_update_req); #endif @@ -1150,7 +1150,7 @@ int wma_rssi_breached_event_handler(void *handle, #ifdef WLAN_FEATURE_MEMDUMP int wma_fw_mem_dump_event_handler(void *handle, u_int8_t *cmd_param_info, u_int32_t len); -CDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, +QDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, struct fw_dump_req *mem_dump_req); #else static inline int wma_fw_mem_dump_event_handler(void *handle, @@ -1159,13 +1159,13 @@ static inline int wma_fw_mem_dump_event_handler(void *handle, return 0; } -static inline CDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, +static inline QDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, void *mem_dump_req) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif -CDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, +QDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, struct vdev_ie_info *ie_info); int wma_peer_assoc_conf_handler(void *handle, uint8_t *cmd_param_info, uint32_t len); diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h index 9460d5f0fc..8180e06e32 100644 --- a/core/wma/inc/wma_types.h +++ b/core/wma/inc/wma_types.h @@ -51,7 +51,7 @@ #define WMA_MAX_STA (16) #endif -#define WMA_NVDownload_Start(x) ({ CDF_STATUS_SUCCESS; }) +#define WMA_NVDownload_Start(x) ({ QDF_STATUS_SUCCESS; }) #define DPU_FEEDBACK_UNPROTECTED_ERROR 0x0F @@ -462,7 +462,7 @@ #define wma_tx_frame(hHal, pFrmBuf, frmLen, frmType, txDir, tid, pCompFunc, \ pData, txFlag, sessionid, channel_freq) \ - (CDF_STATUS)( wma_tx_packet( \ + (QDF_STATUS)( wma_tx_packet( \ cds_get_context(CDF_MODULE_ID_WMA), \ (pFrmBuf), \ (frmLen), \ @@ -480,7 +480,7 @@ #define wma_tx_frameWithTxComplete(hHal, pFrmBuf, frmLen, frmType, txDir, tid, \ pCompFunc, pData, pCBackFnTxComp, txFlag, sessionid, tdlsflag, \ channel_freq) \ - (CDF_STATUS)( wma_tx_packet( \ + (QDF_STATUS)( wma_tx_packet( \ cds_get_context(CDF_MODULE_ID_WMA), \ (pFrmBuf), \ (frmLen), \ @@ -584,7 +584,7 @@ typedef void (*pWMATxRxCompFunc)(void *pContext, void *pData, /* callback function for TX complete */ /* parameter 1 - global pMac pointer */ /* parameter 2 - txComplete status : 1- success, 0 - failure. */ -typedef CDF_STATUS (*pWMAAckFnTxComp)(tpAniSirGlobal, uint32_t); +typedef QDF_STATUS (*pWMAAckFnTxComp)(tpAniSirGlobal, uint32_t); /* generic callback for updating parameters from target to UMAC */ typedef void (*wma_tgt_cfg_cb)(void *context, void *param); @@ -653,17 +653,17 @@ tSirRetStatus wma_post_ctrl_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg); tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, tSirMbMsg *pMb); -CDF_STATUS wma_set_idle_ps_config(void *wma_ptr, uint32_t idle_ps); -CDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req); +QDF_STATUS wma_set_idle_ps_config(void *wma_ptr, uint32_t idle_ps); +QDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req); -CDF_STATUS +QDF_STATUS wma_ds_peek_rx_packet_info (cds_pkt_t *vosDataBuff, void **ppRxHeader, bool bSwap); void wma_tx_abort(uint8_t vdev_id); -CDF_STATUS wma_tx_packet(void *pWMA, +QDF_STATUS wma_tx_packet(void *pWMA, void *pFrmBuf, uint16_t frmLen, eFrameType frmType, @@ -675,23 +675,23 @@ CDF_STATUS wma_tx_packet(void *pWMA, uint8_t txFlag, uint8_t sessionId, bool tdlsflag, uint16_t channel_freq); -CDF_STATUS wma_open(void *p_cds_context, +QDF_STATUS wma_open(void *p_cds_context, wma_tgt_cfg_cb pTgtUpdCB, wma_dfs_radar_indication_cb radar_ind_cb, tMacOpenParameters *pMacParams); -typedef CDF_STATUS (*wma_mgmt_frame_rx_callback)(void *p_cds_gctx, +typedef QDF_STATUS (*wma_mgmt_frame_rx_callback)(void *p_cds_gctx, void *cds_buff); -CDF_STATUS wma_register_mgmt_frm_client(void *p_cds_gctx, +QDF_STATUS wma_register_mgmt_frm_client(void *p_cds_gctx, wma_mgmt_frame_rx_callback mgmt_rx_cb); -CDF_STATUS wma_de_register_mgmt_frm_client(void *p_cds_gctx); -CDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, +QDF_STATUS wma_de_register_mgmt_frm_client(void *p_cds_gctx); +QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, void (*csr_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr, uint8_t reason), - CDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, + QDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr)); diff --git a/core/wma/src/wlan_qct_wma_legacy.c b/core/wma/src/wlan_qct_wma_legacy.c index e11d46ece7..71768f74d7 100644 --- a/core/wma/src/wlan_qct_wma_legacy.c +++ b/core/wma/src/wlan_qct_wma_legacy.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -56,7 +56,7 @@ tSirRetStatus wma_post_ctrl_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) { - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_WMA, (cds_msg_t *) pMsg)) return eSIR_FAILURE; else diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index d56a92f6b3..4d25ebc67d 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -285,7 +285,7 @@ static void wma_bin_search_rate(wma_search_rate_t *tbl, int32_t tbl_size, * * Return: CDF status */ -static CDF_STATUS wma_fill_ofdm_cck_mcast_rate(int32_t mbpsx10_rate, +static QDF_STATUS wma_fill_ofdm_cck_mcast_rate(int32_t mbpsx10_rate, uint8_t nss, uint8_t *rate) { uint8_t idx = 0; @@ -297,7 +297,7 @@ static CDF_STATUS wma_fill_ofdm_cck_mcast_rate(int32_t mbpsx10_rate, *rate |= (1 << 6) | (idx & 0xF); /* set bit 6 to 1 for CCK */ else *rate |= (idx & 0xF); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -339,7 +339,7 @@ static void wma_set_ht_vht_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, * * Return: CDF status */ -static CDF_STATUS wma_fill_ht20_mcast_rate(uint32_t shortgi, +static QDF_STATUS wma_fill_ht20_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, uint8_t nss, uint8_t *rate, int32_t *streaming_rate) @@ -364,7 +364,7 @@ static CDF_STATUS wma_fill_ht20_mcast_rate(uint32_t shortgi, lgi_idx, lgi_rate, 2, rate, streaming_rate); if (nss == 1) *streaming_rate = *streaming_rate << 1; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -377,7 +377,7 @@ static CDF_STATUS wma_fill_ht20_mcast_rate(uint32_t shortgi, * * Return: CDF status */ -static CDF_STATUS wma_fill_ht40_mcast_rate(uint32_t shortgi, +static QDF_STATUS wma_fill_ht40_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, uint8_t nss, uint8_t *rate, int32_t *streaming_rate) @@ -403,7 +403,7 @@ static CDF_STATUS wma_fill_ht40_mcast_rate(uint32_t shortgi, wma_set_ht_vht_mcast_rate(shortgi, mbpsx10_rate, sgi_idx, sgi_rate, lgi_idx, lgi_rate, 2, rate, streaming_rate); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -416,7 +416,7 @@ static CDF_STATUS wma_fill_ht40_mcast_rate(uint32_t shortgi, * * Return: CDF status */ -static CDF_STATUS wma_fill_vht20_mcast_rate(uint32_t shortgi, +static QDF_STATUS wma_fill_vht20_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, uint8_t nss, uint8_t *rate, int32_t *streaming_rate) @@ -443,7 +443,7 @@ static CDF_STATUS wma_fill_vht20_mcast_rate(uint32_t shortgi, lgi_idx, lgi_rate, 3, rate, streaming_rate); if (nss == 1) *streaming_rate = *streaming_rate << 1; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -456,7 +456,7 @@ static CDF_STATUS wma_fill_vht20_mcast_rate(uint32_t shortgi, * * Return: CDF status */ -static CDF_STATUS wma_fill_vht40_mcast_rate(uint32_t shortgi, +static QDF_STATUS wma_fill_vht40_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, uint8_t nss, uint8_t *rate, int32_t *streaming_rate) @@ -484,7 +484,7 @@ static CDF_STATUS wma_fill_vht40_mcast_rate(uint32_t shortgi, 3, rate, streaming_rate); if (nss == 1) *streaming_rate = *streaming_rate << 1; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -497,7 +497,7 @@ static CDF_STATUS wma_fill_vht40_mcast_rate(uint32_t shortgi, * * Return: CDF status */ -static CDF_STATUS wma_fill_vht80_mcast_rate(uint32_t shortgi, +static QDF_STATUS wma_fill_vht80_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, uint8_t nss, uint8_t *rate, int32_t *streaming_rate) @@ -524,7 +524,7 @@ static CDF_STATUS wma_fill_vht80_mcast_rate(uint32_t shortgi, lgi_idx, lgi_rate, 3, rate, streaming_rate); if (nss == 1) *streaming_rate = *streaming_rate << 1; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -540,7 +540,7 @@ static CDF_STATUS wma_fill_vht80_mcast_rate(uint32_t shortgi, * * Return: CDF status */ -static CDF_STATUS wma_fill_ht_mcast_rate(uint32_t shortgi, +static QDF_STATUS wma_fill_ht_mcast_rate(uint32_t shortgi, uint32_t chwidth, int32_t mbpsx10_rate, uint8_t nss, WLAN_PHY_MODE chanmode, uint8_t *rate, @@ -558,7 +558,7 @@ static CDF_STATUS wma_fill_ht_mcast_rate(uint32_t shortgi, else WMA_LOGE("%s: Error, Invalid chwidth enum %d", __func__, chwidth); - return (*streaming_rate != 0) ? CDF_STATUS_SUCCESS : CDF_STATUS_E_INVAL; + return (*streaming_rate != 0) ? QDF_STATUS_SUCCESS : QDF_STATUS_E_INVAL; } /** @@ -574,7 +574,7 @@ static CDF_STATUS wma_fill_ht_mcast_rate(uint32_t shortgi, * * Return: CDF status */ -static CDF_STATUS wma_fill_vht_mcast_rate(uint32_t shortgi, +static QDF_STATUS wma_fill_vht_mcast_rate(uint32_t shortgi, uint32_t chwidth, int32_t mbpsx10_rate, uint8_t nss, WLAN_PHY_MODE chanmode, @@ -596,7 +596,7 @@ static CDF_STATUS wma_fill_vht_mcast_rate(uint32_t shortgi, else WMA_LOGE("%s: chwidth enum %d not supported", __func__, chwidth); - return (*streaming_rate != 0) ? CDF_STATUS_SUCCESS : CDF_STATUS_E_INVAL; + return (*streaming_rate != 0) ? QDF_STATUS_SUCCESS : QDF_STATUS_E_INVAL; } #define WMA_MCAST_1X1_CUT_OFF_RATE 2000 @@ -612,7 +612,7 @@ static CDF_STATUS wma_fill_vht_mcast_rate(uint32_t shortgi, * * Return: CDF status */ -static CDF_STATUS wma_encode_mc_rate(uint32_t shortgi, uint32_t chwidth, +static QDF_STATUS wma_encode_mc_rate(uint32_t shortgi, uint32_t chwidth, WLAN_PHY_MODE chanmode, A_UINT32 mhz, int32_t mbpsx10_rate, uint8_t nss, uint8_t *rate) @@ -660,7 +660,7 @@ static CDF_STATUS wma_encode_mc_rate(uint32_t shortgi, uint32_t chwidth, ret = wma_fill_ht_mcast_rate(shortgi, chwidth, mbpsx10_rate, nss, chanmode, &rate_ht, &stream_rate_ht); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { stream_rate_ht = 0; } if (mhz < WMA_2_4_GHZ_MAX_FREQ) { @@ -673,9 +673,9 @@ static CDF_STATUS wma_encode_mc_rate(uint32_t shortgi, uint32_t chwidth, ret = wma_fill_vht_mcast_rate(shortgi, chwidth, mbpsx10_rate, nss, chanmode, &rate_vht, &stream_rate_vht); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { if (stream_rate_ht != 0) - ret = CDF_STATUS_SUCCESS; + ret = QDF_STATUS_SUCCESS; *rate = rate_ht; stream_rate = stream_rate_ht; goto ht_vht_done; @@ -989,9 +989,9 @@ int wma_peer_state_change_event_handler(void *handle, * * This function enable/disable mcc adaptive scheduler in fw. * - * Return: CDF_STATUS_SUCCESS for sucess or error code + * Return: QDF_STATUS_SUCCESS for sucess or error code */ -CDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t +QDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t mcc_adaptive_scheduler) { int ret = -1; @@ -1004,13 +1004,13 @@ CDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t wma = cds_get_context(CDF_MODULE_ID_WMA); if (NULL == wma) { WMA_LOGE("%s : Failed to get wma", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGP("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_resmgr_adaptive_ocs_enable_disable_cmd_fixed_param *) wmi_buf_data(buf); @@ -1028,7 +1028,7 @@ CDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t " adaptive scheduler command", __func__); cdf_nbuf_free(buf); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1043,7 +1043,7 @@ CDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t * * Return: CDF status */ -CDF_STATUS wma_set_mcc_channel_time_latency +QDF_STATUS wma_set_mcc_channel_time_latency (tp_wma_handle wma, uint32_t mcc_channel, uint32_t mcc_channel_time_latency) { @@ -1064,20 +1064,20 @@ CDF_STATUS wma_set_mcc_channel_time_latency if (!wma) { WMA_LOGE("%s:NULL wma ptr. Exiting", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMac = cds_get_context(CDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* First step is to confirm if MCC is active */ if (!lim_is_in_mcc(pMac)) { WMA_LOGE("%s: MCC is not active. Exiting", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Confirm MCC adaptive scheduler feature is disabled */ if (wlan_cfg_get_int(pMac, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED, @@ -1085,13 +1085,13 @@ CDF_STATUS wma_set_mcc_channel_time_latency if (cfg_val == WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STAMAX) { WMA_LOGD("%s: Can't set channel latency while MCC " "ADAPTIVE SCHED is enabled. Exit", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } else { WMA_LOGE("%s: Failed to get value for MCC_ADAPTIVE_SCHED, " "Exit w/o setting latency", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* If 0ms latency is provided, then FW will set to a default. * Otherwise, latency must be at least 30ms. @@ -1101,7 +1101,7 @@ CDF_STATUS wma_set_mcc_channel_time_latency WMA_LOGE("%s: Invalid time latency for Channel #1 = %dms " "Minimum is 30ms (or 0 to use default value by " "firmware)", __func__, latency_chan1); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Set WMI CMD for channel time latency here */ @@ -1111,7 +1111,7 @@ CDF_STATUS wma_set_mcc_channel_time_latency buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); cmdTL = (wmi_resmgr_set_chan_latency_cmd_fixed_param *) @@ -1136,9 +1136,9 @@ CDF_STATUS wma_set_mcc_channel_time_latency __func__); cdf_nbuf_free(buf); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1157,7 +1157,7 @@ CDF_STATUS wma_set_mcc_channel_time_latency * * Return: CDF status */ -CDF_STATUS wma_set_mcc_channel_time_quota +QDF_STATUS wma_set_mcc_channel_time_quota (tp_wma_handle wma, uint32_t adapter_1_chan_number, uint32_t adapter_1_quota, uint32_t adapter_2_chan_number) @@ -1188,20 +1188,20 @@ CDF_STATUS wma_set_mcc_channel_time_quota if (!wma) { WMA_LOGE("%s:NULL wma ptr. Exiting", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMac = cds_get_context(CDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* First step is to confirm if MCC is active */ if (!lim_is_in_mcc(pMac)) { WMA_LOGD("%s: MCC is not active. Exiting", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Confirm MCC adaptive scheduler feature is disabled */ @@ -1211,13 +1211,13 @@ CDF_STATUS wma_set_mcc_channel_time_quota WMA_LOGD("%s: Can't set channel quota while " "MCC_ADAPTIVE_SCHED is enabled. Exit", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } else { WMA_LOGE("%s: Failed to retrieve " "WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED. Exit", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* @@ -1227,7 +1227,7 @@ CDF_STATUS wma_set_mcc_channel_time_quota quota_chan1 > WMI_MCC_MAX_CHANNEL_QUOTA) { WMA_LOGE("%s: Invalid time quota for Channel #1=%dms. Minimum " "is 20ms & maximum is 80ms", __func__, quota_chan1); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Set WMI CMD for channel time quota here */ len = sizeof(wmi_resmgr_set_chan_time_quota_cmd_fixed_param) + @@ -1237,7 +1237,7 @@ CDF_STATUS wma_set_mcc_channel_time_quota if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); cmdTQ = (wmi_resmgr_set_chan_time_quota_cmd_fixed_param *) @@ -1268,9 +1268,9 @@ CDF_STATUS wma_set_mcc_channel_time_quota WMA_LOGE("Failed to send MCC Channel Time Quota command"); cdf_nbuf_free(buf); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1287,7 +1287,7 @@ void wma_set_linkstate(tp_wma_handle wma, tpLinkStateParams params) ol_txrx_peer_handle peer; uint8_t vdev_id, peer_id; bool roam_synch_in_progress = false; - CDF_STATUS status; + QDF_STATUS status; params->status = true; WMA_LOGD("%s: state %d selfmac %pM", __func__, @@ -1324,7 +1324,7 @@ void wma_set_linkstate(tp_wma_handle wma, tpLinkStateParams params) status = wma_create_peer(wma, pdev, vdev, params->bssid, WMI_PEER_TYPE_DEFAULT, vdev_id, roam_synch_in_progress); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) WMA_LOGE("%s: Unable to create peer", __func__); if (roam_synch_in_progress) return; @@ -1391,7 +1391,7 @@ void wma_unpause_vdev(tp_wma_handle wma) * * Return: CDF status */ -CDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, +QDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, tSirRateUpdateInd * pRateUpdateParams) { @@ -1411,7 +1411,7 @@ CDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, WMA_LOGE("vdev handle is invalid for %pM", pRateUpdateParams->bssid.bytes); cdf_mem_free(pRateUpdateParams); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } short_gi = intr[vdev_id].config.shortgi; if (short_gi == 0) @@ -1444,7 +1444,7 @@ CDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, ret = wma_encode_mc_rate(short_gi, intr[vdev_id].config.chwidth, intr[vdev_id].chanmode, intr[vdev_id].mhz, mbpsx10_rate, pRateUpdateParams->nss, &rate); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Error, Invalid input rate value", __func__); cdf_mem_free(pRateUpdateParams); return ret; @@ -1455,17 +1455,17 @@ CDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, WMA_LOGE("%s: Failed to Set WMI_VDEV_PARAM_SGI (%d), ret = %d", __func__, short_gi, ret); cdf_mem_free(pRateUpdateParams); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, paramId, rate); cdf_mem_free(pRateUpdateParams); if (ret) { WMA_LOGE("%s: Failed to Set rate, ret = %d", __func__, ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1618,7 +1618,7 @@ wma_mgmt_tx_dload_comp_hldr(void *wma_context, cdf_nbuf_t netbuf, * * Return: CDF status */ -CDF_STATUS wma_tx_attach(tp_wma_handle wma_handle) +QDF_STATUS wma_tx_attach(tp_wma_handle wma_handle) { /* Get the Vos Context */ p_cds_contextType cds_handle = @@ -1642,7 +1642,7 @@ CDF_STATUS wma_tx_attach(tp_wma_handle wma_handle) /* Store the Mac Context */ wma_handle->mac_context = cds_handle->pMACContext; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1653,7 +1653,7 @@ CDF_STATUS wma_tx_attach(tp_wma_handle wma_handle) * * Return: CDF status */ -CDF_STATUS wma_tx_detach(tp_wma_handle wma_handle) +QDF_STATUS wma_tx_detach(tp_wma_handle wma_handle) { uint32_t frame_index = 0; @@ -1688,7 +1688,7 @@ CDF_STATUS wma_tx_detach(tp_wma_handle wma_handle) /* Reset last Tx Data Frame nbuf ptr */ wma_handle->last_umac_data_nbuf = NULL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) || defined(QCA_LL_TX_FLOW_CONTROL_V2) @@ -1799,9 +1799,9 @@ int wma_mcc_vdev_tx_pause_evt_handler(void *handle, uint8_t *event, * sends down the initial temperature thresholds to the firmware * and configures the throttle period in the tx rx module * - * Returns: CDF_STATUS_SUCCESS for success otherwise failure + * Returns: QDF_STATUS_SUCCESS for success otherwise failure */ -CDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, +QDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, t_thermal_mgmt *pThermalParams) { t_thermal_cmd_params thermal_params; @@ -1809,13 +1809,13 @@ CDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, if (NULL == wma || NULL == pThermalParams) { WMA_LOGE("TM Invalid input"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } curr_pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (NULL == curr_pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("TM enable %d period %d", pThermalParams->thermalMgmtEnabled, @@ -1871,12 +1871,12 @@ CDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, thermal_params.minTemp, thermal_params.maxTemp, thermal_params.thermalEnable); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wma_set_thermal_mgmt(wma, thermal_params)) { WMA_LOGE("Could not send thermal mgmt command to the firmware!"); } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1889,7 +1889,7 @@ CDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, */ static void wma_set_thermal_level_ind(u_int8_t level) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = {0}; WMA_LOGI(FL("Thermal level: %d"), level); @@ -1898,8 +1898,8 @@ static void wma_set_thermal_level_ind(u_int8_t level) sme_msg.bodyptr = NULL; sme_msg.bodyval = level; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) WMA_LOGE(FL( "Fail to post set thermal level ind msg")); } @@ -1913,22 +1913,22 @@ static void wma_set_thermal_level_ind(u_int8_t level) * txrx module and sends down the corresponding temperature * thresholds to the firmware * - * Returns: CDF_STATUS_SUCCESS for success otherwise failure + * Returns: QDF_STATUS_SUCCESS for success otherwise failure */ -CDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, +QDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, uint8_t thermal_level) { ol_txrx_pdev_handle curr_pdev; if (NULL == wma) { WMA_LOGE("TM Invalid input"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } curr_pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (NULL == curr_pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGE("TM set level %d", thermal_level); @@ -1936,18 +1936,18 @@ CDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, /* Check if thermal mitigation is enabled */ if (!wma->thermal_mgmt_info.thermalMgmtEnabled) { WMA_LOGE("Thermal mgmt is not enabled, ignoring set level command"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (thermal_level >= WLAN_WMA_MAX_THERMAL_LEVELS) { WMA_LOGE("Invalid thermal level set %d", thermal_level); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (thermal_level == wma->thermal_mgmt_info.thermalCurrLevel) { WMA_LOGD("Current level %d is same as the set level, ignoring", wma->thermal_mgmt_info.thermalCurrLevel); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } wma->thermal_mgmt_info.thermalCurrLevel = thermal_level; @@ -1957,7 +1957,7 @@ CDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, /* Send SME SET_THERMAL_LEVEL_IND message */ wma_set_thermal_level_ind(thermal_level); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -1969,9 +1969,9 @@ CDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, * This function sends the thermal management command * to the firmware * - * Return: CDF_STATUS_SUCCESS for success otherwise failure + * Return: QDF_STATUS_SUCCESS for success otherwise failure */ -CDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle, +QDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle, t_thermal_cmd_params thermal_info) { wmi_thermal_mgmt_cmd_fixed_param *cmd = NULL; @@ -1984,7 +1984,7 @@ CDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("Failed to allocate buffer to send set key cmd"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cmd = (wmi_thermal_mgmt_cmd_fixed_param *) wmi_buf_data(buf); @@ -2006,10 +2006,10 @@ CDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle, if (status) { cdf_nbuf_free(buf); WMA_LOGE("%s:Failed to send thermal mgmt command", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2126,7 +2126,7 @@ int wma_thermal_mgmt_evt_handler(void *handle, uint8_t *event, thermal_params.thermalEnable = wma->thermal_mgmt_info.thermalMgmtEnabled; - if (CDF_STATUS_SUCCESS != wma_set_thermal_mgmt(wma, thermal_params)) { + if (QDF_STATUS_SUCCESS != wma_set_thermal_mgmt(wma, thermal_params)) { WMA_LOGE("Could not send thermal mgmt command to the firmware!"); return -EINVAL; } @@ -2342,7 +2342,7 @@ void wmi_desc_put(tp_wma_handle wma_handle, struct wmi_desc_t *wmi_desc) } #define mgmt_tx_dl_frm_len 64 -static inline CDF_STATUS +static inline QDF_STATUS mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, uint16_t frmLen, uint8_t vdev_id, pWMATxRxCompFunc tx_complete_cb, @@ -2365,7 +2365,7 @@ mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, buf = wmi_buf_alloc(wma_handle->wmi_handle, cmd_len); if (!buf) { WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_mgmt_tx_send_cmd_fixed_param *)wmi_buf_data(buf); @@ -2407,12 +2407,12 @@ mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, WMA_LOGE("%s: Failed to send mgmt Tx", __func__); goto err1; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; err1: wmi_desc_put(wma_handle, wmi_desc); err2: wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -2435,7 +2435,7 @@ err2: * * Return: CDF status */ -CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, +QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, eFrameType frmType, eFrameTxDir txDir, uint8_t tid, pWMATxRxCompFunc tx_frm_download_comp_cb, void *pData, pWMAAckFnTxComp tx_frm_ota_comp_cb, uint8_t tx_flag, @@ -2443,7 +2443,6 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, { tp_wma_handle wma_handle = (tp_wma_handle) (wma_context); int32_t status; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int32_t is_high_latency; ol_txrx_vdev_handle txrx_vdev; @@ -2466,7 +2465,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, if (NULL == wma_handle) { WMA_LOGE("wma_handle is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } iface = &wma_handle->interfaces[vdev_id]; /* Get the vdev handle from vdev id */ @@ -2474,18 +2473,18 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, if (!txrx_vdev) { WMA_LOGE("TxRx Vdev Handle is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (frmType >= TXRX_FRM_MAX) { WMA_LOGE("Invalid Frame Type Fail to send Frame"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMac = cds_get_context(CDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("pMac Handle is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* * Currently only support to @@ -2494,7 +2493,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, if (!((frmType == TXRX_FRM_802_11_MGMT) || (frmType == TXRX_FRM_802_11_DATA))) { WMA_LOGE("No Support to send other frames except 802.11 Mgmt/Data"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mHdr = (tpSirMacMgmtHdr)cdf_nbuf_data(tx_frame); #ifdef WLAN_FEATURE_11W @@ -2511,15 +2510,15 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, /* Allocate extra bytes for privacy header and trailer */ newFrmLen = frmLen + IEEE80211_CCMP_HEADERLEN + IEEE80211_CCMP_MICLEN; - cdf_status = + qdf_status = cds_packet_alloc((uint16_t) newFrmLen, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGP("%s: Failed to allocate %d bytes for RMF status " "code (%x)", __func__, newFrmLen, - cdf_status); + qdf_status); /* Free the original packet memory */ cds_packet_free((void *)tx_frame); goto error; @@ -2544,14 +2543,14 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, } else { /* Allocate extra bytes for MMIE */ newFrmLen = frmLen + IEEE80211_MMIE_LEN; - cdf_status = cds_packet_alloc((uint16_t) newFrmLen, + qdf_status = cds_packet_alloc((uint16_t) newFrmLen, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGP("%s: Failed to allocate %d bytes for RMF status " "code (%x)", __func__, newFrmLen, - cdf_status); + qdf_status); /* Free the original packet memory */ cds_packet_free((void *)tx_frame); goto error; @@ -2608,7 +2607,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, if (pdev == NULL) { WMA_LOGE("%s: pdev pointer is not available", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* @@ -2631,7 +2630,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, } else { WMA_LOGE("%s: Already one Data pending for Ack, reject Tx of data frame", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } } else { @@ -2640,7 +2639,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, * so Ack Complete Cb is must */ WMA_LOGE("No Ack Complete Cb. Don't Allow"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Take out 802.11 header from skb */ @@ -2681,7 +2680,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, WMA_TX_FRAME_BUFFER_FREE); wma_handle->umac_data_ota_ack_cb = NULL; wma_handle->last_umac_data_nbuf = NULL; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Call Download Callback if passed */ @@ -2690,7 +2689,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, tx_frame, WMA_TX_FRAME_BUFFER_NO_FREE); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } is_high_latency = @@ -2740,12 +2739,12 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, wma_handle->tx_frm_download_comp_cb = tx_frm_download_comp_cb; /* Reset the Tx Frame Complete Event */ - cdf_status = + qdf_status = qdf_event_reset(&wma_handle->tx_frm_download_comp_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGP("%s: Event Reset failed tx comp event %x", - __func__, cdf_status); + __func__, qdf_status); goto error; } } @@ -2806,7 +2805,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, } if (!tx_frm_download_comp_cb) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; /* * Wait for Download Complete @@ -2845,11 +2844,11 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, WMA_TX_FRAME_BUFFER_NO_FREE); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wma_handle->tx_frm_download_comp_cb = NULL; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -2862,18 +2861,18 @@ error: * * Return: CDF status */ -CDF_STATUS wma_ds_peek_rx_packet_info(cds_pkt_t *pkt, void **pkt_meta, +QDF_STATUS wma_ds_peek_rx_packet_info(cds_pkt_t *pkt, void **pkt_meta, bool bSwap) { /* Sanity Check */ if (pkt == NULL) { WMA_LOGE("wma:Invalid parameter sent on wma_peek_rx_pkt_info"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } *pkt_meta = &(pkt->pkt_meta); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2944,7 +2943,7 @@ void ol_rx_err(ol_pdev_handle pdev, uint8_t vdev_id, cds_msg.type = eWNI_SME_MIC_FAILURE_IND; cds_msg.bodyptr = (void *) mic_err_ind; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { WMA_LOGE("%s: could not post mic failure indication to SME", __func__); @@ -2999,9 +2998,9 @@ void wma_tx_abort(uint8_t vdev_id) * the firmware to enable LRO, sets the TCP flags and sets the * seed values for the toeplitz hash generation * - * Return: CDF_STATUS_SUCCESS for success otherwise failure + * Return: QDF_STATUS_SUCCESS for success otherwise failure */ -CDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, struct wma_lro_config_cmd_t *wma_lro_cmd) { wmi_lro_info_cmd_fixed_param *cmd; @@ -3010,13 +3009,13 @@ CDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, if (NULL == wma_handle || NULL == wma_lro_cmd) { WMA_LOGE("wma_lro_config_cmd': invalid input!"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } buf = wmi_buf_alloc(wma_handle->wmi_handle, sizeof(*cmd)); if (!buf) { WMA_LOGE("Failed to allocate buffer to send set key cmd"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cmd = (wmi_lro_info_cmd_fixed_param *) wmi_buf_data(buf); @@ -3072,10 +3071,10 @@ CDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, if (status) { cdf_nbuf_free(buf); WMA_LOGE("%s:Failed to send WMI_LRO_CONFIG_CMDID", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -3145,7 +3144,7 @@ wma_indicate_err( cdf_mem_set(&cds_msg, sizeof(cds_msg_t), 0); cds_msg.type = eWNI_SME_MIC_FAILURE_IND; cds_msg.bodyptr = (void *) mic_err_ind; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { WMA_LOGE("%s: mic failure ind post to SME failed", diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 018eacc5fb..0c92e0cb97 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -482,7 +482,7 @@ void wma_vdev_detach_callback(void *ctx) struct wma_txrx_node *iface = (struct wma_txrx_node *)ctx; struct del_sta_self_params *param; struct wma_target_req *req_msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = { 0 }; wma = cds_get_context(CDF_MODULE_ID_WMA); @@ -516,13 +516,13 @@ void wma_vdev_detach_callback(void *ctx) cdf_mem_free(iface->staKeyParams); #endif /* WLAN_FEATURE_VOWIFI_11R */ cdf_mem_zero(iface, sizeof(*iface)); - param->status = CDF_STATUS_SUCCESS; + param->status = QDF_STATUS_SUCCESS; sme_msg.type = eWNI_SME_DEL_STA_SELF_RSP; sme_msg.bodyptr = param; sme_msg.bodyval = 0; status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP"); cdf_mem_free(param); } @@ -538,7 +538,7 @@ void wma_vdev_detach_callback(void *ctx) * Return: success if peer delete command sent to firmware, else failure. */ -static CDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle, +static QDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle, struct del_sta_self_params *del_sta_self_req_param, uint8_t generate_vdev_rsp) { @@ -555,7 +555,7 @@ static CDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle, pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } peer = ol_txrx_find_peer_by_addr(pdev, @@ -564,7 +564,7 @@ static CDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle, if (!peer) { WMA_LOGE("%s Failed to find peer %pM", __func__, del_sta_self_req_param->self_mac_addr); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } wma_remove_peer(wma_handle, del_sta_self_req_param->self_mac_addr, @@ -576,7 +576,7 @@ static CDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle, cdf_mem_malloc(sizeof(struct del_sta_self_rsp_params)); if (sta_self_wmi_rsp == NULL) { WMA_LOGP(FL("Failed to allocate memory")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } sta_self_wmi_rsp->self_sta_param = del_sta_self_req_param; sta_self_wmi_rsp->generate_rsp = generate_vdev_rsp; @@ -590,17 +590,17 @@ static CDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle, vdev_id); wma_remove_req(wma_handle, vdev_id, WMA_DEL_P2P_SELF_STA_RSP_START); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle, +static QDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle, struct del_sta_self_params *del_sta_self_req_param, uint8_t generate_rsp) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t vdev_id = del_sta_self_req_param->session_id; struct wma_txrx_node *iface = &wma_handle->interfaces[vdev_id]; struct wma_target_req *msg = NULL; @@ -608,7 +608,7 @@ static CDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle, if (wma_unified_vdev_delete_send(wma_handle->wmi_handle, vdev_id)) { WMA_LOGE("Unable to remove an interface"); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto out; } @@ -625,7 +625,7 @@ static CDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle, if (!msg) { WMA_LOGE("%s: Failed to fill vdev request for vdev_id %d", __func__, vdev_id); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto out; } @@ -665,7 +665,7 @@ out: sme_msg.bodyval = 0; status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_DEL_STA_SELF_RSP"); cdf_mem_free(del_sta_self_req_param); } @@ -680,11 +680,11 @@ out: * * Return: CDF status */ -CDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle, +QDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle, struct del_sta_self_params *pdel_sta_self_req_param, uint8_t generateRsp) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t vdev_id = pdel_sta_self_req_param->session_id; struct wma_txrx_node *iface = &wma_handle->interfaces[vdev_id]; @@ -781,7 +781,7 @@ static void wma_vdev_start_rsp(tp_wma_handle wma, #endif /* QCA_IBSS_SUPPORT */ if (resp_event->status) { - add_bss->status = CDF_STATUS_E_FAILURE; + add_bss->status = QDF_STATUS_E_FAILURE; goto send_fail_resp; } @@ -797,7 +797,7 @@ static void wma_vdev_start_rsp(tp_wma_handle wma, if (!bcn) { WMA_LOGE("%s: Failed alloc memory for beacon struct", __func__); - add_bss->status = CDF_STATUS_E_NOMEM; + add_bss->status = QDF_STATUS_E_NOMEM; goto send_fail_resp; } cdf_mem_zero(bcn, sizeof(*bcn)); @@ -807,7 +807,7 @@ static void wma_vdev_start_rsp(tp_wma_handle wma, WMA_LOGE("%s: No memory allocated for beacon buffer", __func__); cdf_mem_free(bcn); - add_bss->status = CDF_STATUS_E_FAILURE; + add_bss->status = QDF_STATUS_E_FAILURE; goto send_fail_resp; } bcn->seq_no = MIN_SW_SEQ; @@ -821,7 +821,7 @@ static void wma_vdev_start_rsp(tp_wma_handle wma, WMA_LOGD("%s: Allocated beacon struct %p, template memory %p", __func__, bcn, bcn->buf); } - add_bss->status = CDF_STATUS_SUCCESS; + add_bss->status = QDF_STATUS_SUCCESS; add_bss->bssIdx = resp_event->vdev_id; add_bss->chainMask = resp_event->chain_mask; if ((2 != resp_event->cfgd_rx_streams) || @@ -932,7 +932,7 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, cdf_spin_unlock_bh(&wma->dfs_ic->chan_lock); } - if (resp_event->status == CDF_STATUS_SUCCESS) { + if (resp_event->status == QDF_STATUS_SUCCESS) { wma->interfaces[resp_event->vdev_id].tx_streams = resp_event->cfgd_tx_streams; wma->interfaces[resp_event->vdev_id].rx_streams = @@ -981,7 +981,7 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, cdf_mc_timer_stop(&req_msg->event_timeout); #ifdef FEATURE_AP_MCC_CH_AVOIDANCE - if (resp_event->status == CDF_STATUS_SUCCESS + if (resp_event->status == QDF_STATUS_SUCCESS && mac_ctx->sap.sap_channel_avoidance) wma_find_mcc_ap(wma, resp_event->vdev_id, true); #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ @@ -1286,7 +1286,7 @@ static int wmi_unified_peer_create_send(wmi_unified_t wmi, * * Return: CDF status */ -CDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, +QDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, ol_txrx_vdev_handle vdev, u8 peer_addr[IEEE80211_ADDR_LEN], uint32_t peer_type, uint8_t vdev_id, @@ -1310,7 +1310,7 @@ CDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, WMA_LOGE("%s: LFR3: Created peer with peer_addr %pM vdev_id %d," "peer_count - %d", __func__, peer_addr, vdev_id, wma->interfaces[vdev_id].peer_count); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (wmi_unified_peer_create_send(wma->wmi_handle, peer_addr, peer_type, vdev_id) < 0) { @@ -1338,10 +1338,10 @@ CDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, wma_set_stakey(wma, &key_info); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; err: wma->interfaces[vdev_id].peer_count--; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -1512,7 +1512,7 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, ol_txrx_vdev_handle vdev; struct add_sta_self_params add_sta_self_param; struct del_sta_self_params del_sta_param; - CDF_STATUS status; + QDF_STATUS status; if (!wma) { WMA_LOGE("%s: Null wma handle", __func__); @@ -1554,7 +1554,7 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, /* create ibss bss peer */ status = wma_create_peer(wma, vdev->pdev, vdev, vdev->mac_addr.raw, WMI_PEER_TYPE_DEFAULT, vdev_id, false); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) WMA_LOGE("%s: Failed to create IBSS bss peer", __func__); else WMA_LOGA("IBSS BSS peer created with mac %pM", @@ -1795,13 +1795,13 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, * BSS REQ was timed out to stop the VDEV in this case no need * to send response to UMAC */ - if (params->status == CDF_STATUS_FW_MSG_TIMEDOUT) { + if (params->status == QDF_STATUS_FW_MSG_TIMEDOUT) { cdf_mem_free(params); WMA_LOGE("%s: DEL BSS from ADD BSS timeout do not send " "resp to UMAC (vdev id %x)", __func__, resp_event->vdev_id); } else { - params->status = CDF_STATUS_SUCCESS; + params->status = QDF_STATUS_SUCCESS; wma_send_msg(wma, WMA_DELETE_BSS_RSP, (void *)params, 0); } @@ -1837,7 +1837,7 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, ol_txrx_vdev_handle txrx_vdev_handle = NULL; ol_txrx_pdev_handle txrx_pdev = cds_get_context(CDF_MODULE_ID_TXRX); enum wlan_op_mode txrx_vdev_type; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct sAniSirGlobal *mac = cds_get_context(CDF_MODULE_ID_PE); uint32_t cfg_val; uint16_t val16; @@ -1858,7 +1858,7 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, self_sta_req->self_mac_addr)) { WMA_LOGP("%s: Unable to add an interface for ath_dev", __func__); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; goto end; } @@ -1882,7 +1882,7 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, if (NULL == txrx_vdev_handle) { WMA_LOGP("%s: ol_txrx_vdev_attach failed", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; wma_unified_vdev_delete_send(wma_handle->wmi_handle, self_sta_req->session_id); goto end; @@ -1955,9 +1955,9 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, self_sta_req->self_mac_addr, WMI_PEER_TYPE_DEFAULT, self_sta_req->session_id, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to create peer", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; wma_unified_vdev_delete_send(wma_handle->wmi_handle, self_sta_req->session_id); } @@ -2037,7 +2037,7 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, WMA_LOGD("%s: setting ini value for WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED: %d", __func__, cfg_val); ret = wma_set_enable_disable_mcc_adaptive_scheduler(cfg_val); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to set WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED"); } } else { @@ -2061,7 +2061,7 @@ end: sme_msg.bodyval = 0; status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP"); cdf_mem_free(self_sta_req); } @@ -2077,7 +2077,7 @@ end: * * Return: CDF status */ -CDF_STATUS wma_vdev_start(tp_wma_handle wma, +QDF_STATUS wma_vdev_start(tp_wma_handle wma, struct wma_vdev_start_req *req, bool isRestart) { wmi_vdev_start_request_cmd_fixed_param *cmd; @@ -2093,7 +2093,7 @@ CDF_STATUS wma_vdev_start(tp_wma_handle wma, mac_ctx = cds_get_context(CDF_MODULE_ID_PE); if (mac_ctx == NULL) { WMA_LOGE("%s: vdev start failed as mac_ctx is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } dfs = (struct ath_dfs *)wma->dfs_ic->ic_dfs; @@ -2104,7 +2104,7 @@ CDF_STATUS wma_vdev_start(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); cmd = (wmi_vdev_start_request_cmd_fixed_param *) buf_ptr; @@ -2212,7 +2212,7 @@ CDF_STATUS wma_vdev_start(tp_wma_handle wma, __func__, __LINE__); cdf_nbuf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_spin_lock_bh(&wma->dfs_ic->chan_lock); @@ -2327,10 +2327,10 @@ CDF_STATUS wma_vdev_start(tp_wma_handle wma, if (ret < 0) { WMA_LOGP("%s: Failed to send vdev start command", __func__); cdf_nbuf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2389,7 +2389,7 @@ int wma_peer_assoc_conf_handler(void *handle, uint8_t *cmd_param_info, } /* peer assoc conf event means the cmd succeeds */ - params->status = CDF_STATUS_SUCCESS; + params->status = QDF_STATUS_SUCCESS; WMA_LOGE(FL("Send ADD_STA_RSP: statype %d vdev_id %d aid %d bssid %pM staIdx %d status %d"), params->staType, params->smesessionId, params->assocId, params->bssId, params->staIdx, @@ -2405,7 +2405,7 @@ int wma_peer_assoc_conf_handler(void *handle, uint8_t *cmd_param_info, } /* peer assoc conf event means the cmd succeeds */ - params->status = CDF_STATUS_SUCCESS; + params->status = QDF_STATUS_SUCCESS; WMA_LOGE(FL("Send ADD BSS RSP: opermode %d update_bss %d nw_type %d bssid %pM" " staIdx %d status %d"), params->operMode, params->updateBss, params->nwType, params->bssId, @@ -2525,7 +2525,7 @@ int wma_peer_delete_handler(void *handle, uint8_t *cmd_param_info, if (del_sta->respReqd) { WMA_LOGD(FL("Sending peer del rsp to umac")); wma_send_msg(wma, WMA_DELETE_STA_RSP, - (void *)del_sta, CDF_STATUS_SUCCESS); + (void *)del_sta, QDF_STATUS_SUCCESS); } } else if (req_msg->type == WMA_DEL_P2P_SELF_STA_RSP_START) { struct del_sta_self_rsp_params *data; @@ -2570,7 +2570,7 @@ void wma_hold_req_timer(void *data) if (tgt_req->msg_type == WMA_ADD_STA_REQ) { tpAddStaParams params = (tpAddStaParams) tgt_req->user_data; - params->status = CDF_STATUS_E_TIMEOUT; + params->status = QDF_STATUS_E_TIMEOUT; WMA_LOGA(FL("WMA_ADD_STA_REQ timed out")); WMA_LOGD(FL("Sending add sta rsp to umac (mac:%pM, status:%d)"), params->staMac, params->status); @@ -2579,7 +2579,7 @@ void wma_hold_req_timer(void *data) (tgt_req->type == WMA_DELETE_STA_RSP_START)) { tpDeleteStaParams params = (tpDeleteStaParams) tgt_req->user_data; - params->status = CDF_STATUS_E_TIMEOUT; + params->status = QDF_STATUS_E_TIMEOUT; WMA_LOGE(FL("WMA_DEL_STA_REQ timed out")); WMA_LOGP(FL("Sending del sta rsp to umac (mac:%pM, status:%d)"), params->staMac, params->status); @@ -2685,7 +2685,7 @@ void wma_vdev_resp_timer(void *data) ol_txrx_pdev_handle pdev; uint8_t peer_id; struct wma_target_req *msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = { 0 }; #ifdef FEATURE_AP_MCC_CH_AVOIDANCE tpAniSirGlobal mac_ctx = cds_get_context(CDF_MODULE_ID_PE); @@ -2723,7 +2723,7 @@ void wma_vdev_resp_timer(void *data) if (tgt_req->msg_type == WMA_CHNL_SWITCH_REQ) { tpSwitchChannelParams params = (tpSwitchChannelParams) tgt_req->user_data; - params->status = CDF_STATUS_E_TIMEOUT; + params->status = QDF_STATUS_E_TIMEOUT; WMA_LOGA("%s: WMA_SWITCH_CHANNEL_REQ timedout", __func__); wma_send_msg(wma, WMA_SWITCH_CHANNEL_RSP, (void *)params, 0); } else if (tgt_req->msg_type == WMA_DELETE_BSS_REQ) { @@ -2799,7 +2799,7 @@ void wma_vdev_resp_timer(void *data) wma_recreate_ibss_vdev_and_bss_peer(wma, tgt_req->vdev_id); - params->status = CDF_STATUS_E_TIMEOUT; + params->status = QDF_STATUS_E_TIMEOUT; WMA_LOGA("%s: WMA_DELETE_BSS_REQ timedout", __func__); wma_send_msg(wma, WMA_DELETE_BSS_RSP, (void *)params, 0); if (iface->del_staself_req) { @@ -2820,7 +2820,7 @@ void wma_vdev_resp_timer(void *data) cdf_runtime_pm_allow_suspend( wma->wmi_cmd_rsp_runtime_lock); } - params->status = CDF_STATUS_E_TIMEOUT; + params->status = QDF_STATUS_E_TIMEOUT; WMA_LOGA("%s: WMA_DEL_STA_SELF_REQ timedout", __func__); sme_msg.type = eWNI_SME_DEL_STA_SELF_RSP; @@ -2828,7 +2828,7 @@ void wma_vdev_resp_timer(void *data) sme_msg.bodyval = 0; status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP"); cdf_mem_free(iface->del_staself_req); } @@ -2851,7 +2851,7 @@ void wma_vdev_resp_timer(void *data) } del_bss_params->status = params->status = - CDF_STATUS_FW_MSG_TIMEDOUT; + QDF_STATUS_FW_MSG_TIMEDOUT; del_bss_params->sessionId = params->sessionId; del_bss_params->bssIdx = params->bssIdx; cdf_mem_copy(del_bss_params->bssid, params->bssId, @@ -2901,7 +2901,7 @@ error0: WMA_LOGE(FL("Failed to send OCB set config cmd")); iface = &wma->interfaces[tgt_req->vdev_id]; iface->vdev_up = false; - wma_ocb_set_config_resp(wma, CDF_STATUS_E_TIMEOUT); + wma_ocb_set_config_resp(wma, QDF_STATUS_E_TIMEOUT); } free_tgt_req: cdf_mc_timer_destroy(&tgt_req->event_timeout); @@ -3061,7 +3061,7 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) ol_txrx_peer_handle peer; struct wma_target_req *msg; uint8_t vdev_id, peer_id; - CDF_STATUS status; + QDF_STATUS status; int8_t maxTxPower; #ifdef WLAN_FEATURE_11W int ret = 0; @@ -3086,7 +3086,7 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) wma_set_bss_rate_flags(&wma->interfaces[vdev_id], add_bss); status = wma_create_peer(wma, pdev, vdev, add_bss->bssId, WMI_PEER_TYPE_DEFAULT, vdev_id, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to create peer", __func__); goto send_fail_resp; } @@ -3149,7 +3149,7 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) cdf_mem_copy(req.ssid.ssId, add_bss->ssId.ssId, add_bss->ssId.length); status = wma_get_current_hw_mode(&hw_mode); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) WMA_LOGE("wma_get_current_hw_mode failed"); if ((add_bss->nss == 2) && !hw_mode.dbs_cap) { @@ -3161,7 +3161,7 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) } status = wma_vdev_start(wma, &req, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { wma_remove_vdev_req(wma, vdev_id, WMA_TARGET_REQ_TYPE_VDEV_START); goto peer_cleanup; @@ -3177,7 +3177,7 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) peer_cleanup: wma_remove_peer(wma, add_bss->bssId, vdev_id, peer, false); send_fail_resp: - add_bss->status = CDF_STATUS_E_FAILURE; + add_bss->status = QDF_STATUS_E_FAILURE; wma_send_msg(wma, WMA_ADD_BSS_RSP, (void *)add_bss, 0); } @@ -3197,7 +3197,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) ol_txrx_peer_handle peer = NULL; struct wma_target_req *msg; uint8_t vdev_id, peer_id; - CDF_STATUS status; + QDF_STATUS status; struct add_sta_self_params add_sta_self_param; struct del_sta_self_params del_sta_param; tSetBssKeyParams key_info; @@ -3266,7 +3266,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) status = wma_create_peer(wma, pdev, vdev, add_bss->selfMacAddr, WMI_PEER_TYPE_DEFAULT, vdev_id, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to create peer", __func__); goto send_fail_resp; } @@ -3312,7 +3312,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) if (WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_IBSS_PWRSAVE)) { status = wma_set_ibss_pwrsave_params(wma, vdev_id); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to Set IBSS Power Save Params to firmware", __func__); goto peer_cleanup; @@ -3341,7 +3341,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) cdf_mem_copy(req.ssid.ssId, add_bss->ssId.ssId, add_bss->ssId.length); status = wma_get_current_hw_mode(&hw_mode); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) WMA_LOGE("wma_get_current_hw_mode failed"); if ((add_bss->nss == 2) && !hw_mode.dbs_cap) { @@ -3357,7 +3357,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) WMA_LOGD("%s: ssid = %s", __func__, req.ssid.ssId); status = wma_vdev_start(wma, &req, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { wma_remove_vdev_req(wma, vdev_id, WMA_TARGET_REQ_TYPE_VDEV_START); goto peer_cleanup; @@ -3378,7 +3378,7 @@ peer_cleanup: wma_remove_peer(wma, add_bss->bssId, vdev_id, peer, false); } send_fail_resp: - add_bss->status = CDF_STATUS_E_FAILURE; + add_bss->status = QDF_STATUS_E_FAILURE; wma_send_msg(wma, WMA_ADD_BSS_RSP, (void *)add_bss, 0); } #endif /* QCA_IBSS_SUPPORT */ @@ -3397,7 +3397,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) struct wma_target_req *msg; uint8_t vdev_id, peer_id; ol_txrx_peer_handle peer; - CDF_STATUS status; + QDF_STATUS status; struct wma_txrx_node *iface; int ret = 0; int pps_val = 0; @@ -3523,7 +3523,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) cdf_mem_copy(req.ssid.ssId, add_bss->ssId.ssId, add_bss->ssId.length); status = wma_get_current_hw_mode(&hw_mode); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) WMA_LOGE("wma_get_current_hw_mode failed"); if ((add_bss->nss == 2) && !hw_mode.dbs_cap) { @@ -3535,7 +3535,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) } status = wma_vdev_start(wma, &req, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { wma_remove_vdev_req(wma, vdev_id, WMA_TARGET_REQ_TYPE_VDEV_START); goto peer_cleanup; @@ -3643,7 +3643,7 @@ send_bss_resp: ol_txrx_find_peer_by_addr(pdev, add_bss->bssId, &add_bss->staContext.staIdx); add_bss->status = (add_bss->staContext.staIdx < 0) ? - CDF_STATUS_E_FAILURE : CDF_STATUS_SUCCESS; + QDF_STATUS_E_FAILURE : QDF_STATUS_SUCCESS; add_bss->bssIdx = add_bss->staContext.smesessionId; cdf_mem_copy(add_bss->staContext.staMac, add_bss->bssId, sizeof(add_bss->staContext.staMac)); @@ -3681,7 +3681,7 @@ peer_cleanup: wma_remove_peer(wma, add_bss->bssId, vdev_id, peer, roam_synch_in_progress); send_fail_resp: - add_bss->status = CDF_STATUS_E_FAILURE; + add_bss->status = QDF_STATUS_E_FAILURE; wma_send_msg(wma, WMA_ADD_BSS_RSP, (void *)add_bss, 0); } @@ -3778,7 +3778,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) ol_txrx_vdev_handle vdev; ol_txrx_peer_handle peer; uint8_t peer_id; - CDF_STATUS status; + QDF_STATUS status; int32_t ret; struct wma_txrx_node *iface = NULL; struct wma_target_req *msg; @@ -3788,7 +3788,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) if (NULL == pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; goto send_rsp; } /* UMAC sends WMA_ADD_STA_REQ msg twice to WMA when the station @@ -3800,14 +3800,14 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) * will get blocked. */ if (add_sta->staType != STA_ENTRY_PEER) { - add_sta->status = CDF_STATUS_SUCCESS; + add_sta->status = QDF_STATUS_SUCCESS; goto send_rsp; } vdev = wma_find_vdev_by_id(wma, add_sta->smesessionId); if (!vdev) { WMA_LOGE("%s: Failed to find vdev", __func__); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; goto send_rsp; } @@ -3825,7 +3825,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) status = wma_create_peer(wma, pdev, vdev, add_sta->staMac, WMI_PEER_TYPE_DEFAULT, add_sta->smesessionId, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to create peer for %pM", __func__, add_sta->staMac); add_sta->status = status; @@ -3838,7 +3838,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) if (!peer) { WMA_LOGE("%s: Failed to find peer handle using peer mac %pM", __func__, add_sta->staMac); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, add_sta->staMac, add_sta->smesessionId, peer, false); goto send_rsp; @@ -3855,7 +3855,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) if (!msg) { WMA_LOGP(FL("Failed to alloc request for vdev_id %d"), add_sta->smesessionId); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_req(wma, add_sta->smesessionId, WMA_PEER_ASSOC_CNF_START); wma_remove_peer(wma, add_sta->staMac, @@ -3869,7 +3869,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) ret = wmi_unified_send_peer_assoc(wma, add_sta->nwType, add_sta); if (ret) { - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, add_sta->staMac, add_sta->smesessionId, peer, false); goto send_rsp; @@ -3933,7 +3933,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) if (ret) { WMA_LOGE("Failed to set peer uapsd param for %pM", add_sta->staMac); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, add_sta->staMac, add_sta->smesessionId, peer, false); goto send_rsp; @@ -3946,7 +3946,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) add_sta->staIdx = ol_txrx_local_peer_id(peer); add_sta->nss = iface->nss; - add_sta->status = CDF_STATUS_SUCCESS; + add_sta->status = QDF_STATUS_SUCCESS; send_rsp: /* Do not send add stat resp when peer assoc cnf is enabled */ if (peer_assoc_cnf) { @@ -3975,7 +3975,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) ol_txrx_vdev_handle vdev; ol_txrx_peer_handle peer; uint8_t peer_id; - CDF_STATUS status; + QDF_STATUS status; int32_t ret; tTdlsPeerStateParams *peerStateParams; struct wma_target_req *msg; @@ -3990,14 +3990,14 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) if (NULL == pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; goto send_rsp; } vdev = wma_find_vdev_by_id(wma, add_sta->smesessionId); if (!vdev) { WMA_LOGE("%s: Failed to find vdev", __func__); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; goto send_rsp; } @@ -4009,7 +4009,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) status = wma_create_peer(wma, pdev, vdev, add_sta->staMac, WMI_PEER_TYPE_TDLS, add_sta->smesessionId, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to create peer for %pM", __func__, add_sta->staMac); add_sta->status = status; @@ -4020,7 +4020,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) if (!peer) { WMA_LOGE("%s: addSta, failed to find peer handle for mac %pM", __func__, add_sta->staMac); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, add_sta->staMac, add_sta->smesessionId, peer, false); goto send_rsp; @@ -4036,7 +4036,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) WMA_LOGE ("%s: Failed to allocate memory for peerStateParams for %pM", __func__, add_sta->staMac); - add_sta->status = CDF_STATUS_E_NOMEM; + add_sta->status = QDF_STATUS_E_NOMEM; goto send_rsp; } @@ -4053,7 +4053,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) if (!peer) { WMA_LOGE("%s: changeSta,failed to find peer handle for mac %pM", __func__, add_sta->staMac); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, add_sta->staMac, add_sta->smesessionId, peer, false); goto send_rsp; @@ -4069,7 +4069,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) if (!msg) { WMA_LOGP(FL("Failed to alloc request for vdev_id %d"), add_sta->smesessionId); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_req(wma, add_sta->smesessionId, WMA_PEER_ASSOC_CNF_START); wma_remove_peer(wma, add_sta->staMac, @@ -4087,7 +4087,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) ret = wmi_unified_send_peer_assoc(wma, add_sta->nwType, add_sta); if (ret) { - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, add_sta->staMac, add_sta->smesessionId, peer, false); goto send_rsp; @@ -4117,7 +4117,7 @@ send_rsp: static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) { ol_txrx_pdev_handle pdev; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; ol_txrx_peer_handle peer; struct wma_txrx_node *iface; int8_t maxTxPower; @@ -4157,7 +4157,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) if (wma->interfaces[params->smesessionId].vdev_up == true) { WMA_LOGE("%s: vdev id %d is already UP for %pM", __func__, params->smesessionId, params->bssId); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto out; } if (peer != NULL && peer->state == ol_txrx_peer_state_disc) { @@ -4208,7 +4208,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) if (!msg) { WMA_LOGP(FL("Failed to alloc request for vdev_id %d"), params->smesessionId); - params->status = CDF_STATUS_E_FAILURE; + params->status = QDF_STATUS_E_FAILURE; wma_remove_req(wma, params->smesessionId, WMA_PEER_ASSOC_CNF_START); wma_remove_peer(wma, params->staMac, @@ -4224,7 +4224,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) iface->nwType, (tAddStaParams *) iface->addBssStaContext); if (ret) { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, params->bssId, params->smesessionId, peer, false); goto out; @@ -4289,7 +4289,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) params->assocId, params->bssId) < 0) { WMA_LOGP("%s: Failed to send vdev up cmd: vdev %d bssid %pM", __func__, params->smesessionId, params->bssId); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { wma->interfaces[params->smesessionId].vdev_up = true; } @@ -4351,7 +4351,7 @@ static void wma_delete_sta_req_ap_mode(tp_wma_handle wma, if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); - del_sta->status = CDF_STATUS_E_FAILURE; + del_sta->status = QDF_STATUS_E_FAILURE; goto send_del_rsp; } @@ -4359,13 +4359,13 @@ static void wma_delete_sta_req_ap_mode(tp_wma_handle wma, if (!peer) { WMA_LOGE("%s: Failed to get peer handle using peer id %d", __func__, del_sta->staIdx); - del_sta->status = CDF_STATUS_E_FAILURE; + del_sta->status = QDF_STATUS_E_FAILURE; goto send_del_rsp; } wma_remove_peer(wma, peer->mac_addr.raw, del_sta->smesessionId, peer, false); - del_sta->status = CDF_STATUS_SUCCESS; + del_sta->status = QDF_STATUS_SUCCESS; if (WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_SYNC_DELETE_CMDS)) { @@ -4378,7 +4378,7 @@ static void wma_delete_sta_req_ap_mode(tp_wma_handle wma, del_sta->smesessionId); wma_remove_req(wma, del_sta->smesessionId, WMA_DELETE_STA_RSP_START); - del_sta->status = CDF_STATUS_E_NOMEM; + del_sta->status = QDF_STATUS_E_NOMEM; goto send_del_rsp; } /* @@ -4419,14 +4419,14 @@ static void wma_del_tdls_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) if (NULL == pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); - del_sta->status = CDF_STATUS_E_FAILURE; + del_sta->status = QDF_STATUS_E_FAILURE; goto send_del_rsp; } vdev = wma_find_vdev_by_id(wma, del_sta->smesessionId); if (!vdev) { WMA_LOGE("%s: Failed to find vdev", __func__); - del_sta->status = CDF_STATUS_E_FAILURE; + del_sta->status = QDF_STATUS_E_FAILURE; goto send_del_rsp; } @@ -4434,7 +4434,7 @@ static void wma_del_tdls_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) if (!peer) { WMA_LOGE("%s: Failed to get peer handle using peer id %d", __func__, del_sta->staIdx); - del_sta->status = CDF_STATUS_E_FAILURE; + del_sta->status = QDF_STATUS_E_FAILURE; goto send_del_rsp; } @@ -4442,7 +4442,7 @@ static void wma_del_tdls_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) if (!peerStateParams) { WMA_LOGE("%s: Failed to allocate memory for peerStateParams for: %pM", __func__, del_sta->staMac); - del_sta->status = CDF_STATUS_E_NOMEM; + del_sta->status = QDF_STATUS_E_NOMEM; goto send_del_rsp; } @@ -4459,7 +4459,7 @@ static void wma_del_tdls_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) wma_update_tdls_peer_state(wma, peerStateParams); - del_sta->status = CDF_STATUS_SUCCESS; + del_sta->status = QDF_STATUS_SUCCESS; send_del_rsp: if (del_sta->respReqd) { @@ -4480,7 +4480,7 @@ send_del_rsp: static void wma_delete_sta_req_sta_mode(tp_wma_handle wma, tpDeleteStaParams params) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct wma_txrx_node *iface; iface = &wma->interfaces[params->smesessionId]; iface->uapsd_cached_val = 0; @@ -4635,7 +4635,7 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) ol_txrx_pdev_handle pdev; ol_txrx_peer_handle peer = NULL; struct wma_target_req *msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t peer_id; uint8_t max_wait_iterations = 0; ol_txrx_vdev_handle txrx_vdev = NULL; @@ -4658,7 +4658,7 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) if (!peer) { WMA_LOGP("%s: Failed to find peer %pM", __func__, params->bssid); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto out; } @@ -4668,7 +4668,7 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) txrx_vdev = wma_find_vdev_by_id(wma, params->smesessionId); if (!txrx_vdev) { WMA_LOGE("%s:Invalid vdev handle", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto out; } @@ -4699,7 +4699,7 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) if (!msg) { WMA_LOGP("%s: Failed to fill vdev request for vdev_id %d", __func__, params->smesessionId); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto detach_peer; } @@ -4733,7 +4733,7 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) WMA_LOGP("%s: %d Failed to send vdev stop", __func__, __LINE__); wma_remove_vdev_req(wma, params->smesessionId, WMA_TARGET_REQ_TYPE_VDEV_STOP); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto detach_peer; } WMA_LOGD("%s: bssid %pM vdev_id %d", diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index f767b9e26c..dee39dd17a 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -112,7 +112,7 @@ static const uint8_t discvr_mask[] = {0xf0, 0x00, 0x00, 0xf8}; static int wma_post_auto_shutdown_msg(void) { tSirAutoShutdownEvtParams *auto_sh_evt; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; cds_msg_t sme_msg = { 0 }; auto_sh_evt = (tSirAutoShutdownEvtParams *) @@ -128,8 +128,8 @@ static int wma_post_auto_shutdown_msg(void) sme_msg.bodyptr = auto_sh_evt; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_AUTO_SHUTDOWN_IND msg to SME"); cdf_mem_free(auto_sh_evt); return -EINVAL; @@ -145,7 +145,7 @@ static int wma_post_auto_shutdown_msg(void) * * Return: CDF status */ -CDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, +QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, void *pGetRssiReq) { wmi_buf_t buf; @@ -155,7 +155,7 @@ CDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, /* command is in progess */ if (NULL != wma_handle->pGetRssiReq) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; /* create a copy of csrRssiCallback to send rssi value * after wmi event @@ -165,7 +165,7 @@ CDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, if (!pRssiBkUp) { WMA_LOGE("Failed to allocate memory for tAniGetRssiReq"); wma_handle->pGetRssiReq = NULL; - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(pRssiBkUp, sizeof(tAniGetRssiReq), 0); pRssiBkUp->sessionId = @@ -182,7 +182,7 @@ CDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, WMA_LOGE("%s: wmi_buf_alloc failed", __func__); cdf_mem_free(pRssiBkUp); wma_handle->pGetRssiReq = NULL; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cmd = (wmi_request_stats_cmd_fixed_param *) wmi_buf_data(buf); @@ -197,9 +197,9 @@ CDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, wmi_buf_free(buf); cdf_mem_free(pRssiBkUp); wma_handle->pGetRssiReq = NULL; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -208,7 +208,7 @@ CDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) +QDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) { wmi_buf_t buf; wmi_request_stats_cmd_fixed_param *cmd; @@ -221,20 +221,20 @@ CDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) if (NULL == wma_handle) { WMA_LOGE("%s : Failed to get wma_handle", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } intr = &wma_handle->interfaces[psnr_req->sessionId]; /* command is in progess */ if (NULL != intr->psnr_req) { WMA_LOGE("%s : previous snr request is pending", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } psnr_req_bkp = cdf_mem_malloc(sizeof(tAniGetSnrReq)); if (!psnr_req_bkp) { WMA_LOGE("Failed to allocate memory for tAniGetSnrReq"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(psnr_req_bkp, sizeof(tAniGetSnrReq), 0); @@ -245,7 +245,7 @@ CDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) if (!buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); cdf_mem_free(psnr_req_bkp); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cmd = (wmi_request_stats_cmd_fixed_param *) wmi_buf_data(buf); @@ -263,10 +263,10 @@ CDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) wmi_buf_free(buf); cdf_mem_free(psnr_req_bkp); intr->psnr_req = NULL; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -329,10 +329,10 @@ end: * * Return: CDF status */ -CDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, +QDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req, bool by_user) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int status = 0; tSirLPHBEnableStruct *ts_lphb_enable; wmi_buf_t buf = NULL; @@ -343,7 +343,7 @@ CDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ts_lphb_enable = &(lphb_conf_req->params.lphbEnableReq); @@ -355,13 +355,13 @@ CDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, if ((ts_lphb_enable->item != 1) && (ts_lphb_enable->item != 2)) { WMA_LOGE("%s : LPHB configuration wrong item %d", __func__, ts_lphb_enable->item); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -382,7 +382,7 @@ CDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_HB_SET_ENABLE returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } @@ -409,9 +409,9 @@ CDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: - return cdf_status; + return qdf_status; } /** @@ -421,10 +421,10 @@ error: * * Return: CDF status */ -CDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle, +QDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int status = 0; tSirLPHBTcpParamStruct *ts_lphb_tcp_param; wmi_buf_t buf = NULL; @@ -434,7 +434,7 @@ CDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle, if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ts_lphb_tcp_param = &(lphb_conf_req->params.lphbTcpParamReq); @@ -451,7 +451,7 @@ CDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -479,13 +479,13 @@ CDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_HB_SET_TCP_PARAMS returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: - return cdf_status; + return qdf_status; } /** @@ -495,10 +495,10 @@ error: * * Return: CDF status */ -CDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle, +QDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int status = 0; tSirLPHBTcpFilterStruct *ts_lphb_tcp_filter; wmi_buf_t buf = NULL; @@ -508,7 +508,7 @@ CDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle, if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ts_lphb_tcp_filter = &(lphb_conf_req->params.lphbTcpFilterReq); @@ -523,7 +523,7 @@ CDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -548,13 +548,13 @@ CDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_HB_SET_TCP_PKT_FILTER returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: - return cdf_status; + return qdf_status; } /** @@ -564,10 +564,10 @@ error: * * Return: CDF status */ -CDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle, +QDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int status = 0; tSirLPHBUdpParamStruct *ts_lphb_udp_param; wmi_buf_t buf = NULL; @@ -577,7 +577,7 @@ CDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle, if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ts_lphb_udp_param = &(lphb_conf_req->params.lphbUdpParamReq); @@ -593,7 +593,7 @@ CDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -620,13 +620,13 @@ CDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_HB_SET_UDP_PARAMS returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: - return cdf_status; + return qdf_status; } /** @@ -636,10 +636,10 @@ error: * * Return: CDF status */ -CDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle, +QDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int status = 0; tSirLPHBUdpFilterStruct *ts_lphb_udp_filter; wmi_buf_t buf = NULL; @@ -649,7 +649,7 @@ CDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle, if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ts_lphb_udp_filter = &(lphb_conf_req->params.lphbUdpFilterReq); @@ -664,7 +664,7 @@ CDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -689,13 +689,13 @@ CDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_HB_SET_UDP_PKT_FILTER returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: - return cdf_status; + return qdf_status; } /** @@ -705,41 +705,41 @@ error: * * Return: CDF status */ -CDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGI("%s : LPHB configuration cmd id is %d", __func__, lphb_conf_req->cmd); switch (lphb_conf_req->cmd) { case LPHB_SET_EN_PARAMS_INDID: - cdf_status = wma_lphb_conf_hbenable(wma_handle, + qdf_status = wma_lphb_conf_hbenable(wma_handle, lphb_conf_req, true); break; case LPHB_SET_TCP_PARAMS_INDID: - cdf_status = wma_lphb_conf_tcp_params(wma_handle, + qdf_status = wma_lphb_conf_tcp_params(wma_handle, lphb_conf_req); break; case LPHB_SET_TCP_PKT_FILTER_INDID: - cdf_status = wma_lphb_conf_tcp_pkt_filter(wma_handle, + qdf_status = wma_lphb_conf_tcp_pkt_filter(wma_handle, lphb_conf_req); break; case LPHB_SET_UDP_PARAMS_INDID: - cdf_status = wma_lphb_conf_udp_params(wma_handle, + qdf_status = wma_lphb_conf_udp_params(wma_handle, lphb_conf_req); break; case LPHB_SET_UDP_PKT_FILTER_INDID: - cdf_status = wma_lphb_conf_udp_pkt_filter(wma_handle, + qdf_status = wma_lphb_conf_udp_pkt_filter(wma_handle, lphb_conf_req); break; @@ -749,7 +749,7 @@ CDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, } cdf_mem_free(lphb_conf_req); - return cdf_status; + return qdf_status; } #endif /* FEATURE_WLAN_LPHB */ @@ -760,7 +760,7 @@ CDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, * * Return: CDF Status */ -CDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, +QDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, tAniDHCPInd *ta_dhcp_ind) { uint8_t vdev_id; @@ -772,7 +772,7 @@ CDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, if (!ta_dhcp_ind) { WMA_LOGE("%s : DHCP indication is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!wma_find_vdev_by_addr(wma_handle, @@ -780,7 +780,7 @@ CDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, &vdev_id)) { WMA_LOGE("%s: Failed to find vdev id for DHCP indication", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGI("%s: WMA --> WMI_PEER_SET_PARAM triggered by DHCP, " @@ -795,7 +795,7 @@ CDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -820,10 +820,10 @@ CDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("%s: wmi_unified_cmd_send WMI_PEER_SET_PARAM_CMD" " returned Error %d", __func__, status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -924,7 +924,7 @@ WLAN_PHY_MODE wma_chan_to_mode(u8 chan, phy_ch_width chan_width, * * Return: CDF status */ -CDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed) +QDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed) { tp_wma_handle wma_handle = (tp_wma_handle) handle; wmi_peer_get_estimated_linkspeed_cmd_fixed_param *cmd; @@ -935,20 +935,20 @@ CDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed) if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue get link speed cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma_handle->wmi_service_bitmap, WMI_SERVICE_ESTIMATE_LINKSPEED)) { WMA_LOGE("%s: Linkspeed feature bit not enabled" " Sending value 0 as link speed.", __func__); wma_send_link_speed(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(wmi_peer_get_estimated_linkspeed_cmd_fixed_param); wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -972,9 +972,9 @@ CDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed) WMI_PEER_GET_ESTIMATED_LINKSPEED_CMDID)) { WMA_LOGE("%s: failed to send link speed command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_GREEN_AP @@ -1022,7 +1022,7 @@ static int wma_egap_info_status_event(void *handle, u_int8_t *event, * * Return: 0 for success, otherwise appropriate error code */ -CDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, +QDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, struct egap_conf_params *egap_params) { tp_wma_handle wma_handle = (tp_wma_handle) handle; @@ -1033,7 +1033,7 @@ CDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, sizeof(*cmd)); if (!buf) { WMA_LOGE("Failed to allocate buffer to send ap_ps_egap cmd"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_ap_ps_egap_param_cmd_fixed_param *) wmi_buf_data(buf); WMITLV_SET_HDR(&cmd->tlv_header, @@ -1050,9 +1050,9 @@ CDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, if (err) { WMA_LOGE("Failed to send ap_ps_egap cmd"); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1281,7 +1281,7 @@ static int wma_lphb_handler(tp_wma_handle wma, uint8_t *event) { wmi_hb_ind_event_fixed_param *hb_fp; tSirLPHBInd *slphb_indication; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; cds_msg_t sme_msg = { 0 }; hb_fp = (wmi_hb_ind_event_fixed_param *) event; @@ -1308,8 +1308,8 @@ static int wma_lphb_handler(tp_wma_handle wma, uint8_t *event) sme_msg.bodyptr = slphb_indication; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_LPHB_IND msg to SME"); cdf_mem_free(slphb_indication); return -EINVAL; @@ -1327,7 +1327,7 @@ static int wma_lphb_handler(tp_wma_handle wma, uint8_t *event) * * Return: CDF status */ -static CDF_STATUS wma_wow_sta_ra_filter(tp_wma_handle wma, uint8_t vdev_id) +static QDF_STATUS wma_wow_sta_ra_filter(tp_wma_handle wma, uint8_t vdev_id) { WMI_WOW_ADD_PATTERN_CMD_fixed_param *cmd; @@ -1354,7 +1354,7 @@ static CDF_STATUS wma_wow_sta_ra_filter(tp_wma_handle wma, uint8_t vdev_id) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (WMI_WOW_ADD_PATTERN_CMD_fixed_param *) wmi_buf_data(buf); @@ -1404,10 +1404,10 @@ static CDF_STATUS wma_wow_sta_ra_filter(tp_wma_handle wma, uint8_t vdev_id) WMA_LOGE("%s: Failed to send RA rate limit to fw", __func__); wmi_buf_free(buf); iface->num_wow_default_patterns--; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_RA_FILTERING */ @@ -1500,7 +1500,7 @@ int wma_nan_rsp_event_handler(void *handle, uint8_t *event_buf, WMI_NAN_EVENTID_param_tlvs *param_buf; tSirNanEvent *nan_rsp_event; wmi_nan_event_hdr *nan_rsp_event_hdr; - CDF_STATUS status; + QDF_STATUS status; cds_msg_t cds_msg; uint8_t *buf_ptr; uint32_t alloc_len; @@ -1542,7 +1542,7 @@ int wma_nan_rsp_event_handler(void *handle, uint8_t *event_buf, cds_msg.bodyval = 0; status = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to post NaN response event to SME", __func__); cdf_mem_free(nan_rsp_event); @@ -2500,7 +2500,7 @@ wma_unified_dfs_phyerr_filter_offload_enable(tp_wma_handle wma_handle) * * Return: CDF status */ -CDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, +QDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, struct ath_pktlog_wmi_params *params) { tp_wma_handle wma_handle = (tp_wma_handle) handle; @@ -2514,7 +2514,7 @@ CDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, /*Check if packet log is enabled in cfg.ini */ if (!cds_is_packet_log_enabled()) { WMA_LOGE("%s:pkt log is not enabled in cfg.ini", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } PKTLOG_EVENT = params->pktlog_event; @@ -2526,7 +2526,7 @@ CDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_pdev_pktlog_enable_cmd_fixed_param *) wmi_buf_data(buf); @@ -2546,7 +2546,7 @@ CDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } disable_cmd = (wmi_pdev_pktlog_disable_cmd_fixed_param *) wmi_buf_data(buf); @@ -2566,18 +2566,18 @@ CDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, break; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; wmi_send_failed: wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #endif /* REMOVE_PKT_LOG */ static void wma_send_status_to_suspend_ind(tp_wma_handle wma, bool suspended) { tSirReadyToSuspendInd *ready_to_suspend; - CDF_STATUS status; + QDF_STATUS status; cds_msg_t cds_msg; uint8_t len; @@ -2600,7 +2600,7 @@ static void wma_send_status_to_suspend_ind(tp_wma_handle wma, bool suspended) cds_msg.bodyval = 0; status = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to post ready to suspend"); cdf_mem_free(ready_to_suspend); } @@ -3116,7 +3116,7 @@ static inline void wma_set_wow_bus_suspend(tp_wma_handle wma, int val) * * Return: CDF status */ -static CDF_STATUS wma_add_wow_wakeup_event(tp_wma_handle wma, +static QDF_STATUS wma_add_wow_wakeup_event(tp_wma_handle wma, uint32_t vdev_id, uint32_t bitmap, bool enable) @@ -3130,7 +3130,7 @@ static CDF_STATUS wma_add_wow_wakeup_event(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (WMI_WOW_ADD_DEL_EVT_CMD_fixed_param *) wmi_buf_data(buf); WMITLV_SET_HDR(&cmd->tlv_header, @@ -3146,13 +3146,13 @@ static CDF_STATUS wma_add_wow_wakeup_event(tp_wma_handle wma, if (ret) { WMA_LOGE("Failed to config wow wakeup event"); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Wakeup pattern 0x%x %s in fw", bitmap, enable ? "enabled" : "disabled"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3169,7 +3169,7 @@ static CDF_STATUS wma_add_wow_wakeup_event(tp_wma_handle wma, * * Return: CDF status */ -static CDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, +static QDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, uint8_t vdev_id, uint8_t ptrn_id, const uint8_t *ptrn, uint8_t ptrn_len, uint8_t ptrn_offset, const uint8_t *mask, @@ -3200,7 +3200,7 @@ static CDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (WMI_WOW_ADD_PATTERN_CMD_fixed_param *) wmi_buf_data(buf); @@ -3289,13 +3289,13 @@ static CDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, wmi_buf_free(buf); if (!user) iface->num_wow_default_patterns--; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (user) iface->num_wow_user_patterns++; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3307,9 +3307,9 @@ static CDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, * * Return: CDF status */ -static CDF_STATUS wma_wow_ap(tp_wma_handle wma, uint8_t vdev_id) +static QDF_STATUS wma_wow_ap(tp_wma_handle wma, uint8_t vdev_id) { - CDF_STATUS ret; + QDF_STATUS ret; uint8_t arp_offset = 20; uint8_t mac_mask[IEEE80211_ADDR_LEN]; @@ -3319,7 +3319,7 @@ static CDF_STATUS wma_wow_ap(tp_wma_handle wma, uint8_t vdev_id) wma->interfaces[vdev_id].addr, IEEE80211_ADDR_LEN, 0, mac_mask, IEEE80211_ADDR_LEN, false); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to add WOW unicast pattern ret %d", ret); return ret; } @@ -3330,7 +3330,7 @@ static CDF_STATUS wma_wow_ap(tp_wma_handle wma, uint8_t vdev_id) */ ret = wma_send_wow_patterns_to_fw(wma, vdev_id, 0, arp_ptrn, 0, arp_offset, arp_mask, 0, false); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to add WOW ARP pattern ret %d", ret); return ret; } @@ -3347,12 +3347,12 @@ static CDF_STATUS wma_wow_ap(tp_wma_handle wma, uint8_t vdev_id) * * Return: CDF status */ -static CDF_STATUS wma_wow_sta(tp_wma_handle wma, uint8_t vdev_id) +static QDF_STATUS wma_wow_sta(tp_wma_handle wma, uint8_t vdev_id) { uint8_t arp_offset = 12; uint8_t discvr_offset = 30; uint8_t mac_mask[IEEE80211_ADDR_LEN]; - CDF_STATUS ret = CDF_STATUS_SUCCESS; + QDF_STATUS ret = QDF_STATUS_SUCCESS; /* Setup unicast pkt pattern */ cdf_mem_set(&mac_mask, IEEE80211_ADDR_LEN, 0xFF); @@ -3360,7 +3360,7 @@ static CDF_STATUS wma_wow_sta(tp_wma_handle wma, uint8_t vdev_id) wma->interfaces[vdev_id].addr, IEEE80211_ADDR_LEN, 0, mac_mask, IEEE80211_ADDR_LEN, false); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to add WOW unicast pattern ret %d", ret); return ret; } @@ -3373,7 +3373,7 @@ static CDF_STATUS wma_wow_sta(tp_wma_handle wma, uint8_t vdev_id) ret = wma_send_wow_patterns_to_fw(wma, vdev_id, 0, discvr_ptrn, sizeof(discvr_ptrn), discvr_offset, discvr_mask, sizeof(discvr_ptrn), false); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to add WOW mDNS/SSDP/LLMNR pattern"); return ret; } @@ -3389,7 +3389,7 @@ static CDF_STATUS wma_wow_sta(tp_wma_handle wma, uint8_t vdev_id) ret = wma_send_wow_patterns_to_fw(wma, vdev_id, 0, arp_ptrn, sizeof(arp_ptrn), arp_offset, arp_mask, sizeof(arp_mask), false); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to add WOW ARP pattern"); return ret; } @@ -3401,7 +3401,7 @@ static CDF_STATUS wma_wow_sta(tp_wma_handle wma, uint8_t vdev_id) ret = wma_send_wow_patterns_to_fw(wma, vdev_id, 0, ns_ptrn, sizeof(arp_ptrn), arp_offset, arp_mask, sizeof(arp_mask), false); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to add WOW NS pattern"); return ret; } @@ -3534,7 +3534,7 @@ void wma_enable_disable_wakeup_event(WMA_HANDLE handle, * * Return: CDF status */ -CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) +QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) { tp_wma_handle wma = handle; wmi_wow_enable_cmd_fixed_param *cmd; @@ -3549,7 +3549,7 @@ CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) if (NULL == pMac) { WMA_LOGE("%s: Unable to get PE context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #endif /* CONFIG_CNSS */ @@ -3558,7 +3558,7 @@ CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_wow_enable_cmd_fixed_param *) wmi_buf_data(buf); @@ -3625,13 +3625,13 @@ CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) } wmi_set_target_suspend(wma->wmi_handle, false); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wma->wow_nack) { WMA_LOGE("FW not ready to WOW"); wmi_set_target_suspend(wma->wmi_handle, false); - return CDF_STATUS_E_AGAIN; + return QDF_STATUS_E_AGAIN; } host_credits = wmi_get_host_credits(wma->wmi_handle); @@ -3657,18 +3657,18 @@ CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) if (scn == NULL) { WMA_LOGE("%s: Failed to get HIF context", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } htc_cancel_deferred_target_sleep(scn); wma->wow.wow_enable_cmd_sent = true; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -3678,13 +3678,13 @@ error: * * Return: CDF status */ -CDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type) +QDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type) { if (type == CDF_SYSTEM_SUSPEND) { wma->no_of_resume_ind++; if (wma->no_of_resume_ind < wma_get_vdev_count(wma)) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; wma->no_of_resume_ind = 0; } @@ -3698,7 +3698,7 @@ CDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type) wmi_set_runtime_pm_inprogress(wma->wmi_handle, false); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3710,7 +3710,7 @@ CDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type) * * Return: CDF status */ -static CDF_STATUS wma_wow_delete_pattern(tp_wma_handle wma, uint8_t ptrn_id, +static QDF_STATUS wma_wow_delete_pattern(tp_wma_handle wma, uint8_t ptrn_id, uint8_t vdev_id, bool user) { WMI_WOW_DEL_PATTERN_CMD_fixed_param *cmd; @@ -3726,7 +3726,7 @@ static CDF_STATUS wma_wow_delete_pattern(tp_wma_handle wma, uint8_t ptrn_id, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (WMI_WOW_DEL_PATTERN_CMD_fixed_param *) wmi_buf_data(buf); @@ -3747,13 +3747,13 @@ static CDF_STATUS wma_wow_delete_pattern(tp_wma_handle wma, uint8_t ptrn_id, if (ret) { WMA_LOGE("%s: Failed to delete wow ptrn from fw", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (user) iface->num_wow_user_patterns--; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3770,17 +3770,17 @@ static CDF_STATUS wma_wow_delete_pattern(tp_wma_handle wma, uint8_t ptrn_id, * * Return: CDF status */ -CDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn) +QDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn) { uint8_t id; uint8_t bit_to_check, pos; struct wma_txrx_node *iface; - CDF_STATUS ret = CDF_STATUS_SUCCESS; + QDF_STATUS ret = QDF_STATUS_SUCCESS; uint8_t new_mask[SIR_WOWL_BCAST_PATTERN_MAX_SIZE]; if (ptrn->session_id > wma->max_bssid) { WMA_LOGE("Invalid vdev id (%d)", ptrn->session_id); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } iface = &wma->interfaces[ptrn->session_id]; @@ -3824,7 +3824,7 @@ CDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn) ptrn->pattern, ptrn->pattern_size, ptrn->pattern_byte_offset, new_mask, ptrn->pattern_size, true); - if (ret != CDF_STATUS_SUCCESS) + if (ret != QDF_STATUS_SUCCESS) WMA_LOGE("Failed to add wow pattern %d", ptrn->pattern_id); return ret; @@ -3842,21 +3842,21 @@ CDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn) * * Return: CDF status */ -CDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma, +QDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma, struct wow_delete_pattern *pattern) { struct wma_txrx_node *iface; if (pattern->session_id > wma->max_bssid) { WMA_LOGE("Invalid vdev id %d", pattern->session_id); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } iface = &wma->interfaces[pattern->session_id]; if (iface->num_wow_user_patterns <= 0) { WMA_LOGE("No valid user pattern. Num user pattern %u vdev %d", iface->num_wow_user_patterns, pattern->session_id); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } WMA_LOGI("Delete user passed wow pattern id %d total user pattern %d", @@ -3869,7 +3869,7 @@ CDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma, if (!iface->num_wow_user_patterns) wma_register_wow_default_patterns(wma, pattern->session_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3882,7 +3882,7 @@ CDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info) +QDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info) { struct wma_txrx_node *iface; @@ -3891,7 +3891,7 @@ CDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info) if (info->sessionId > wma->max_bssid) { WMA_LOGE("Invalid vdev id (%d)", info->sessionId); cdf_mem_free(info); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } iface = &wma->interfaces[info->sessionId]; @@ -3904,7 +3904,7 @@ CDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info) cdf_mem_free(info); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3914,7 +3914,7 @@ CDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info) * * Return: CDF status */ -CDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info) +QDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info) { struct wma_txrx_node *iface; @@ -3923,7 +3923,7 @@ CDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info) if (info->sessionId > wma->max_bssid) { WMA_LOGE("Invalid vdev id (%d)", info->sessionId); cdf_mem_free(info); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } iface = &wma->interfaces[info->sessionId]; @@ -3931,7 +3931,7 @@ CDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info) wma->wow.magic_ptrn_enable = false; cdf_mem_free(info); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4214,7 +4214,7 @@ static void wma_notify_suspend_req_procesed(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type) +QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type) { if (type == CDF_RUNTIME_SUSPEND) wmi_set_runtime_pm_inprogress(wma->wmi_handle, true); @@ -4239,7 +4239,7 @@ CDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type) */ wma_set_wow_bus_suspend(wma, 1); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4251,11 +4251,10 @@ CDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type) * * Return: CDF status */ -static CDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) +static QDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) { wmi_wow_hostwakeup_from_sleep_cmd_fixed_param *cmd; wmi_buf_t buf; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int32_t len; int ret; @@ -4263,7 +4262,7 @@ static CDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); if (NULL == pMac) { WMA_LOGE("%s: Unable to get PE context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #endif /* CONFIG_CNSS */ @@ -4272,7 +4271,7 @@ static CDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_wow_hostwakeup_from_sleep_cmd_fixed_param *) @@ -4289,7 +4288,7 @@ static CDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) if (ret) { WMA_LOGE("Failed to send host wakeup indication to fw"); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Host wakeup indication sent to fw"); @@ -4320,10 +4319,10 @@ static CDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) WMA_LOGD("Host wakeup received"); } - if (CDF_STATUS_SUCCESS == cdf_status) + if (QDF_STATUS_SUCCESS == qdf_status) wmi_set_target_suspend(wma->wmi_handle, false); - return cdf_status; + return qdf_status; } /** @@ -4332,17 +4331,17 @@ static CDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) * * Return: 0 for success or error code */ -CDF_STATUS wma_disable_wow_in_fw(WMA_HANDLE handle) +QDF_STATUS wma_disable_wow_in_fw(WMA_HANDLE handle) { tp_wma_handle wma = handle; - CDF_STATUS ret; + QDF_STATUS ret; if (!wma->wow.wow_enable || !wma->wow.wow_enable_cmd_sent) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; ret = wma_send_host_wakeup_ind_to_fw(wma); - if (ret != CDF_STATUS_SUCCESS) + if (ret != QDF_STATUS_SUCCESS) return ret; wma->wow.wow_enable = false; @@ -4500,7 +4499,7 @@ void wma_aggr_qos_req(tp_wma_handle wma, * apart from sending ADDTS to firmware just send * success to upper layers */ - pAggrQosRspMsg->status[i] = CDF_STATUS_SUCCESS; + pAggrQosRspMsg->status[i] = QDF_STATUS_SUCCESS; buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { @@ -4529,7 +4528,7 @@ void wma_aggr_qos_req(tp_wma_handle wma, WMA_LOGP("%s: Failed to send vdev ADDTS command", __func__); pAggrQosRspMsg->status[i] = - CDF_STATUS_E_FAILURE; + QDF_STATUS_E_FAILURE; cdf_nbuf_free(buf); } } @@ -4570,7 +4569,7 @@ void wma_add_ts_req(tp_wma_handle wma, tAddTsParams *msg) ol_tx_set_compute_interval(pdev, intervalMiliseconds); #endif /* FEATURE_WLAN_ESE */ - msg->status = CDF_STATUS_SUCCESS; + msg->status = QDF_STATUS_SUCCESS; buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { @@ -4592,7 +4591,7 @@ void wma_add_ts_req(tp_wma_handle wma, tAddTsParams *msg) if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_VDEV_WMM_ADDTS_CMDID)) { WMA_LOGP("%s: Failed to send vdev ADDTS command", __func__); - msg->status = CDF_STATUS_E_FAILURE; + msg->status = QDF_STATUS_E_FAILURE; cdf_nbuf_free(buf); } #ifdef WLAN_FEATURE_ROAM_OFFLOAD @@ -4804,7 +4803,7 @@ int wma_process_receive_filter_clear_filter_req(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, +QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, void *pTsmStatsMsg) { uint8_t counter; @@ -4829,7 +4828,7 @@ CDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); cdf_mem_free(pTsmStatsMsg); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* get required values from data path APIs */ @@ -4845,7 +4844,7 @@ CDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, "%s: CDF MEM Alloc Failure", __func__); CDF_ASSERT(0); cdf_mem_free(pTsmStatsMsg); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pTsmRspParams->staId = pStats->staId; pTsmRspParams->rc = eSIR_FAILURE; @@ -4871,7 +4870,7 @@ CDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, #ifdef FEATURE_WLAN_ESE_UPLOAD wma_send_msg(wma_handler, WMA_TSM_STATS_RSP, (void *)pTsmRspParams, 0); #endif /* FEATURE_WLAN_ESE_UPLOAD */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_ESE */ @@ -4932,7 +4931,7 @@ static int wma_add_clear_mcbc_filter(tp_wma_handle wma_handle, uint8_t vdev_id, * * Return: CDF status */ -CDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle, tSirRcvFltMcAddrList *mcbc_param) { uint8_t vdev_id = 0; @@ -4940,14 +4939,14 @@ CDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle, if (mcbc_param->ulMulticastAddrCnt <= 0) { WMA_LOGW("Number of multicast addresses is 0"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!wma_find_vdev_by_addr(wma_handle, mcbc_param->self_macaddr.bytes, &vdev_id)) { WMA_LOGE("%s: Failed to find vdev id for %pM", __func__, mcbc_param->bssid.bytes); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* set mcbc_param->action to clear MCList and reset * to configure the MCList in FW @@ -4958,7 +4957,7 @@ CDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle, mcbc_param->multicastAddr[i], (mcbc_param->action == 0)); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_FEATURE_GTK_OFFLOAD @@ -5011,7 +5010,7 @@ int wma_gtk_offload_status_event(void *handle, uint8_t *event, cdf_mem_zero(resp, sizeof(*resp)); resp->mesgType = eWNI_PMC_GTK_OFFLOAD_GETINFO_RSP; resp->mesgLen = sizeof(*resp); - resp->ulStatus = CDF_STATUS_SUCCESS; + resp->ulStatus = QDF_STATUS_SUCCESS; resp->ulTotalRekeyCount = status->refresh_cnt; /* TODO: Is the total rekey count and GTK rekey count same? */ resp->ulGTKRekeyCount = status->refresh_cnt; @@ -5031,7 +5030,7 @@ int wma_gtk_offload_status_event(void *handle, uint8_t *event, cds_msg.bodyval = 0; if (cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to post GTK response to SME"); cdf_mem_free(resp); return -EINVAL; @@ -5063,13 +5062,13 @@ int wma_gtk_offload_status_event(void *handle, uint8_t *event, * * Return: CDF status */ -static CDF_STATUS wma_send_gtk_offload_req(tp_wma_handle wma, uint8_t vdev_id, +static QDF_STATUS wma_send_gtk_offload_req(tp_wma_handle wma, uint8_t vdev_id, tpSirGtkOffloadParams params) { int len; wmi_buf_t buf; WMI_GTK_OFFLOAD_CMD_fixed_param *cmd; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; WMA_LOGD("%s Enter", __func__); @@ -5079,7 +5078,7 @@ static CDF_STATUS wma_send_gtk_offload_req(tp_wma_handle wma, uint8_t vdev_id, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("wmi_buf_alloc failed for WMI_GTK_OFFLOAD_CMD"); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto out; } @@ -5111,7 +5110,7 @@ static CDF_STATUS wma_send_gtk_offload_req(tp_wma_handle wma, uint8_t vdev_id, WMI_GTK_OFFLOAD_CMDID)) { WMA_LOGE("Failed to send WMI_GTK_OFFLOAD_CMDID"); wmi_buf_free(buf); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } WMA_LOGD("VDEVID: %d, GTK_FLAGS: x%x", vdev_id, cmd->flags); @@ -5127,18 +5126,18 @@ out: * * Return: CDF status */ -CDF_STATUS wma_process_gtk_offload_req(tp_wma_handle wma, +QDF_STATUS wma_process_gtk_offload_req(tp_wma_handle wma, tpSirGtkOffloadParams params) { uint8_t vdev_id; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; WMA_LOGD("%s Enter", __func__); /* Get the vdev id */ if (!wma_find_vdev_by_bssid(wma, params->bssid.bytes, &vdev_id)) { WMA_LOGE("vdev handle is invalid for %pM", params->bssid.bytes); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; goto out; } @@ -5146,7 +5145,7 @@ CDF_STATUS wma_process_gtk_offload_req(tp_wma_handle wma, if (vdev_id >= wma->max_bssid) { WMA_LOGE("invalid vdev_id %d for %pM", vdev_id, params->bssid.bytes); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; goto out; } @@ -5156,7 +5155,7 @@ CDF_STATUS wma_process_gtk_offload_req(tp_wma_handle wma, "vdev_id %d", __func__, vdev_id); params->ulFlags = GTK_OFFLOAD_DISABLE; status = wma_send_gtk_offload_req(wma, vdev_id, params); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s Failed to disable GTK Offload", __func__); goto out; } @@ -5178,21 +5177,21 @@ out: * * Return: CDF status */ -CDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, +QDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, tpSirGtkOffloadGetInfoRspParams params) { uint8_t vdev_id; int len; wmi_buf_t buf; WMI_GTK_OFFLOAD_CMD_fixed_param *cmd; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; WMA_LOGD("%s Enter", __func__); /* Get the vdev id */ if (!wma_find_vdev_by_bssid(wma, params->bssid.bytes, &vdev_id)) { WMA_LOGE("vdev handle is invalid for %pM", params->bssid.bytes); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; goto out; } @@ -5202,7 +5201,7 @@ CDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("wmi_buf_alloc failed for WMI_GTK_OFFLOAD_CMD"); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto out; } @@ -5221,7 +5220,7 @@ CDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, WMI_GTK_OFFLOAD_CMDID)) { WMA_LOGE("Failed to send WMI_GTK_OFFLOAD_CMDID for req info"); wmi_buf_free(buf); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } out: cdf_mem_free(params); @@ -5241,7 +5240,7 @@ out: * * Return: CDF Status */ -CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, +QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, tpSirHostOffloadReq pHostOffloadParams, bool bArpOnly) { @@ -5262,13 +5261,13 @@ CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, WMA_LOGE("vdev handle is invalid for %pM", pHostOffloadParams->bssid.bytes); cdf_mem_free(pHostOffloadParams); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!wma->interfaces[vdev_id].vdev_up) { WMA_LOGE("vdev %d is not up skipping arp/ns offload", vdev_id); cdf_mem_free(pHostOffloadParams); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!bArpOnly) @@ -5297,7 +5296,7 @@ CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, if (!buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); cdf_mem_free(pHostOffloadParams); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (A_UINT8 *) wmi_buf_data(buf); @@ -5440,11 +5439,11 @@ CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, WMA_LOGE("Failed to enable ARP NDP/NSffload"); wmi_buf_free(buf); cdf_mem_free(pHostOffloadParams); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_free(pHostOffloadParams); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5454,7 +5453,7 @@ CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, * * Retrun: CDF status */ -CDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, +QDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, tSirAddPeriodicTxPtrn * pAddPeriodicTxPtrnParams) { @@ -5470,7 +5469,7 @@ CDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue fw add pattern cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } ptrn_len = pAddPeriodicTxPtrnParams->ucPtrnSize; ptrn_len_aligned = roundup(ptrn_len, sizeof(uint32_t)); @@ -5480,7 +5479,7 @@ CDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } if (!wma_find_vdev_by_addr(wma_handle, pAddPeriodicTxPtrnParams->mac_address.bytes, @@ -5488,7 +5487,7 @@ CDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, WMA_LOGE("%s: Failed to find vdev id for %pM", __func__, pAddPeriodicTxPtrnParams->mac_address.bytes); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -5520,9 +5519,9 @@ CDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, WMA_LOGE("%s: failed to add pattern set state command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5532,7 +5531,7 @@ CDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, * * Retrun: CDF status */ -CDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, +QDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, tSirDelPeriodicTxPtrn * pDelPeriodicTxPtrnParams) { @@ -5546,12 +5545,12 @@ CDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue Del Pattern cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } if (!wma_find_vdev_by_addr(wma_handle, pDelPeriodicTxPtrnParams->mac_address.bytes, @@ -5559,7 +5558,7 @@ CDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, WMA_LOGE("%s: Failed to find vdev id for %pM", __func__, pDelPeriodicTxPtrnParams->mac_address.bytes); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } cmd = (WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMD_fixed_param *) wmi_buf_data(wmi_buf); @@ -5578,9 +5577,9 @@ CDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMDID)) { WMA_LOGE("%s: failed to send del pattern command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_FEATURE_STATS_EXT @@ -5591,7 +5590,7 @@ CDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, * * Return: CDF status */ -CDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq) +QDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq) { int32_t ret; tp_wma_handle wma = (tp_wma_handle) wma_ptr; @@ -5651,7 +5650,7 @@ CDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq) static void wma_send_status_of_ext_wow(tp_wma_handle wma, bool status) { tSirReadyToExtWoWInd *ready_to_extwow; - CDF_STATUS vstatus; + QDF_STATUS vstatus; cds_msg_t cds_msg; uint8_t len; @@ -5674,7 +5673,7 @@ static void wma_send_status_of_ext_wow(tp_wma_handle wma, bool status) cds_msg.bodyval = 0; vstatus = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg); - if (vstatus != CDF_STATUS_SUCCESS) { + if (vstatus != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to post ready to suspend"); cdf_mem_free(ready_to_extwow); } @@ -5698,7 +5697,7 @@ int wma_enable_ext_wow(tp_wma_handle wma, tpSirExtWoWParams params) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_extwow_enable_cmd_fixed_param *) wmi_buf_data(buf); @@ -5721,11 +5720,11 @@ int wma_enable_ext_wow(tp_wma_handle wma, tpSirExtWoWParams params) WMA_LOGE("%s: Failed to set EXTWOW Enable", __func__); wmi_buf_free(buf); wma_send_status_of_ext_wow(wma, false); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_send_status_of_ext_wow(wma, true); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -5748,7 +5747,7 @@ int wma_set_app_type1_params_in_fw(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_extwow_set_app_type1_params_cmd_fixed_param *) @@ -5778,10 +5777,10 @@ int wma_set_app_type1_params_in_fw(tp_wma_handle wma, if (ret) { WMA_LOGE("%s: Failed to set APP TYPE1 PARAMS", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5803,7 +5802,7 @@ int wma_set_app_type2_params_in_fw(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_extwow_set_app_type2_params_cmd_fixed_param *) @@ -5858,10 +5857,10 @@ int wma_set_app_type2_params_in_fw(tp_wma_handle wma, if (ret) { WMA_LOGE("%s: Failed to set APP TYPE2 PARAMS", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_EXTWOW_SUPPORT */ @@ -5910,7 +5909,7 @@ int wma_auto_shutdown_event_handler(void *handle, uint8_t *event, * * Return: CDF status */ -CDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, +QDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, tSirAutoShutdownCmdParams * auto_sh_cmd) { @@ -5922,7 +5921,7 @@ CDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, if (auto_sh_cmd == NULL) { WMA_LOGE("%s : Invalid Autoshutdown cfg cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("%s: Set WMI_HOST_AUTO_SHUTDOWN_CFG_CMDID:TIMER_VAL=%d", @@ -5931,7 +5930,7 @@ CDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -5950,10 +5949,10 @@ CDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, WMA_LOGE("%s: WMI_HOST_AUTO_SHUTDOWN_CFG_CMDID Err %d", __func__, status); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_AUTO_SHUTDOWN */ @@ -5965,7 +5964,7 @@ CDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req) +QDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req) { int ret; tp_wma_handle wma_handle = (tp_wma_handle) wma_ptr; @@ -5983,7 +5982,7 @@ CDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req) */ if (!nan_req) { WMA_LOGE("%s:nan req is not valid", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } nan_data_len = nan_req->request_data_len; nan_data_len_aligned = roundup(nan_req->request_data_len, @@ -5992,7 +5991,7 @@ CDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req) buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); cmd = (wmi_nan_cmd_param *) buf_ptr; @@ -6075,7 +6074,7 @@ int wma_process_dhcpserver_offload(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, +QDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, tSirLedFlashingReq *flashing) { wmi_set_led_flashing_cmd_fixed_param *cmd; @@ -6086,11 +6085,11 @@ CDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE(FL("WMA is closed, can not issue cmd")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!flashing) { WMA_LOGE(FL("invalid parameter: flashing")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } buf = wmi_buf_alloc(wma_handle->wmi_handle, len); @@ -6113,9 +6112,9 @@ CDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("%s: wmi_unified_cmd_send WMI_PEER_SET_PARAM_CMD" " returned Error %d", __func__, status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_GPIO_LED_FLASHING */ @@ -6135,7 +6134,7 @@ int wma_channel_avoid_evt_handler(void *handle, uint8_t *event, wmi_avoid_freq_range_desc *afr_desc; uint32_t num_freq_ranges, freq_range_idx; tSirChAvoidIndType *sca_indication; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; cds_msg_t sme_msg = { 0 }; WMI_WLAN_FREQ_AVOID_EVENTID_param_tlvs *param_buf = (WMI_WLAN_FREQ_AVOID_EVENTID_param_tlvs *) event; @@ -6192,8 +6191,8 @@ int wma_channel_avoid_evt_handler(void *handle, uint8_t *event, sme_msg.bodyptr = sca_indication; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_CH_AVOID_IND msg to SME"); cdf_mem_free(sca_indication); return -EINVAL; @@ -6209,7 +6208,7 @@ int wma_channel_avoid_evt_handler(void *handle, uint8_t *event, * * Return: CDF status */ -CDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, tSirChAvoidUpdateReq * ch_avoid_update_req) { @@ -6221,7 +6220,7 @@ CDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, if (ch_avoid_update_req == NULL) { WMA_LOGE("%s : ch_avoid_update_req is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGI("%s: WMA --> WMI_CHAN_AVOID_UPDATE", __func__); @@ -6229,7 +6228,7 @@ CDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -6246,12 +6245,12 @@ CDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, " WMITLV_TABLE_WMI_CHAN_AVOID_UPDATE" " returned Error %d", status); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGI("%s: WMA --> WMI_CHAN_AVOID_UPDATE sent through WMI", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_CH_AVOID */ @@ -6262,13 +6261,13 @@ CDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_set_reg_domain(void *clientCtxt, v_REGDOMAIN_t regId) +QDF_STATUS wma_set_reg_domain(void *clientCtxt, v_REGDOMAIN_t regId) { - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_set_reg_domain(clientCtxt, regId)) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6344,7 +6343,7 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G, * * Return: cdf status of the mq post */ -static CDF_STATUS wma_post_runtime_resume_msg(WMA_HANDLE handle) +static QDF_STATUS wma_post_runtime_resume_msg(WMA_HANDLE handle) { cds_msg_t resume_msg; @@ -6360,21 +6359,21 @@ static CDF_STATUS wma_post_runtime_resume_msg(WMA_HANDLE handle) * Requests for offloads to be configured for runtime suspend * on the MC thread * - * Return CDF_STATUS_E_AGAIN in case of timeout or CDF_STATUS_SUCCESS + * Return QDF_STATUS_E_AGAIN in case of timeout or QDF_STATUS_SUCCESS */ -static CDF_STATUS wma_post_runtime_suspend_msg(WMA_HANDLE handle) +static QDF_STATUS wma_post_runtime_suspend_msg(WMA_HANDLE handle) { cds_msg_t cds_msg; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tp_wma_handle wma = (tp_wma_handle) handle; qdf_event_reset(&wma->runtime_suspend); cds_msg.bodyptr = NULL; cds_msg.type = WMA_RUNTIME_PM_SUSPEND_IND; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &cds_msg); + qdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &cds_msg); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) goto failure; if (qdf_wait_single_event(&wma->runtime_suspend, @@ -6384,10 +6383,10 @@ static CDF_STATUS wma_post_runtime_suspend_msg(WMA_HANDLE handle) goto failure; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; failure: - return CDF_STATUS_E_AGAIN; + return QDF_STATUS_E_AGAIN; } /** @@ -6413,9 +6412,9 @@ static int __wma_bus_suspend(enum cdf_suspend_type type) } if (type == CDF_RUNTIME_SUSPEND) { - CDF_STATUS status = wma_post_runtime_suspend_msg(handle); + QDF_STATUS status = wma_post_runtime_suspend_msg(handle); if (status) - return cdf_status_to_os_return(status); + return qdf_status_to_os_return(status); } if (type == CDF_SYSTEM_SUSPEND) @@ -6423,8 +6422,8 @@ static int __wma_bus_suspend(enum cdf_suspend_type type) wma_is_wow_mode_selected(handle)); if (wma_is_wow_mode_selected(handle)) { - CDF_STATUS status = wma_enable_wow_in_fw(handle); - return cdf_status_to_os_return(status); + QDF_STATUS status = wma_enable_wow_in_fw(handle); + return qdf_status_to_os_return(status); } return wma_suspend_target(handle, 0); @@ -6471,7 +6470,7 @@ int wma_bus_suspend(void) int __wma_bus_resume(WMA_HANDLE handle) { bool wow_mode = wma_is_wow_mode_selected(handle); - CDF_STATUS status; + QDF_STATUS status; WMA_LOGE("%s: wow mode %d", __func__, wow_mode); @@ -6479,7 +6478,7 @@ int __wma_bus_resume(WMA_HANDLE handle) return wma_resume_target(handle); status = wma_disable_wow_in_fw(handle); - return cdf_status_to_os_return(status); + return qdf_status_to_os_return(status); } /** @@ -6490,7 +6489,7 @@ int __wma_bus_resume(WMA_HANDLE handle) int wma_runtime_resume(void) { int ret; - CDF_STATUS status; + QDF_STATUS status; WMA_HANDLE handle = cds_get_context(CDF_MODULE_ID_WMA); if (NULL == handle) { WMA_LOGE("%s: wma context is NULL", __func__); @@ -6502,7 +6501,7 @@ int wma_runtime_resume(void) return ret; status = wma_post_runtime_resume_msg(handle); - return cdf_status_to_os_return(status); + return qdf_status_to_os_return(status); } /** @@ -6652,7 +6651,6 @@ int wma_resume_target(WMA_HANDLE handle) tp_wma_handle wma = (tp_wma_handle) handle; wmi_buf_t wmibuf; wmi_pdev_resume_cmd_fixed_param *cmd; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; #ifdef CONFIG_CNSS tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); @@ -6706,7 +6704,7 @@ int wma_resume_target(WMA_HANDLE handle) WMA_LOGD("Host wakeup received"); } - if (CDF_STATUS_SUCCESS == cdf_status) + if (QDF_STATUS_SUCCESS == qdf_status) wmi_set_target_suspend(wma->wmi_handle, false); return ret; @@ -7686,10 +7684,10 @@ int wma_dfs_indicate_radar(struct ieee80211com *ic, * * This function sends memory dump request to firmware * - * Return: CDF_STATUS_SUCCESS for success otherwise failure + * Return: QDF_STATUS_SUCCESS for success otherwise failure * */ -CDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, +QDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, struct fw_dump_req *mem_dump_req) { wmi_get_fw_mem_dump_fixed_param *cmd; @@ -7702,7 +7700,7 @@ CDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, if (!mem_dump_req || !wma) { WMA_LOGE(FL("input pointer is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* @@ -7716,7 +7714,7 @@ CDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, if (!buf) { WMA_LOGE(FL("Failed allocate wmi buffer")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (u_int8_t *) wmi_buf_data(buf); @@ -7769,11 +7767,11 @@ CDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, if (ret) { WMA_LOGE(FL("Failed to send get firmware mem dump request")); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGI(FL("Get firmware mem dump request sent successfully")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7785,20 +7783,20 @@ CDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, * This function is called by the memory dump response handler to * indicate SME that firmware dump copy is complete * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS wma_fw_mem_dump_rsp(uint32_t req_id, uint32_t status) +static QDF_STATUS wma_fw_mem_dump_rsp(uint32_t req_id, uint32_t status) { struct fw_dump_rsp *dump_rsp; cds_msg_t sme_msg = {0}; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; dump_rsp = cdf_mem_malloc(sizeof(*dump_rsp)); if (!dump_rsp) { WMA_LOGE(FL("Memory allocation failed.")); - cdf_status = CDF_STATUS_E_NOMEM; - return cdf_status; + qdf_status = QDF_STATUS_E_NOMEM; + return qdf_status; } WMA_LOGI(FL("FW memory dump copy complete status: %d for request: %d"), @@ -7811,13 +7809,13 @@ static CDF_STATUS wma_fw_mem_dump_rsp(uint32_t req_id, uint32_t status) sme_msg.bodyptr = dump_rsp; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Fail to post fw mem dump ind msg")); cdf_mem_free(dump_rsp); } - return cdf_status; + return qdf_status; } /** @@ -7836,7 +7834,7 @@ int wma_fw_mem_dump_event_handler(void *handle, u_int8_t *cmd_param_info, { WMI_UPDATE_FW_MEM_DUMP_EVENTID_param_tlvs *param_buf; wmi_update_fw_mem_dump_fixed_param *event; - CDF_STATUS status; + QDF_STATUS status; param_buf = (WMI_UPDATE_FW_MEM_DUMP_EVENTID_param_tlvs *) cmd_param_info; @@ -7849,7 +7847,7 @@ int wma_fw_mem_dump_event_handler(void *handle, u_int8_t *cmd_param_info, status = wma_fw_mem_dump_rsp(event->request_id, event->fw_mem_dump_complete); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { WMA_LOGE("Error posting FW MEM DUMP RSP."); return -EINVAL; } @@ -7866,10 +7864,10 @@ int wma_fw_mem_dump_event_handler(void *handle, u_int8_t *cmd_param_info, * * This function sends IE information to firmware * - * Return: CDF_STATUS_SUCCESS for success otherwise failure + * Return: QDF_STATUS_SUCCESS for success otherwise failure * */ -CDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, +QDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, struct vdev_ie_info *ie_info) { wmi_vdev_set_ie_cmd_fixed_param *cmd; @@ -7880,13 +7878,13 @@ CDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, if (!ie_info || !wma) { WMA_LOGE(FL("input pointer is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Validate the input */ if (ie_info->length <= 0) { WMA_LOGE(FL("Invalid IE length")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } ie_len_aligned = roundup(ie_info->length, sizeof(uint32_t)); @@ -7896,7 +7894,7 @@ CDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE(FL("wmi_buf_alloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = wmi_buf_data(buf); diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 39f263aad9..28b98cd252 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -521,7 +521,7 @@ int wma_cli_set2_command(int vdev_id, int param_id, int sval1, msg.reserved = 0; msg.bodyptr = iwcmd; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { WMA_LOGP("%s: Failed to post WMA_CLI_SET_CMD msg", __func__); @@ -1503,7 +1503,7 @@ int wma_process_fw_event_handler(struct wmi_unified *wmi_handle, cds_msg.bodyptr = params_buf; cds_msg.bodyval = 0; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_WMA, &cds_msg)) { WMA_LOGP("%s: Failed to post WMA_PROCESS_FW_EVENT msg", __func__); @@ -1586,7 +1586,7 @@ static void wma_init_max_no_of_peers(tp_wma_handle wma_handle, * * Return: 0 on success, errno on failure */ -CDF_STATUS wma_open(void *cds_context, +QDF_STATUS wma_open(void *cds_context, wma_tgt_cfg_cb tgt_cfg_cb, wma_dfs_radar_indication_cb radar_ind_cb, tMacOpenParameters *mac_params) @@ -1595,7 +1595,8 @@ CDF_STATUS wma_open(void *cds_context, HTC_HANDLE htc_handle; cdf_device_t cdf_dev; void *wmi_handle; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; + QDF_STATUS qdf_status; struct txrx_pdev_cfg_param_t olCfg = { 0 }; WMA_LOGD("%s: Enter", __func__); @@ -1605,18 +1606,18 @@ CDF_STATUS wma_open(void *cds_context, if (!htc_handle) { WMA_LOGP("%s: Invalid HTC handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Alloc memory for WMA Context */ - cdf_status = cds_alloc_context(cds_context, CDF_MODULE_ID_WMA, + qdf_status = cds_alloc_context(cds_context, CDF_MODULE_ID_WMA, (void **)&wma_handle, sizeof(t_wma_handle)); - if (cdf_status != CDF_STATUS_SUCCESS) { + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: Memory allocation failed for wma_handle", __func__); - return cdf_status; + return qdf_status; } cdf_mem_zero(wma_handle, sizeof(t_wma_handle)); @@ -1637,7 +1638,7 @@ CDF_STATUS wma_open(void *cds_context, wma_process_fw_event_handler); if (!wmi_handle) { WMA_LOGP("%s: failed to attach WMI", __func__); - cdf_status = CDF_STATUS_E_NOMEM; + qdf_status = QDF_STATUS_E_NOMEM; goto err_wma_handle; } @@ -1686,7 +1687,7 @@ CDF_STATUS wma_open(void *cds_context, olCfg); if (!(((p_cds_contextType) cds_context)->cfg_ctx)) { WMA_LOGP("%s: failed to init cfg handle", __func__); - cdf_status = CDF_STATUS_E_NOMEM; + qdf_status = QDF_STATUS_E_NOMEM; goto err_wmi_handle; } @@ -1756,7 +1757,7 @@ CDF_STATUS wma_open(void *cds_context, wma_handle->max_bssid); if (!wma_handle->interfaces) { WMA_LOGP("%s: failed to allocate interface table", __func__); - cdf_status = CDF_STATUS_E_NOMEM; + qdf_status = QDF_STATUS_E_NOMEM; goto err_scn_context; } cdf_mem_zero(wma_handle->interfaces, sizeof(struct wma_txrx_node) * @@ -1776,59 +1777,59 @@ CDF_STATUS wma_open(void *cds_context, wma_handle->new_hw_mode_index = WMA_DEFAULT_HW_MODE_INDEX; wma_handle->saved_wmi_init_cmd.buf = NULL; - cdf_status = cdf_event_init(&wma_handle->wma_ready_event); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = cdf_event_init(&wma_handle->wma_ready_event); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: wma_ready_event initialization failed", __func__); goto err_event_init; } - cdf_status = cdf_mc_timer_init(&wma_handle->service_ready_ext_timer, + qdf_status = cdf_mc_timer_init(&wma_handle->service_ready_ext_timer, CDF_TIMER_TYPE_SW, wma_service_ready_ext_evt_timeout, wma_handle); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!CDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Failed to initialize service ready ext timeout"); goto err_event_init; } - cdf_status = cdf_event_init(&wma_handle->target_suspend); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = cdf_event_init(&wma_handle->target_suspend); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: target suspend event initialization failed", __func__); goto err_event_init; } /* Init Tx Frame Complete event */ - cdf_status = cdf_event_init(&wma_handle->tx_frm_download_comp_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cdf_event_init(&wma_handle->tx_frm_download_comp_event); + if (!CDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGP("%s: failed to init tx_frm_download_comp_event", __func__); goto err_event_init; } /* Init tx queue empty check event */ - cdf_status = cdf_event_init(&wma_handle->tx_queue_empty_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cdf_event_init(&wma_handle->tx_queue_empty_event); + if (!CDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGP("%s: failed to init tx_queue_empty_event", __func__); goto err_event_init; } - cdf_status = cdf_event_init(&wma_handle->wma_resume_event); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = cdf_event_init(&wma_handle->wma_resume_event); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: wma_resume_event initialization failed", __func__); goto err_event_init; } - cdf_status = cdf_event_init(&wma_handle->runtime_suspend); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = cdf_event_init(&wma_handle->runtime_suspend); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: runtime_suspend event initialization failed", __func__); goto err_event_init; } - cdf_status = cdf_event_init(&wma_handle->recovery_event); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = cdf_event_init(&wma_handle->recovery_event); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: recovery event initialization failed", __func__); goto err_event_init; } @@ -1922,8 +1923,8 @@ CDF_STATUS wma_open(void *cds_context, wma_fw_mem_dump_event_handler); /* Firmware debug log */ - cdf_status = dbglog_init(wma_handle->wmi_handle); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = dbglog_init(wma_handle->wmi_handle); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: Firmware Dbglog initialization failed", __func__); goto err_dbglog_init; } @@ -2006,7 +2007,7 @@ CDF_STATUS wma_open(void *cds_context, wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_PEER_DELETE_RESP_EVENTID, wma_peer_delete_handler); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; err_dbglog_init: cdf_wake_lock_destroy(&wma_handle->wmi_cmd_rsp_wake_lock); @@ -2041,7 +2042,7 @@ err_wma_handle: WMA_LOGD("%s: Exit", __func__); - return cdf_status; + return qdf_status; } /** @@ -2050,9 +2051,9 @@ err_wma_handle: * * Return: 0 on success, errno on failure */ -CDF_STATUS wma_pre_start(void *cds_ctx) +QDF_STATUS wma_pre_start(void *cds_ctx) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; A_STATUS status = A_OK; tp_wma_handle wma_handle; cds_msg_t wma_msg = { 0 }; @@ -2064,7 +2065,7 @@ CDF_STATUS wma_pre_start(void *cds_ctx) /* Validate the wma_handle */ if (NULL == wma_handle) { WMA_LOGP("%s: invalid argument", __func__); - cdf_status = CDF_STATUS_E_INVAL; + qdf_status = QDF_STATUS_E_INVAL; goto end; } /* Open endpoint for ctrl path - WMI <--> HTC */ @@ -2072,7 +2073,7 @@ CDF_STATUS wma_pre_start(void *cds_ctx) wma_handle->htc_handle); if (A_OK != status) { WMA_LOGP("%s: wmi_unified_connect_htc_service", __func__); - cdf_status = CDF_STATUS_E_FAULT; + qdf_status = QDF_STATUS_E_FAULT; goto end; } @@ -2083,15 +2084,15 @@ CDF_STATUS wma_pre_start(void *cds_ctx) wma_msg.bodyptr = NULL; wma_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &wma_msg); - if (CDF_STATUS_SUCCESS != cdf_status) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &wma_msg); + if (QDF_STATUS_SUCCESS != qdf_status) { WMA_LOGP("%s: Failed to post WNI_CFG_DNLD_REQ msg", __func__); CDF_ASSERT(0); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; } end: WMA_LOGD("%s: Exit", __func__); - return cdf_status; + return qdf_status; } /** @@ -2107,13 +2108,13 @@ void wma_send_msg(tp_wma_handle wma_handle, uint16_t msg_type, void *body_ptr, uint32_t body_val) { tSirMsgQ msg = { 0 }; - uint32_t status = CDF_STATUS_SUCCESS; + uint32_t status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); msg.type = msg_type; msg.bodyval = body_val; msg.bodyptr = body_ptr; status = lim_post_msg_api(pMac, &msg); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { if (NULL != body_ptr) cdf_mem_free(body_ptr); CDF_ASSERT(0); @@ -2294,7 +2295,7 @@ static int wma_flush_complete_evt_handler(void *handle, u_int8_t *event, u_int32_t len) { - CDF_STATUS status; + QDF_STATUS status; tp_wma_handle wma = (tp_wma_handle) handle; WMI_DEBUG_MESG_FLUSH_COMPLETE_EVENTID_param_tlvs *param_buf; @@ -2304,7 +2305,7 @@ static int wma_flush_complete_evt_handler(void *handle, param_buf = (WMI_DEBUG_MESG_FLUSH_COMPLETE_EVENTID_param_tlvs *) event; if (!param_buf) { WMA_LOGE("Invalid log flush complete event buffer"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wmi_event = param_buf->fixed_param; @@ -2321,7 +2322,7 @@ static int wma_flush_complete_evt_handler(void *handle, /* Flush event in response to flush command */ WMA_LOGI("Received WMI flush event in response to flush CMD"); status = cdf_mc_timer_stop(&wma->log_completion_timer); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) WMA_LOGE("Failed to stop the log completion timeout"); cds_logging_set_fw_flush_complete(); } else if (reason_code && cds_is_log_report_in_progress() == false) { @@ -2331,10 +2332,10 @@ static int wma_flush_complete_evt_handler(void *handle, status = cds_set_log_completion(WLAN_LOG_TYPE_FATAL, WLAN_LOG_INDICATOR_FIRMWARE, reason_code); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { WMA_LOGE("%s: Failed to set log trigger params", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cds_logging_set_fw_flush_complete(); return status; @@ -2345,7 +2346,7 @@ static int wma_flush_complete_evt_handler(void *handle, WMA_LOGI("%s: Bug report already in progress - dropping! type:%d, indicator=%d reason_code=%d", __func__, WLAN_LOG_TYPE_FATAL, WLAN_LOG_INDICATOR_FIRMWARE, reason_code); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } return 0; } @@ -2377,7 +2378,7 @@ static int wma_soc_set_hw_mode_resp_evt_handler(void *handle, /* Since WMA handle itself is NULL, we cannot send fail * response back to LIM here */ - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } hw_mode_resp = cdf_mem_malloc(sizeof(*hw_mode_resp)); @@ -2386,7 +2387,7 @@ static int wma_soc_set_hw_mode_resp_evt_handler(void *handle, /* Since this memory allocation itself failed, we cannot * send fail response back to LIM here */ - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } param_buf = (WMI_SOC_SET_HW_MODE_RESP_EVENTID_param_tlvs *) event; @@ -2440,7 +2441,7 @@ static int wma_soc_set_hw_mode_resp_evt_handler(void *handle, wma_send_msg(wma, SIR_HAL_SOC_SET_HW_MODE_RESP, (void *) hw_mode_resp, 0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; fail: WMA_LOGE("%s: Sending fail response to LIM", __func__); @@ -2450,7 +2451,7 @@ fail: wma_send_msg(wma, SIR_HAL_SOC_SET_HW_MODE_RESP, (void *) hw_mode_resp, 0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -2480,20 +2481,20 @@ static int wma_soc_hw_mode_transition_evt_handler(void *handle, if (!wma) { /* This is an async event. So, not sending any event to LIM */ WMA_LOGE("Invalid WMA handle"); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } param_buf = (WMI_SOC_HW_MODE_TRANSITION_EVENTID_param_tlvs *) event; if (!param_buf) { /* This is an async event. So, not sending any event to LIM */ WMA_LOGE("Invalid WMI_SOC_HW_MODE_TRANSITION_EVENTID event"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } hw_mode_trans_ind = cdf_mem_malloc(sizeof(*hw_mode_trans_ind)); if (!hw_mode_trans_ind) { WMA_LOGI("%s: Memory allocation failed", __func__); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } wmi_event = param_buf->fixed_param; @@ -2532,7 +2533,7 @@ static int wma_soc_hw_mode_transition_evt_handler(void *handle, wma_send_msg(wma, SIR_HAL_SOC_HW_MODE_TRANS_IND, (void *) hw_mode_trans_ind, 0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2563,7 +2564,7 @@ static int wma_soc_set_dual_mode_config_resp_evt_handler(void *handle, /* Since the WMA handle is NULL, we cannot send resp to LIM. * So, returning from here. */ - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } dual_mac_cfg_resp = cdf_mem_malloc(sizeof(*dual_mac_cfg_resp)); @@ -2572,7 +2573,7 @@ static int wma_soc_set_dual_mode_config_resp_evt_handler(void *handle, /* Since the mem alloc failed, we cannot send resp to LIM. * So, returning from here. */ - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } param_buf = (WMI_SOC_SET_DUAL_MAC_CONFIG_RESP_EVENTID_param_tlvs *) @@ -2601,7 +2602,7 @@ static int wma_soc_set_dual_mode_config_resp_evt_handler(void *handle, wma_send_msg(wma, SIR_HAL_SOC_DUAL_MAC_CFG_RESP, (void *) dual_mac_cfg_resp, 0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; fail: WMA_LOGE("%s: Sending fail response to LIM", __func__); @@ -2609,7 +2610,7 @@ fail: wma_send_msg(wma, SIR_HAL_SOC_DUAL_MAC_CFG_RESP, (void *) dual_mac_cfg_resp, 0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } @@ -2620,9 +2621,9 @@ fail: * * Return: 0 on success, CDF Error on failure */ -CDF_STATUS wma_start(void *cds_ctx) +QDF_STATUS wma_start(void *cds_ctx) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle; int status; WMA_LOGD("%s: Enter", __func__); @@ -2632,7 +2633,7 @@ CDF_STATUS wma_start(void *cds_ctx) /* validate the wma_handle */ if (NULL == wma_handle) { WMA_LOGP("%s: Invalid handle", __func__); - cdf_status = CDF_STATUS_E_INVAL; + qdf_status = QDF_STATUS_E_INVAL; goto end; } @@ -2641,7 +2642,7 @@ CDF_STATUS wma_start(void *cds_ctx) wma_scan_event_callback); if (0 != status) { WMA_LOGP("%s: Failed to register scan callback", __func__); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2650,7 +2651,7 @@ CDF_STATUS wma_start(void *cds_ctx) wma_roam_event_callback); if (0 != status) { WMA_LOGP("%s: Failed to register Roam callback", __func__); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2660,7 +2661,7 @@ CDF_STATUS wma_start(void *cds_ctx) if (status) { WMA_LOGP("%s: Failed to register wow wakeup host event handler", __func__); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2670,7 +2671,7 @@ CDF_STATUS wma_start(void *cds_ctx) if (status) { WMA_LOGP("%s: Failed to register PDEV resume event handler", __func__); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2685,7 +2686,7 @@ CDF_STATUS wma_start(void *cds_ctx) wma_nlo_match_evt_handler); if (status) { WMA_LOGE("Failed to register nlo match event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2694,7 +2695,7 @@ CDF_STATUS wma_start(void *cds_ctx) wma_nlo_scan_cmp_evt_handler); if (status) { WMA_LOGE("Failed to register nlo scan comp event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } } @@ -2715,7 +2716,7 @@ CDF_STATUS wma_start(void *cds_ctx) wma_channel_avoid_evt_handler); if (status) { WMA_LOGE("Failed to register channel to avoid event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } #endif /* FEATURE_WLAN_CH_AVOID */ @@ -2726,7 +2727,7 @@ CDF_STATUS wma_start(void *cds_ctx) wma_auto_shutdown_event_handler); if (status) { WMA_LOGE("Failed to register WMI Auto shutdown event handler"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } #endif /* FEATURE_WLAN_AUTO_SHUTDOWN */ @@ -2735,18 +2736,18 @@ CDF_STATUS wma_start(void *cds_ctx) wma_thermal_mgmt_evt_handler); if (status) { WMA_LOGE("Failed to register thermal mitigation event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } status = wma_ocb_register_event_handlers(wma_handle); if (status) { WMA_LOGE("Failed to register ocb event handlers"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } - cdf_status = CDF_STATUS_SUCCESS; + qdf_status = QDF_STATUS_SUCCESS; #ifdef QCA_WIFI_FTM /* @@ -2757,18 +2758,18 @@ CDF_STATUS wma_start(void *cds_ctx) goto end; #endif /* QCA_WIFI_FTM */ - cdf_status = wma_tx_attach(wma_handle); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_tx_attach(wma_handle); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: Failed to register tx management", __func__); goto end; } /* Initialize log completion timeout */ - cdf_status = cdf_mc_timer_init(&wma_handle->log_completion_timer, + qdf_status = cdf_mc_timer_init(&wma_handle->log_completion_timer, CDF_TIMER_TYPE_SW, wma_log_completion_timeout, wma_handle); - if (cdf_status != CDF_STATUS_SUCCESS) { + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to initialize log completion timeout"); goto end; } @@ -2777,9 +2778,9 @@ CDF_STATUS wma_start(void *cds_ctx) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_PDEV_TEMPERATURE_EVENTID, wma_pdev_temperature_evt_handler); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register get_temperature event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2787,9 +2788,9 @@ CDF_STATUS wma_start(void *cds_ctx) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_DEBUG_MESG_FLUSH_COMPLETE_EVENTID, wma_flush_complete_evt_handler); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register log flush complete event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2797,9 +2798,9 @@ CDF_STATUS wma_start(void *cds_ctx) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_SOC_SET_HW_MODE_RESP_EVENTID, wma_soc_set_hw_mode_resp_evt_handler); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register set hw mode resp event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2807,9 +2808,9 @@ CDF_STATUS wma_start(void *cds_ctx) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_SOC_HW_MODE_TRANSITION_EVENTID, wma_soc_hw_mode_transition_evt_handler); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register hw mode transition event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2817,15 +2818,15 @@ CDF_STATUS wma_start(void *cds_ctx) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_SOC_SET_DUAL_MAC_CONFIG_RESP_EVENTID, wma_soc_set_dual_mode_config_resp_evt_handler); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register hw mode transition event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } end: WMA_LOGD("%s: Exit", __func__); - return cdf_status; + return qdf_status; } /** @@ -2836,10 +2837,10 @@ end: * * Return: 0 on success, CDF Error on failure */ -CDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) +QDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) { tp_wma_handle wma_handle; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int i; wma_handle = cds_get_context(CDF_MODULE_ID_WMA); @@ -2848,7 +2849,7 @@ CDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) /* validate the wma_handle */ if (NULL == wma_handle) { WMA_LOGP("%s: Invalid handle", __func__); - cdf_status = CDF_STATUS_E_INVAL; + qdf_status = QDF_STATUS_E_INVAL; goto end; } #ifdef QCA_WIFI_FTM @@ -2857,7 +2858,7 @@ CDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) * in FTM mode. So skip the TX mgmt detach. */ if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) { - cdf_status = CDF_STATUS_SUCCESS; + qdf_status = QDF_STATUS_SUCCESS; goto end; } #endif /* QCA_WIFI_FTM */ @@ -2869,8 +2870,8 @@ CDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) } /* Destroy the timer for log completion */ - cdf_status = cdf_mc_timer_destroy(&wma_handle->log_completion_timer); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = cdf_mc_timer_destroy(&wma_handle->log_completion_timer); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to destroy the log completion timer"); } @@ -2894,15 +2895,15 @@ CDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) ol_txrx_vdev_flush(wma_handle->interfaces[i].handle); } } - cdf_status = wma_tx_detach(wma_handle); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_tx_detach(wma_handle); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: Failed to deregister tx management", __func__); goto end; } end: WMA_LOGD("%s: Exit", __func__); - return cdf_status; + return qdf_status; } /** @@ -2981,7 +2982,7 @@ static void wma_cleanup_vdev_resp(tp_wma_handle wma) * * Return: 0 on success, CDF Error on failure */ -CDF_STATUS wma_wmi_service_close(void *cds_ctx) +QDF_STATUS wma_wmi_service_close(void *cds_ctx) { tp_wma_handle wma_handle; struct beacon_info *bcn; @@ -2994,13 +2995,13 @@ CDF_STATUS wma_wmi_service_close(void *cds_ctx) /* validate the wma_handle */ if (NULL == wma_handle) { WMA_LOGE("%s: Invalid wma handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* validate the wmi handle */ if (NULL == wma_handle->wmi_handle) { WMA_LOGE("%s: Invalid wmi handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* dettach the wmi serice */ @@ -3044,7 +3045,7 @@ CDF_STATUS wma_wmi_service_close(void *cds_ctx) cdf_mem_free(((p_cds_contextType) cds_ctx)->cfg_ctx); WMA_LOGD("%s: Exit", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3054,10 +3055,10 @@ CDF_STATUS wma_wmi_service_close(void *cds_ctx) * This function closes work queue items associated with WMI, but not fully * closes WMI service. * - * Return: CDF_STATUS_SUCCESS if work close is successful. Otherwise + * Return: QDF_STATUS_SUCCESS if work close is successful. Otherwise * proper error codes. */ -CDF_STATUS wma_wmi_work_close(void *cds_ctx) +QDF_STATUS wma_wmi_work_close(void *cds_ctx) { tp_wma_handle wma_handle; @@ -3068,20 +3069,20 @@ CDF_STATUS wma_wmi_work_close(void *cds_ctx) /* validate the wma_handle */ if (NULL == wma_handle) { WMA_LOGE("%s: Invalid wma handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* validate the wmi handle */ if (NULL == wma_handle->wmi_handle) { WMA_LOGE("%s: Invalid wmi handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* remove the wmi work */ WMA_LOGD("calling wmi_unified_remove_work"); wmi_unified_remove_work(wma_handle->wmi_handle); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -3092,11 +3093,11 @@ CDF_STATUS wma_wmi_work_close(void *cds_ctx) * * Return: 0 on success, CDF Error on failure */ -CDF_STATUS wma_close(void *cds_ctx) +QDF_STATUS wma_close(void *cds_ctx) { tp_wma_handle wma_handle; uint32_t idx; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; WMA_LOGD("%s: Enter", __func__); @@ -3105,13 +3106,13 @@ CDF_STATUS wma_close(void *cds_ctx) /* validate the wma_handle */ if (NULL == wma_handle) { WMA_LOGE("%s: Invalid wma handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* validate the wmi handle */ if (NULL == wma_handle->wmi_handle) { WMA_LOGP("%s: Invalid wmi handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Free DBS list */ @@ -3143,14 +3144,14 @@ CDF_STATUS wma_close(void *cds_ctx) } /* unregister Firmware debug log */ - cdf_status = dbglog_deinit(wma_handle->wmi_handle); - if (cdf_status != CDF_STATUS_SUCCESS) + qdf_status = dbglog_deinit(wma_handle->wmi_handle); + if (qdf_status != QDF_STATUS_SUCCESS) WMA_LOGP("%s: dbglog_deinit failed", __func__); /* close the cdf events */ cdf_event_destroy(&wma_handle->wma_ready_event); - cdf_status = cdf_mc_timer_destroy(&wma_handle->service_ready_ext_timer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + qdf_status = cdf_mc_timer_destroy(&wma_handle->service_ready_ext_timer); + if (!CDF_IS_STATUS_SUCCESS(qdf_status)) WMA_LOGP("%s: Failed to destroy service ready ext event timer", __func__); @@ -3193,7 +3194,7 @@ CDF_STATUS wma_close(void *cds_ctx) } WMA_LOGD("%s: Exit", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3810,7 +3811,7 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) wmi_service_ready_event_fixed_param *ev; int status; uint32_t *ev_wlan_dbs_hw_mode_list; - CDF_STATUS ret; + QDF_STATUS ret; WMA_LOGD("%s: Enter", __func__); @@ -3999,7 +4000,7 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_DIAG_EVENT_LOG_SUPPORTED_EVENTID, wma_log_supported_evt_handler); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register log supported event cb"); return; } @@ -4070,7 +4071,7 @@ void wma_rx_service_ready_ext_event(WMA_HANDLE handle, void *event) WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *param_buf; wmi_service_ready_ext_event_fixed_param *ev; int status; - CDF_STATUS ret; + QDF_STATUS ret; WMA_LOGD("%s: Enter", __func__); @@ -4262,21 +4263,21 @@ bool wma_needshutdown(void *cds_ctx) * * Return: 0 for success or CDF error */ -CDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle) +QDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; /* wait until WMI_READY_EVENTID received from FW */ - cdf_status = cdf_wait_single_event(&(wma_handle->wma_ready_event), + qdf_status = cdf_wait_single_event(&(wma_handle->wma_ready_event), WMA_READY_EVENTID_TIMEOUT); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { WMA_LOGP("%s: Timeout waiting for ready event from FW", __func__); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; } - return cdf_status; + return qdf_status; } /** @@ -4287,7 +4288,7 @@ CDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle) * * Return: 0 for success or CDF error */ -CDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param, +QDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param, int val) { tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); @@ -4296,7 +4297,7 @@ CDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param, if (NULL == wma) { WMA_LOGE("%s: Failed to get wma", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } switch (pps_param) { @@ -4353,7 +4354,7 @@ pkt_pwr_save_config: WMA_LOGE("%s:INVALID PPS CONFIG", __func__); } - return (ret) ? CDF_STATUS_E_FAILURE : CDF_STATUS_SUCCESS; + return (ret) ? QDF_STATUS_E_FAILURE : QDF_STATUS_SUCCESS; } /** @@ -4365,27 +4366,27 @@ pkt_pwr_save_config: * * Return: CDF_SUCCESS for success otherwise failure */ -CDF_STATUS wma_process_set_mas(tp_wma_handle wma, +QDF_STATUS wma_process_set_mas(tp_wma_handle wma, uint32_t *mas_val) { uint32_t val; if (NULL == wma || NULL == mas_val) { WMA_LOGE("%s: Invalid input to enable/disable MAS", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } val = (*mas_val); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wma_set_enable_disable_mcc_adaptive_scheduler(val)) { WMA_LOGE("%s: Unable to enable/disable MAS", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else { WMA_LOGE("%s: Value is %d", __func__, val); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4398,17 +4399,17 @@ CDF_STATUS wma_process_set_mas(tp_wma_handle wma, * Return: CDF_SUCCESS for success otherwise failure * */ -CDF_STATUS wma_process_set_miracast(tp_wma_handle wma, uint32_t *miracast_val) +QDF_STATUS wma_process_set_miracast(tp_wma_handle wma, uint32_t *miracast_val) { if (NULL == wma || NULL == miracast_val) { WMA_LOGE("%s: Invalid input to store miracast value", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->miracast_value = *miracast_val; WMA_LOGE("%s: Miracast value is %d", __func__, wma->miracast_value); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4418,17 +4419,17 @@ CDF_STATUS wma_process_set_miracast(tp_wma_handle wma, uint32_t *miracast_val) * * This function configures the avg. stats value in firmware * - * Return: CDF_STATUS_SUCCESS for success otherwise failure + * Return: QDF_STATUS_SUCCESS for success otherwise failure * */ -static CDF_STATUS wma_config_stats_factor(tp_wma_handle wma, +static QDF_STATUS wma_config_stats_factor(tp_wma_handle wma, struct sir_stats_avg_factor *avg_factor) { int ret; if (NULL == wma || NULL == avg_factor) { WMA_LOGE("%s: Invalid input of stats avg factor", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, @@ -4453,17 +4454,17 @@ static CDF_STATUS wma_config_stats_factor(tp_wma_handle wma, * * This function configures the guard time in firmware * - * Return: CDF_STATUS_SUCCESS for success otherwise failure + * Return: QDF_STATUS_SUCCESS for success otherwise failure * */ -static CDF_STATUS wma_config_guard_time(tp_wma_handle wma, +static QDF_STATUS wma_config_guard_time(tp_wma_handle wma, struct sir_guard_time_request *guard_time) { int ret; if (NULL == wma || NULL == guard_time) { WMA_LOGE("%s: Invalid input of guard time", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, @@ -4650,7 +4651,7 @@ void wma_set_wifi_start_packet_stats(void *wma_handle, */ void wma_send_flush_logs_to_fw(tp_wma_handle wma_handle) { - CDF_STATUS status; + QDF_STATUS status; wmi_debug_mesg_flush_fixed_param *cmd; wmi_buf_t buf; int len = sizeof(*cmd); @@ -4682,7 +4683,7 @@ void wma_send_flush_logs_to_fw(tp_wma_handle wma_handle) status = cdf_mc_timer_start(&wma_handle->log_completion_timer, WMA_LOG_COMPLETION_TIMER); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) WMA_LOGE("Failed to start the log completion timer"); } @@ -4693,9 +4694,9 @@ void wma_send_flush_logs_to_fw(tp_wma_handle wma_handle) * * Return: CDF_SUCCESS for success otherwise failure */ -CDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) +QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle; ol_txrx_vdev_handle txrx_vdev_handle = NULL; extern uint8_t *mac_trace_get_wma_msg_string(uint16_t wmaMsg); @@ -4704,7 +4705,7 @@ CDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) if (NULL == msg) { WMA_LOGE("msg is NULL"); CDF_ASSERT(0); - cdf_status = CDF_STATUS_E_INVAL; + qdf_status = QDF_STATUS_E_INVAL; goto end; } @@ -4717,7 +4718,7 @@ CDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) WMA_LOGP("%s: wma_handle is NULL", __func__); CDF_ASSERT(0); cdf_mem_free(msg->bodyptr); - cdf_status = CDF_STATUS_E_INVAL; + qdf_status = QDF_STATUS_E_INVAL; goto end; } @@ -4740,8 +4741,8 @@ CDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) #endif /* FEATURE_WLAN_ESE */ case WNI_CFG_DNLD_REQ: WMA_LOGA("McThread: WNI_CFG_DNLD_REQ"); - cdf_status = wma_wni_cfg_dnld(wma_handle); - if (CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_wni_cfg_dnld(wma_handle); + if (CDF_IS_STATUS_SUCCESS(qdf_status)) { cds_wma_complete_cback(cds_context); } else { WMA_LOGD("config download failure"); @@ -5404,7 +5405,7 @@ CDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) } end: WMA_LOGI("%s: Exit", __func__); - return cdf_status; + return qdf_status; } /** @@ -5446,7 +5447,7 @@ void wma_log_completion_timeout(void *data) * * Return: Success if the cmd is sent successfully to the firmware */ -CDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, struct sir_pcl_list *msg) { wmi_soc_set_pcl_cmd_fixed_param *cmd; @@ -5457,7 +5458,7 @@ CDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, if (!wma_handle) { WMA_LOGE("%s: WMA handle is NULL. Cannot issue command", __func__); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } len = sizeof(*cmd) + @@ -5466,7 +5467,7 @@ CDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_soc_set_pcl_cmd_fixed_param *) wmi_buf_data(buf); @@ -5489,9 +5490,9 @@ CDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, WMI_SOC_SET_PCL_CMDID)) { WMA_LOGE("%s: Failed to send WMI_SOC_SET_PCL_CMDID", __func__); cdf_nbuf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5508,7 +5509,7 @@ CDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, * * Return: Success if the cmd is sent successfully to the firmware */ -CDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, struct sir_hw_mode *msg) { wmi_soc_set_hw_mode_cmd_fixed_param *cmd; @@ -5522,7 +5523,7 @@ CDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, /* Handle is NULL. Will not be able to send failure * response as well */ - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } if (!msg) { @@ -5553,12 +5554,12 @@ CDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, cdf_nbuf_free(buf); goto fail; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; fail: param = cdf_mem_malloc(sizeof(*param)); if (!param) { WMA_LOGE("%s: Memory allocation failed", __func__); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } param->status = SET_HW_MODE_STATUS_ECANCELED; param->cfgd_hw_mode_index = 0; @@ -5566,7 +5567,7 @@ fail: WMA_LOGE("%s: Sending HW mode fail response to LIM", __func__); wma_send_msg(wma_handle, SIR_HAL_SOC_SET_HW_MODE_RESP, (void *) param, 0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5576,9 +5577,9 @@ fail: * * Configures WLAN firmware with the dual MAC features * - * Return: CDF_STATUS. 0 on success. + * Return: QDF_STATUS. 0 on success. */ -CDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, +QDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, struct sir_dual_mac_config *msg) { wmi_soc_set_dual_mac_config_cmd_fixed_param *cmd; @@ -5588,12 +5589,12 @@ CDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, if (!wma_handle) { WMA_LOGE("%s: WMA handle is NULL. Cannot issue command", __func__); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } if (!msg) { WMA_LOGE("%s: Set dual mode config is NULL", __func__); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } len = sizeof(*cmd); @@ -5601,7 +5602,7 @@ CDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cmd = (wmi_soc_set_dual_mac_config_cmd_fixed_param *) wmi_buf_data(buf); @@ -5623,7 +5624,7 @@ CDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, __func__); cdf_nbuf_free(buf); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5668,7 +5669,7 @@ int wma_lro_init(struct wma_lro_config_cmd_t *lro_config) msg.reserved = 0; msg.bodyptr = iwcmd; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { WMA_LOGE("Failed to post WMA_LRO_CONFIG_CMD msg!"); cdf_mem_free(iwcmd); diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 94ea484722..e38234eee5 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -90,7 +90,7 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, wmi_tim_info *tim_info = param_buf->tim_info; uint8_t *bcn_payload; wmi_buf_t wmi_buf; - CDF_STATUS ret; + QDF_STATUS ret; struct beacon_tim_ie *tim_ie; wmi_p2p_noa_info *p2p_noa_info = param_buf->p2p_noa_info; struct p2p_sub_element_noa noa_ie; @@ -204,7 +204,7 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, bcn->dma_mapped = 0; } ret = cdf_nbuf_map_single(pdev->osdev, bcn->buf, CDF_DMA_TO_DEVICE); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { cdf_nbuf_free(wmi_buf); WMA_LOGE("%s: failed map beacon buf to DMA region", __func__); cdf_spin_unlock_bh(&bcn->lock); @@ -322,7 +322,7 @@ int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len) return -EINVAL; } - if (ol_txrx_get_vdevid(peer, &vdev_id) != CDF_STATUS_SUCCESS) { + if (ol_txrx_get_vdevid(peer, &vdev_id) != QDF_STATUS_SUCCESS) { WMA_LOGE("Not able to find BSSID for peer [%pM]", macaddr); return -EINVAL; } @@ -1600,7 +1600,7 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) txrx_vdev = wma_find_vdev_by_id(wma_handle, key_info->smesessionId); if (!txrx_vdev) { WMA_LOGE("%s:Invalid vdev handle", __func__); - key_info->status = CDF_STATUS_E_FAILURE; + key_info->status = QDF_STATUS_E_FAILURE; goto out; } @@ -1610,7 +1610,7 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) * STA key is been setup for a peer */ if (wlan_op_mode_ibss == txrx_vdev->opmode) { - key_info->status = CDF_STATUS_SUCCESS; + key_info->status = QDF_STATUS_SUCCESS; if (wma_handle->ibss_started > 0) goto out; WMA_LOGD("Caching IBSS Key"); @@ -1673,7 +1673,7 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) if (!buf) { WMA_LOGE("%s:Failed to setup install key buf", __func__); - key_info->status = CDF_STATUS_E_NOMEM; + key_info->status = QDF_STATUS_E_NOMEM; goto out; } @@ -1683,14 +1683,14 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) cdf_nbuf_free(buf); WMA_LOGE("%s:Failed to send install key command", __func__); - key_info->status = CDF_STATUS_E_FAILURE; + key_info->status = QDF_STATUS_E_FAILURE; goto out; } } wma_handle->ibss_started++; /* TODO: Should we wait till we get HTT_T2H_MSG_TYPE_SEC_IND? */ - key_info->status = CDF_STATUS_SUCCESS; + key_info->status = QDF_STATUS_SUCCESS; out: wma_send_msg(wma_handle, WMA_SET_BSSKEY_RSP, (void *)key_info, 0); @@ -1819,7 +1819,7 @@ static void wma_set_ibsskey_helper(tp_wma_handle wma_handle, txrx_vdev = wma_find_vdev_by_id(wma_handle, key_info->smesessionId); if (!txrx_vdev) { WMA_LOGE("%s:Invalid vdev handle", __func__); - key_info->status = CDF_STATUS_E_FAILURE; + key_info->status = QDF_STATUS_E_FAILURE; return; } @@ -1907,7 +1907,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) txrx_pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (!txrx_pdev) { WMA_LOGE("%s:Invalid txrx pdev handle", __func__); - key_info->status = CDF_STATUS_E_FAILURE; + key_info->status = QDF_STATUS_E_FAILURE; goto out; } @@ -1916,14 +1916,14 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) &peer_id); if (!peer) { WMA_LOGE("%s:Invalid peer for key setting", __func__); - key_info->status = CDF_STATUS_E_FAILURE; + key_info->status = QDF_STATUS_E_FAILURE; goto out; } txrx_vdev = wma_find_vdev_by_id(wma_handle, key_info->smesessionId); if (!txrx_vdev) { WMA_LOGE("%s:TxRx Vdev Handle is NULL", __func__); - key_info->status = CDF_STATUS_E_FAILURE; + key_info->status = QDF_STATUS_E_FAILURE; goto out; } @@ -1981,7 +1981,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) if (!buf) { WMA_LOGE("%s:Failed to setup install key buf", __func__); - key_info->status = CDF_STATUS_E_NOMEM; + key_info->status = QDF_STATUS_E_NOMEM; goto out; } @@ -1994,7 +1994,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) cdf_nbuf_free(buf); WMA_LOGE("%s:Failed to send install key command", __func__); - key_info->status = CDF_STATUS_E_FAILURE; + key_info->status = QDF_STATUS_E_FAILURE; goto out; } } @@ -2008,7 +2008,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) } /* TODO: Should we wait till we get HTT_T2H_MSG_TYPE_SEC_IND? */ - key_info->status = CDF_STATUS_SUCCESS; + key_info->status = QDF_STATUS_SUCCESS; out: if (key_info->sendRsp) wma_send_msg(wma_handle, WMA_SET_STAKEY_RSP, (void *)key_info, @@ -2024,7 +2024,7 @@ out: * * Return: CDF Status */ -CDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, +QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, tEdcaParams *edca_params) { tp_wma_handle wma_handle = (tp_wma_handle) handle; @@ -2042,7 +2042,7 @@ CDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, if (!buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -2092,12 +2092,12 @@ CDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, else CDF_ASSERT(0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; fail: wmi_buf_free(buf); WMA_LOGE("%s: Failed to set WMM Paremeters", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -2297,7 +2297,7 @@ static int wmi_unified_bcn_tmpl_send(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id, +QDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id, tpSendbeaconParams bcn_info) { struct beacon_info *bcn; @@ -2309,14 +2309,14 @@ CDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id, if (!bcn || !bcn->buf) { WMA_LOGE("%s: Memory is not allocated to hold bcn template", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } len = *(u32 *) &bcn_info->beacon[0]; if (len > WMA_BCN_BUF_MAX_SIZE) { WMA_LOGE("%s: Received beacon len %d exceeding max limit %d", __func__, len, WMA_BCN_BUF_MAX_SIZE); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } WMA_LOGD("%s: Storing received beacon template buf to local buffer", __func__); @@ -2360,7 +2360,7 @@ CDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id, cdf_spin_unlock_bh(&bcn->lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2565,7 +2565,7 @@ void wma_send_beacon(tp_wma_handle wma, tpSendbeaconParams bcn_info) { ol_txrx_vdev_handle vdev; uint8_t vdev_id; - CDF_STATUS status; + QDF_STATUS status; uint8_t *p2p_ie; tpAniBeaconStruct beacon; @@ -2599,7 +2599,7 @@ void wma_send_beacon(tp_wma_handle wma, tpSendbeaconParams bcn_info) } } status = wma_store_bcn_tmpl(wma, vdev_id, bcn_info); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s : wma_store_bcn_tmpl Failed", __func__); return; } @@ -2810,14 +2810,14 @@ void wma_process_update_userpos(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value) +QDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value) { tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); int ret = -EIO; if (NULL == wma) { WMA_LOGE("%s: Failed to get wma", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } switch (ht_capab) { @@ -2849,7 +2849,7 @@ CDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value) WMA_LOGE("%s:INVALID HT CONFIG", __func__); } - return (ret) ? CDF_STATUS_E_FAILURE : CDF_STATUS_SUCCESS; + return (ret) ? QDF_STATUS_E_FAILURE : QDF_STATUS_SUCCESS; } /** @@ -3306,28 +3306,28 @@ static int wma_mgmt_rx_process(void *handle, uint8_t *data, * * Return: CDF status */ -CDF_STATUS wma_de_register_mgmt_frm_client(void *cds_ctx) +QDF_STATUS wma_de_register_mgmt_frm_client(void *cds_ctx) { tp_wma_handle wma_handle; #ifdef QCA_WIFI_FTM if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; #endif wma_handle = cds_get_context(CDF_MODULE_ID_WMA); if (!wma_handle) { WMA_LOGE("%s: Failed to get WMA context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wmi_unified_unregister_event_handler(wma_handle->wmi_handle, WMI_MGMT_RX_EVENTID) != 0) { WMA_LOGE("Failed to Unregister rx mgmt handler with wmi"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_handle->mgmt_rx = NULL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3341,11 +3341,11 @@ CDF_STATUS wma_de_register_mgmt_frm_client(void *cds_ctx) * * Return: Success or Failure Status */ -CDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, +QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, void (*csr_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr, uint8_t reason), - CDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, + QDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr)) { @@ -3354,12 +3354,12 @@ CDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, if (!wma) { WMA_LOGE("%s: Failed to get WMA context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->csr_roam_synch_cb = csr_roam_synch_cb; wma->pe_roam_synch_cb = pe_roam_synch_cb; WMA_LOGD("Registered roam synch callbacks with WMA successfully"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** * wma_register_mgmt_frm_client() - register management frame callback @@ -3368,23 +3368,23 @@ CDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, * * Return: CDF status */ -CDF_STATUS wma_register_mgmt_frm_client( +QDF_STATUS wma_register_mgmt_frm_client( void *cds_ctx, wma_mgmt_frame_rx_callback mgmt_frm_rx) { tp_wma_handle wma_handle = cds_get_context(CDF_MODULE_ID_WMA); if (!wma_handle) { WMA_LOGE("%s: Failed to get WMA context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_MGMT_RX_EVENTID, wma_mgmt_rx_process) != 0) { WMA_LOGE("Failed to register rx mgmt handler with wmi"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_handle->mgmt_rx = mgmt_frm_rx; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } diff --git a/core/wma/src/wma_ocb.c b/core/wma/src/wma_ocb.c index 260a8273b4..1bc71f8ae1 100644 --- a/core/wma/src/wma_ocb.c +++ b/core/wma/src/wma_ocb.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -42,7 +42,7 @@ */ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; struct sir_ocb_set_config_response *resp; cds_msg_t msg = {0}; struct sir_ocb_config *req = wma_handle->ocb_config_req; @@ -53,7 +53,7 @@ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status) * If the command was successful, save the channel information in the * vdev. */ - if (status == CDF_STATUS_SUCCESS && vdev && req) { + if (status == QDF_STATUS_SUCCESS && vdev && req) { if (vdev->ocb_channel_info) cdf_mem_free(vdev->ocb_channel_info); vdev->ocb_channel_count = @@ -93,8 +93,8 @@ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status) msg.type = eWNI_SME_OCB_SET_CONFIG_RSP; msg.bodyptr = resp; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Fail to post msg to SME")); cdf_mem_free(resp); return -EINVAL; @@ -159,7 +159,7 @@ int wma_ocb_set_config_req(tp_wma_handle wma_handle, { struct wma_target_req *msg; struct wma_vdev_start_req req; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* if vdev is not yet up, send vdev start request and wait for response. * OCB set_config request should be sent on receiving @@ -174,7 +174,7 @@ int wma_ocb_set_config_req(tp_wma_handle wma_handle, (void *)config_req, 1000); if (!msg) { WMA_LOGE(FL("Failed to fill vdev req %d"), req.vdev_id); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; return status; } req.chan = cds_freq_to_chan(config_req->channels[0].chan_freq); @@ -191,7 +191,7 @@ int wma_ocb_set_config_req(tp_wma_handle wma_handle, req.preferred_tx_streams = 2; status = wma_vdev_start(wma_handle, &req, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { wma_remove_vdev_req(wma_handle, req.vdev_id, WMA_TARGET_REQ_TYPE_VDEV_START); WMA_LOGE(FL("vdev_start failed, status = %d"), status); @@ -204,15 +204,15 @@ int wma_ocb_set_config_req(tp_wma_handle wma_handle, int wma_ocb_start_resp_ind_cont(tp_wma_handle wma_handle) { - CDF_STATUS cdf_status = 0; + QDF_STATUS qdf_status = 0; if (!wma_handle->ocb_config_req) { WMA_LOGE(FL("The request could not be found")); - return CDF_STATUS_E_EMPTY; + return QDF_STATUS_E_EMPTY; } - cdf_status = wma_ocb_set_config(wma_handle, wma_handle->ocb_config_req); - return cdf_status; + qdf_status = wma_ocb_set_config(wma_handle, wma_handle->ocb_config_req); + return qdf_status; } static WLAN_PHY_MODE wma_ocb_freq_to_mode(uint32_t freq) @@ -626,7 +626,7 @@ int wma_ocb_stop_timing_advert(tp_wma_handle wma_handle, int wma_ocb_get_tsf_timer(tp_wma_handle wma_handle, struct sir_ocb_get_tsf_timer *request) { - CDF_STATUS ret; + QDF_STATUS ret; wmi_ocb_get_tsf_timer_cmd_fixed_param *cmd; uint8_t *buf_ptr; wmi_buf_t buf; @@ -671,7 +671,7 @@ int wma_ocb_get_tsf_timer(tp_wma_handle wma_handle, int wma_ocb_get_tsf_timer_resp_event_handler(void *handle, uint8_t *event_buf, uint32_t len) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; struct sir_ocb_get_tsf_timer_response *response; WMI_OCB_GET_TSF_TIMER_RESP_EVENTID_param_tlvs *param_tlvs; wmi_ocb_get_tsf_timer_resp_event_fixed_param *fix_param; @@ -691,8 +691,8 @@ int wma_ocb_get_tsf_timer_resp_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_OCB_GET_TSF_TIMER_RSP; msg.bodyptr = response; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(response); return -EINVAL; @@ -733,7 +733,7 @@ int wma_dcc_get_stats(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE(FL("wmi_buf_alloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = wmi_buf_data(buf); @@ -787,7 +787,7 @@ int wma_dcc_get_stats(tp_wma_handle wma_handle, int wma_dcc_get_stats_resp_event_handler(void *handle, uint8_t *event_buf, uint32_t len) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; struct sir_dcc_get_stats_response *response; WMI_DCC_GET_STATS_RESP_EVENTID_param_tlvs *param_tlvs; wmi_dcc_get_stats_resp_event_fixed_param *fix_param; @@ -814,8 +814,8 @@ int wma_dcc_get_stats_resp_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_DCC_GET_STATS_RSP; msg.bodyptr = response; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(response); return -EINVAL; @@ -884,7 +884,7 @@ int wma_dcc_clear_stats(tp_wma_handle wma_handle, int wma_dcc_update_ndl(tp_wma_handle wma_handle, struct sir_dcc_update_ndl *update_ndl_param) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; wmi_dcc_update_ndl_cmd_fixed_param *cmd; wmi_dcc_ndl_chan *ndl_chan_array; wmi_dcc_ndl_active_state_config *ndl_active_state_array; @@ -898,7 +898,7 @@ int wma_dcc_update_ndl(tp_wma_handle wma_handle, if (update_ndl_param->dcc_ndl_chan_list_len != update_ndl_param->channel_count * sizeof(*ndl_chan_array)) { WMA_LOGE(FL("Invalid parameter")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } active_state_count = 0; ndl_chan_array = update_ndl_param->dcc_ndl_chan_list; @@ -908,7 +908,7 @@ int wma_dcc_update_ndl(tp_wma_handle wma_handle, if (update_ndl_param->dcc_ndl_active_state_list_len != active_state_count * sizeof(*ndl_active_state_array)) { WMA_LOGE(FL("Invalid parameter")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Allocate memory for the WMI command */ @@ -968,11 +968,11 @@ int wma_dcc_update_ndl(tp_wma_handle wma_handle, buf_ptr += update_ndl_param->dcc_ndl_active_state_list_len; /* Send the WMI command */ - cdf_status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, + qdf_status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, WMI_DCC_UPDATE_NDL_CMDID); /* If there is an error, set the completion event */ - if (cdf_status) { - WMA_LOGE(FL("Failed to send WMI message: %d"), cdf_status); + if (qdf_status) { + WMA_LOGE(FL("Failed to send WMI message: %d"), qdf_status); wmi_buf_free(buf); return -EIO; } @@ -992,7 +992,7 @@ int wma_dcc_update_ndl(tp_wma_handle wma_handle, int wma_dcc_update_ndl_resp_event_handler(void *handle, uint8_t *event_buf, uint32_t len) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; struct sir_dcc_update_ndl_response *resp; WMI_DCC_UPDATE_NDL_RESP_EVENTID_param_tlvs *param_tlvs; wmi_dcc_update_ndl_resp_event_fixed_param *fix_param; @@ -1012,8 +1012,8 @@ int wma_dcc_update_ndl_resp_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_DCC_UPDATE_NDL_RSP; msg.bodyptr = resp; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(resp); return -EINVAL; @@ -1033,7 +1033,7 @@ int wma_dcc_update_ndl_resp_event_handler(void *handle, uint8_t *event_buf, int wma_dcc_stats_event_handler(void *handle, uint8_t *event_buf, uint32_t len) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; struct sir_dcc_get_stats_response *response; WMI_DCC_STATS_EVENTID_param_tlvs *param_tlvs; wmi_dcc_stats_event_fixed_param *fix_param; @@ -1058,8 +1058,8 @@ int wma_dcc_stats_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_DCC_STATS_EVENT; msg.bodyptr = response; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(response); return -EINVAL; @@ -1118,5 +1118,5 @@ int wma_ocb_register_event_handlers(tp_wma_handle wma_handle) if (status) return status; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c index b8f855a53c..846e9e7878 100644 --- a/core/wma/src/wma_power.c +++ b/core/wma/src/wma_power.c @@ -170,7 +170,7 @@ int32_t wmi_unified_set_sta_ps_param(wmi_unified_t wmi_handle, * * Return: 0 for success or error code. */ -CDF_STATUS +QDF_STATUS wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) { int ret; @@ -181,7 +181,7 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed to set WMI_VDEV_PARAM_ATIM_WINDOW_LENGTH ret = %d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, @@ -190,7 +190,7 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_IS_IBSS_POWER_SAVE_ALLOWED ret=%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, @@ -199,7 +199,7 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_IS_POWER_COLLAPSE_ALLOWED ret=%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, @@ -208,7 +208,7 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_IS_AWAKE_ON_TXRX_ENABLED ret=%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, @@ -217,7 +217,7 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_INACTIVITY_CNT ret=%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, @@ -226,7 +226,7 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_TXSP_END_INACTIVITY_TIME_MS ret=%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, @@ -235,7 +235,7 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_IBSS_PS_WARMUP_TIME_SECS ret=%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, @@ -244,10 +244,10 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed to set IBSS_PS_1RX_CHAIN_IN_ATIM_WINDOW_ENABLE ret=%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* QCA_IBSS_SUPPORT */ @@ -1209,9 +1209,9 @@ wmi_unified_set_sta_uapsd_auto_trig_cmd(wmi_unified_t wmi_handle, * trigger frames periodically when there * is no traffic on the transmit side. * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, +QDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, tp_wma_trigger_uapsd_params trigger_uapsd_params) { @@ -1232,7 +1232,7 @@ CDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, !WMI_SERVICE_IS_ENABLED(wma_handle->wmi_service_bitmap, WMI_STA_UAPSD_VAR_AUTO_TRIG)) { WMA_LOGD("Trigger uapsd is not supported vdev id %d", vdev_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } uapsd_trigger_param.wmm_ac = trigger_uapsd_params->wmm_ac; @@ -1250,9 +1250,9 @@ CDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, if (ret) { WMA_LOGE("Fail to send uapsd param cmd for vdevid %d ret = %d", ret, vdev_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1261,9 +1261,9 @@ CDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, * @vdev_id: vdev id * @ac: access category * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, +QDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, uint32_t vdev_id, enum uapsd_ac ac) { int32_t ret; @@ -1300,7 +1300,7 @@ CDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, break; default: WMA_LOGE("Invalid AC vdevId %d ac %d", vdev_id, ac); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* @@ -1319,7 +1319,7 @@ CDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, if (ret) { WMA_LOGE("Fail to send auto trig cmd for vdevid %d ret = %d", ret, vdev_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_set_sta_ps_param(wma_handle->wmi_handle, vdev_id, @@ -1328,20 +1328,20 @@ CDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, if (ret) { WMA_LOGE("Disable Uapsd per ac Failed vdevId %d ac %d", vdev_id, ac); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Disable Uapsd per ac vdevId %d val %d", vdev_id, iface->uapsd_cached_val); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** * wma_get_temperature() - get pdev temperature req * @wmi_handle: wma handle * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_get_temperature(tp_wma_handle wma_handle) +QDF_STATUS wma_get_temperature(tp_wma_handle wma_handle) { wmi_pdev_get_temperature_cmd_fixed_param *cmd; wmi_buf_t wmi_buf; @@ -1350,13 +1350,13 @@ CDF_STATUS wma_get_temperature(tp_wma_handle wma_handle) if (!wma_handle) { WMA_LOGE(FL("WMA is closed, can not issue cmd")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!wmi_buf) { WMA_LOGE(FL("wmi_buf_alloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -1371,9 +1371,9 @@ CDF_STATUS wma_get_temperature(tp_wma_handle wma_handle) WMI_PDEV_GET_TEMPERATURE_CMDID)) { WMA_LOGE(FL("failed to send get temperature command")); wmi_buf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1387,7 +1387,7 @@ CDF_STATUS wma_get_temperature(tp_wma_handle wma_handle) int wma_pdev_temperature_evt_handler(void *handle, uint8_t *event, uint32_t len) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = { 0 }; WMI_PDEV_TEMPERATURE_EVENTID_param_tlvs *param_buf; wmi_pdev_temperature_event_fixed_param *wmi_event; @@ -1405,8 +1405,8 @@ int wma_pdev_temperature_evt_handler(void *handle, uint8_t *event, sme_msg.bodyptr = NULL; sme_msg.bodyval = wmi_event->value; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Fail to post get temperature ind msg")); } @@ -1418,9 +1418,9 @@ int wma_pdev_temperature_evt_handler(void *handle, uint8_t *event, * @handle: wma handle * @ptxlim: power limit value * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_process_tx_power_limits(WMA_HANDLE handle, +QDF_STATUS wma_process_tx_power_limits(WMA_HANDLE handle, tSirTxPowerLimit *ptxlim) { tp_wma_handle wma = (tp_wma_handle) handle; @@ -1431,7 +1431,7 @@ CDF_STATUS wma_process_tx_power_limits(WMA_HANDLE handle, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue tx power limit", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Set value and reason code for 2g and 5g power limit */ @@ -1451,16 +1451,16 @@ CDF_STATUS wma_process_tx_power_limits(WMA_HANDLE handle, txpower_params2g); if (ret) { WMA_LOGE("%s: Failed to set txpower 2g (%d)", __func__, ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_pdev_set_param(wma->wmi_handle, WMI_PDEV_PARAM_TXPOWER_LIMIT5G, txpower_params5g); if (ret) { WMA_LOGE("%s: Failed to set txpower 5g (%d)", __func__, ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1909,11 +1909,11 @@ void wma_process_set_mimops_req(tp_wma_handle wma_handle, * @vdev_id: vdev id * @value: value * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_set_mimops(tp_wma_handle wma, uint8_t vdev_id, int value) +QDF_STATUS wma_set_mimops(tp_wma_handle wma, uint8_t vdev_id, int value) { - int ret = CDF_STATUS_SUCCESS; + int ret = QDF_STATUS_SUCCESS; wmi_sta_smps_force_mode_cmd_fixed_param *cmd; wmi_buf_t buf; uint16_t len = sizeof(*cmd); @@ -1946,7 +1946,7 @@ CDF_STATUS wma_set_mimops(tp_wma_handle wma, uint8_t vdev_id, int value) break; default: WMA_LOGE("%s:INVALID Mimo PS CONFIG", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Setting vdev %d value = %u", vdev_id, value); @@ -1966,9 +1966,9 @@ CDF_STATUS wma_set_mimops(tp_wma_handle wma, uint8_t vdev_id, int value) * @wma_ptr: wma handle * @pReq: modem power state * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_notify_modem_power_state(void *wma_ptr, +QDF_STATUS wma_notify_modem_power_state(void *wma_ptr, tSirModemPowerStateInd *pReq) { int32_t ret; @@ -1980,11 +1980,11 @@ CDF_STATUS wma_notify_modem_power_state(void *wma_ptr, if (ret) { WMA_LOGE("%s: Fail to notify Modem Power State %d", __func__, pReq->param); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Successfully notify Modem Power State %d", pReq->param); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1992,9 +1992,9 @@ CDF_STATUS wma_notify_modem_power_state(void *wma_ptr, * @wma_ptr: wma handle * @idle_ps: idle powersave * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_set_idle_ps_config(void *wma_ptr, uint32_t idle_ps) +QDF_STATUS wma_set_idle_ps_config(void *wma_ptr, uint32_t idle_ps) { int32_t ret; tp_wma_handle wma = (tp_wma_handle) wma_ptr; @@ -2007,11 +2007,11 @@ CDF_STATUS wma_set_idle_ps_config(void *wma_ptr, uint32_t idle_ps) idle_ps); if (ret) { WMA_LOGE("Fail to Set Idle Ps Config %d", idle_ps); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Successfully Set Idle Ps Config %d", idle_ps); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2020,12 +2020,12 @@ CDF_STATUS wma_set_idle_ps_config(void *wma_ptr, uint32_t idle_ps) * @vdev_id: vdev id * @value: value * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_set_smps_params(tp_wma_handle wma, uint8_t vdev_id, +QDF_STATUS wma_set_smps_params(tp_wma_handle wma, uint8_t vdev_id, int value) { - int ret = CDF_STATUS_SUCCESS; + int ret = QDF_STATUS_SUCCESS; wmi_sta_smps_param_cmd_fixed_param *cmd; wmi_buf_t buf; uint16_t len = sizeof(*cmd); @@ -2257,21 +2257,21 @@ void wma_set_resume_dtim(tp_wma_handle wma) * @vdev_id: vdev id * @value: value * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_set_tx_power_scale(uint8_t vdev_id, int value) +QDF_STATUS wma_set_tx_power_scale(uint8_t vdev_id, int value) { - int ret = CDF_STATUS_SUCCESS; + int ret = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle = (tp_wma_handle)cds_get_context(CDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGE("%s: wma_handle is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!(wma_handle->interfaces[vdev_id].vdev_up)) { WMA_LOGE("%s: vdev id %d is not up", __func__, vdev_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, vdev_id, @@ -2287,21 +2287,21 @@ CDF_STATUS wma_set_tx_power_scale(uint8_t vdev_id, int value) * @vdev_id: vdev id * @value: value * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_set_tx_power_scale_decr_db(uint8_t vdev_id, int value) +QDF_STATUS wma_set_tx_power_scale_decr_db(uint8_t vdev_id, int value) { - int ret = CDF_STATUS_SUCCESS; + int ret = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle = (tp_wma_handle)cds_get_context(CDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGE("%s: wma_handle is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!(wma_handle->interfaces[vdev_id].vdev_up)) { WMA_LOGE("%s: vdev id %d is not up", __func__, vdev_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, vdev_id, diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 7b1291c44b..66920c89d4 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -173,7 +173,7 @@ static bool wma_is_mcc_24G(WMA_HANDLE handle) * * Return: CDF status */ -CDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, tSirScanOffloadReq *scan_req, wmi_buf_t *buf, int *buf_len) { @@ -182,7 +182,7 @@ CDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, wmi_mac_addr *bssid; wmi_ssid *ssid = NULL; uint32_t *tmp_ptr, ie_len_with_pad; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; uint8_t *buf_ptr; uint32_t dwell_time; uint8_t SSID_num; @@ -192,7 +192,7 @@ CDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, if (!pMac) { WMA_LOGP("%s: pMac is NULL!", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len += WMI_TLV_HDR_SIZE; /* Length TLV placeholder for array of uint32_t */ @@ -216,7 +216,7 @@ CDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, if (!*buf) { WMA_LOGP("%s: failed to allocate memory for start scan cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } buf_ptr = (uint8_t *) wmi_buf_data(*buf); @@ -520,11 +520,11 @@ CDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, buf_ptr += WMI_TLV_HDR_SIZE + ie_len_with_pad; *buf_len = len; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: cdf_mem_free(*buf); *buf = NULL; - return cdf_status; + return qdf_status; } /** @@ -538,13 +538,13 @@ error: * * Return: CDF status */ -CDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle, wmi_buf_t *buf, int *buf_len, tAbortScanParams *abort_scan_req) { wmi_stop_scan_cmd_fixed_param *cmd; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; int len = sizeof(*cmd); /* Allocate the memory */ @@ -552,7 +552,7 @@ CDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle, if (!*buf) { WMA_LOGP("%s: failed to allocate memory for stop scan cmd", __func__); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } @@ -567,9 +567,9 @@ CDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle, cmd->req_type = WMI_SCAN_STOP_ONE; *buf_len = len; - cdf_status = CDF_STATUS_SUCCESS; + qdf_status = QDF_STATUS_SUCCESS; error: - return cdf_status; + return qdf_status; } @@ -584,11 +584,11 @@ error: * * Return: CDF status */ -CDF_STATUS wma_start_scan(tp_wma_handle wma_handle, +QDF_STATUS wma_start_scan(tp_wma_handle wma_handle, tSirScanOffloadReq *scan_req, uint16_t msg_type) { uint32_t vdev_id, scan_id; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf = NULL; wmi_start_scan_cmd_fixed_param *cmd; int status = 0; @@ -610,9 +610,9 @@ CDF_STATUS wma_start_scan(tp_wma_handle wma_handle, /* Fill individual elements of wmi_start_scan_req and * TLV for channel list, bssid, ssid etc ... */ - cdf_status = wma_get_buf_start_scan_cmd(wma_handle, scan_req, + qdf_status = wma_get_buf_start_scan_cmd(wma_handle, scan_req, &buf, &len); - if (cdf_status != CDF_STATUS_SUCCESS) { + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to get buffer for start scan cmd"); goto error; } @@ -645,13 +645,13 @@ CDF_STATUS wma_start_scan(tp_wma_handle wma_handle, /* Call the wmi api to request the scan */ if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGI("WMA --> WMI_START_SCAN_CMDID"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: /* Send completion event for only for start scan request */ if (msg_type == WMA_START_SCAN_OFFLOAD_REQ) { @@ -661,7 +661,7 @@ error: if (!scan_event) { WMA_LOGP("%s: Failed to allocate memory for scan rsp", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } memset(scan_event, 0x00, sizeof(*scan_event)); scan_event->event = WMI_SCAN_EVENT_COMPLETED; @@ -673,7 +673,7 @@ error: wma_send_msg(wma_handle, WMA_RX_SCAN_EVENT, (void *)scan_event, 0); } - return cdf_status; + return qdf_status; } /** @@ -685,24 +685,24 @@ error: * * Return: CDF status */ -CDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, +QDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, tAbortScanParams *abort_scan_req) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; wmi_buf_t buf; int status = 0; int len; - cdf_status = wma_get_buf_stop_scan_cmd(wma_handle, &buf, &len, + qdf_status = wma_get_buf_stop_scan_cmd(wma_handle, &buf, &len, abort_scan_req); - if (cdf_status != CDF_STATUS_SUCCESS) { + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to get buffer for stop scan cmd"); goto error1; } if (NULL == buf) { WMA_LOGE("Failed to get buffer for stop scan cmd"); - cdf_status = CDF_STATUS_E_FAULT; + qdf_status = QDF_STATUS_E_FAULT; goto error1; } @@ -712,7 +712,7 @@ CDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_STOP_SCAN_CMDID returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGE("scan_id 0x%x, scan_requestor_id 0x%x, vdev_id %d", @@ -721,12 +721,12 @@ CDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, abort_scan_req->SessionId); WMA_LOGI("WMA --> WMI_STOP_SCAN_CMDID"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: if (buf) cdf_nbuf_free(buf); error1: - return cdf_status; + return qdf_status; } /** @@ -738,12 +738,12 @@ error1: * * Return: CDF status */ -CDF_STATUS wma_update_channel_list(WMA_HANDLE handle, +QDF_STATUS wma_update_channel_list(WMA_HANDLE handle, tSirUpdateChanList *chan_list) { tp_wma_handle wma_handle = (tp_wma_handle) handle; wmi_buf_t buf; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_scan_chan_list_cmd_fixed_param *cmd; int status, i; uint8_t *buf_ptr; @@ -754,7 +754,7 @@ CDF_STATUS wma_update_channel_list(WMA_HANDLE handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("Failed to allocate memory"); - cdf_status = CDF_STATUS_E_NOMEM; + qdf_status = QDF_STATUS_E_NOMEM; goto end; } @@ -819,12 +819,12 @@ CDF_STATUS wma_update_channel_list(WMA_HANDLE handle, WMI_SCAN_CHAN_LIST_CMDID); if (status != EOK) { - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; WMA_LOGE("Failed to send WMI_SCAN_CHAN_LIST_CMDID"); wmi_buf_free(buf); } end: - return cdf_status; + return qdf_status; } @@ -841,13 +841,13 @@ end: * * Return: CDF status */ -CDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, wmi_start_scan_cmd_fixed_param * scan_cmd_fp, tSirRoamOffloadScanReq *roam_req, uint32_t mode, uint32_t vdev_id) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf = NULL; int status = 0; int len; @@ -908,7 +908,7 @@ CDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -1086,16 +1086,16 @@ CDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_SCAN_MODE returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGI("%s: WMA --> WMI_ROAM_SCAN_MODE", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return cdf_status; + return qdf_status; } /** @@ -1107,10 +1107,10 @@ error: * * Return: CDF status */ -CDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf = NULL; int status = 0; int len, rssi_thresh, rssi_thresh_diff; @@ -1140,7 +1140,7 @@ CDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -1233,7 +1233,7 @@ CDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("cmd WMI_ROAM_SCAN_RSSI_THRESHOLD returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } @@ -1242,11 +1242,11 @@ CDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, WMA_LOGI( FL("hirssi_scan max_count=%d, delta=%d, hirssi_upper_bound=%d"), hirssi_scan_max_count, hirssi_scan_delta, hirssi_upper_bound); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return cdf_status; + return qdf_status; } /** @@ -1260,12 +1260,12 @@ error: * * Return: CDF status */ -CDF_STATUS wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, uint32_t scan_period, uint32_t scan_age, uint32_t vdev_id) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf = NULL; int status = 0; int len; @@ -1277,7 +1277,7 @@ CDF_STATUS wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -1296,17 +1296,17 @@ CDF_STATUS wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_SCAN_PERIOD returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGI("%s: WMA --> WMI_ROAM_SCAN_PERIOD roam_scan_period=%d, roam_scan_age=%d", __func__, scan_period, scan_age); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return cdf_status; + return qdf_status; } /** @@ -1320,13 +1320,13 @@ error: * * Return: CDF status */ -CDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, uint32_t vdev_id, int32_t rssi_change_thresh, uint32_t bcn_rssi_weight, uint32_t hirssi_delay_btw_scans) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf = NULL; int status = 0; int len; @@ -1338,7 +1338,7 @@ CDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -1359,18 +1359,18 @@ CDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_SCAN_RSSI_CHANGE_THRESHOLD returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGI(FL("roam_scan_rssi_change_thresh=%d, bcn_rssi_weight=%d"), rssi_change_thresh, bcn_rssi_weight); WMA_LOGI(FL("hirssi_delay_btw_scans=%d"), hirssi_delay_btw_scans); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return cdf_status; + return qdf_status; } /** @@ -1385,12 +1385,12 @@ error: * * Return: CDF status */ -CDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, uint8_t chan_count, uint8_t *chan_list, uint8_t list_type, uint32_t vdev_id) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf = NULL; int status = 0; int len, list_tlv_len; @@ -1402,7 +1402,7 @@ CDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, if (chan_count == 0) { WMA_LOGD("%s : invalid number of channels %d", __func__, chan_count); - return CDF_STATUS_E_EMPTY; + return QDF_STATUS_E_EMPTY; } /* Channel list is a table of 2 TLV's */ list_tlv_len = WMI_TLV_HDR_SIZE + chan_count * sizeof(A_UINT32); @@ -1410,7 +1410,7 @@ CDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -1447,16 +1447,16 @@ CDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_CHAN_LIST returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGI("%s: WMA --> WMI_ROAM_SCAN_CHAN_LIST", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return cdf_status; + return qdf_status; } /** @@ -1800,11 +1800,11 @@ void wma_roam_scan_fill_scan_params(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, wmi_ap_profile *ap_profile_p, uint32_t vdev_id) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf = NULL; int status = 0; int len; @@ -1816,7 +1816,7 @@ CDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -1839,16 +1839,16 @@ CDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_AP_PROFILE returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGI("WMA --> WMI_ROAM_AP_PROFILE and other parameters"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return cdf_status; + return qdf_status; } /** @@ -1863,7 +1863,7 @@ error: * Return: Return success upon succesfully passing the * parameters to the firmware, otherwise failure. */ -CDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req) { wmi_buf_t buf = NULL; @@ -1908,7 +1908,7 @@ CDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, break; default: WMA_LOGD("%s : Roam Filter need not be sent", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; break; } } else { @@ -1926,7 +1926,7 @@ CDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (u_int8_t *) wmi_buf_data(buf); @@ -2000,10 +2000,10 @@ CDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, status); goto error; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -2017,7 +2017,7 @@ error: * * Return: CDF status */ -CDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, A_INT32 first_bcnt, A_UINT32 final_bcnt, uint32_t vdev_id) { @@ -2033,7 +2033,7 @@ CDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_vdev_set_param_send WMI_VDEV_PARAM_BMISS_FIRST_BCNT returned Error %d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, @@ -2043,10 +2043,10 @@ CDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_vdev_set_param_send WMI_VDEV_PARAM_BMISS_FINAL_BCNT returned Error %d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2059,10 +2059,10 @@ CDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, uint32_t command, uint32_t vdev_id) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; wmi_roam_scan_cmd_fixed_param *cmd_fp; wmi_buf_t buf = NULL; int status = 0; @@ -2073,7 +2073,7 @@ CDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -2090,17 +2090,17 @@ CDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_SCAN_CMD returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGI("%s: WMA --> WMI_ROAM_SCAN_CMD", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return cdf_status; + return qdf_status; } /** @@ -2112,10 +2112,10 @@ error: * * Return: CDF status */ -CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_start_scan_cmd_fixed_param scan_params; wmi_ap_profile ap_profile; tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); @@ -2127,7 +2127,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, if (NULL == pMac) { WMA_LOGE("%s: pMac is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!wma_handle->roam_offload_enabled) { @@ -2135,7 +2135,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, * Cannot initialize it in the middle of connection. */ cdf_mem_free(roam_req); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } switch (roam_req->Command) { case ROAM_SCAN_OFFLOAD_START: @@ -2152,15 +2152,15 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, */ wma_handle->suitable_ap_hb_failure = false; - cdf_status = wma_roam_scan_offload_rssi_thresh(wma_handle, + qdf_status = wma_roam_scan_offload_rssi_thresh(wma_handle, roam_req); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; - cdf_status = wma_roam_scan_bmiss_cnt(wma_handle, + qdf_status = wma_roam_scan_bmiss_cnt(wma_handle, roam_req->RoamBmissFirstBcnt, roam_req->RoamBmissFinalBcnt, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; /* Opportunistic scan runs on a timer, value set by @@ -2168,12 +2168,12 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, * cycles. */ if (roam_req->EmptyRefreshScanPeriod > 0) { - cdf_status = + qdf_status = wma_roam_scan_offload_scan_period(wma_handle, roam_req->EmptyRefreshScanPeriod, roam_req->EmptyRefreshScanPeriod * 3, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; mode = WMI_ROAM_SCAN_MODE_PERIODIC; @@ -2191,44 +2191,44 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, * Beacon weight of 14 means average rssi is taken over 14 previous samples + * 2 times the current beacon's rssi. */ - cdf_status = wma_roam_scan_offload_rssi_change(wma_handle, + qdf_status = wma_roam_scan_offload_rssi_change(wma_handle, roam_req->sessionId, roam_req->RoamRescanRssiDiff, roam_req->RoamBeaconRssiWeight, roam_req->hi_rssi_scan_delay); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; wma_roam_scan_fill_ap_profile(wma_handle, pMac, roam_req, &ap_profile); - cdf_status = wma_roam_scan_offload_ap_profile(wma_handle, + qdf_status = wma_roam_scan_offload_ap_profile(wma_handle, &ap_profile, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; - cdf_status = wma_roam_scan_offload_chan_list(wma_handle, + qdf_status = wma_roam_scan_offload_chan_list(wma_handle, roam_req->ConnectedNetwork.ChannelCount, &roam_req->ConnectedNetwork.ChannelCache[0], roam_req->ChannelCacheType, roam_req->sessionId); - if ((cdf_status != CDF_STATUS_SUCCESS) && - (cdf_status != CDF_STATUS_E_EMPTY)) + if ((qdf_status != QDF_STATUS_SUCCESS) && + (qdf_status != QDF_STATUS_E_EMPTY)) break; wma_roam_scan_fill_scan_params(wma_handle, pMac, roam_req, &scan_params); - cdf_status = + qdf_status = wma_roam_scan_offload_mode(wma_handle, &scan_params, roam_req, mode, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; - cdf_status = wma_roam_scan_filter(wma_handle, roam_req); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_roam_scan_filter(wma_handle, roam_req); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("Sending start for roam scan filter failed"); break; } @@ -2240,7 +2240,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, wma_roam_scan_fill_scan_params(wma_handle, pMac, NULL, &scan_params); - cdf_status = wma_roam_scan_offload_mode(wma_handle, + qdf_status = wma_roam_scan_offload_mode(wma_handle, &scan_params, NULL, WMI_ROAM_SCAN_MODE_NONE, @@ -2253,8 +2253,8 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, * send the cleared entries. */ if (!roam_req->middle_of_roaming) { - cdf_status = wma_roam_scan_filter(wma_handle, roam_req); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_roam_scan_filter(wma_handle, roam_req); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("clear for roam scan filter failed"); break; } @@ -2270,7 +2270,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, WMA_LOGE("%s: Alloc failed for scan_offload_rsp", __func__); cdf_mem_free(roam_req); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cds_msg.type = eWNI_SME_ROAM_SCAN_OFFLOAD_RSP; scan_offload_rsp->sessionId = roam_req->sessionId; @@ -2281,7 +2281,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, * Roam_Scan_Offload_Rsp post a dummy rsp msg back to * SME with proper reason code. */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { cdf_mem_free(scan_offload_rsp); @@ -2297,7 +2297,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, /* If roam scan is running, stop that cycle. * It will continue automatically on next trigger. */ - cdf_status = wma_roam_scan_offload_command(wma_handle, + qdf_status = wma_roam_scan_offload_command(wma_handle, WMI_ROAM_SCAN_STOP_CMD, roam_req->sessionId); break; @@ -2322,25 +2322,25 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, wma_handle->suitable_ap_hb_failure = false; wma_roam_scan_fill_scan_params(wma_handle, pMac, roam_req, &scan_params); - cdf_status = + qdf_status = wma_roam_scan_offload_mode(wma_handle, &scan_params, roam_req, WMI_ROAM_SCAN_MODE_NONE, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; if (roam_req->RoamScanOffloadEnabled == false) break; - cdf_status = wma_roam_scan_bmiss_cnt(wma_handle, + qdf_status = wma_roam_scan_bmiss_cnt(wma_handle, roam_req->RoamBmissFirstBcnt, roam_req->RoamBmissFinalBcnt, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; - cdf_status = wma_roam_scan_filter(wma_handle, roam_req); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_roam_scan_filter(wma_handle, roam_req); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("Sending update for roam scan filter failed"); break; } @@ -2350,7 +2350,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, * Runtime (after association) changes to rssi thresholds and * other parameters. */ - cdf_status = wma_roam_scan_offload_chan_list(wma_handle, + qdf_status = wma_roam_scan_offload_chan_list(wma_handle, roam_req->ConnectedNetwork.ChannelCount, &roam_req->ConnectedNetwork.ChannelCache[0], roam_req->ChannelCacheType, @@ -2359,23 +2359,23 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, * Even though the channel list is empty, we can * still go ahead and start Roaming. */ - if ((cdf_status != CDF_STATUS_SUCCESS) && - (cdf_status != CDF_STATUS_E_EMPTY)) + if ((qdf_status != QDF_STATUS_SUCCESS) && + (qdf_status != QDF_STATUS_E_EMPTY)) break; - cdf_status = wma_roam_scan_offload_rssi_thresh(wma_handle, + qdf_status = wma_roam_scan_offload_rssi_thresh(wma_handle, roam_req); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; if (roam_req->EmptyRefreshScanPeriod > 0) { - cdf_status = + qdf_status = wma_roam_scan_offload_scan_period(wma_handle, roam_req->EmptyRefreshScanPeriod, roam_req->EmptyRefreshScanPeriod * 3, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; mode = WMI_ROAM_SCAN_MODE_PERIODIC; @@ -2389,25 +2389,25 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, mode = WMI_ROAM_SCAN_MODE_RSSI_CHANGE; } - cdf_status = wma_roam_scan_offload_rssi_change(wma_handle, + qdf_status = wma_roam_scan_offload_rssi_change(wma_handle, roam_req->sessionId, roam_req->RoamRescanRssiDiff, roam_req->RoamBeaconRssiWeight, roam_req->hi_rssi_scan_delay); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; wma_roam_scan_fill_ap_profile(wma_handle, pMac, roam_req, &ap_profile); - cdf_status = + qdf_status = wma_roam_scan_offload_ap_profile(wma_handle, &ap_profile, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; wma_roam_scan_fill_scan_params(wma_handle, pMac, roam_req, &scan_params); - cdf_status = + qdf_status = wma_roam_scan_offload_mode(wma_handle, &scan_params, roam_req, mode, roam_req->sessionId); @@ -2418,7 +2418,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, break; } cdf_mem_free(roam_req); - return cdf_status; + return qdf_status; } #ifdef WLAN_FEATURE_ROAM_OFFLOAD @@ -2819,7 +2819,7 @@ int wma_rssi_breached_event_handler(void *handle, * * Return: CDF status */ -CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, wmi_roam_offload_tlv_param * roam_offload_params, tSirRoamOffloadScanReq *roam_req) @@ -2844,13 +2844,13 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (!pMac) { WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wlan_cfg_get_int(pMac, WNI_CFG_PRIVACY_ENABLED, &val) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_PRIVACY_ENABLED"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } selfCaps.ess = 1; selfCaps.ibss = 0; @@ -2859,7 +2859,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (wlan_cfg_get_int(pMac, WNI_CFG_SHORT_PREAMBLE, &val) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_SHORT_PREAMBLE"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (val) selfCaps.shortPreamble = 1; @@ -2870,28 +2870,28 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, &val) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (val) selfCaps.shortSlotTime = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_11H_ENABLED, &val) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_11H_ENABLED"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (val) selfCaps.spectrumMgt = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_QOS_ENABLED, &val) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_QOS_ENABLED"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (val) selfCaps.qos = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_APSD_ENABLED, &val) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_APSD_ENABLED"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (val) selfCaps.apsd = 1; @@ -2902,7 +2902,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_BLOCK_ACK_ENABLED"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } selfCaps.delayedBA = (uint16_t) ((val >> WNI_CFG_BLOCK_ACK_ENABLED_DELAYED) & 1); @@ -2915,7 +2915,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_HT_CAP_INFO"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } uHTCapabilityInfo.nCfgValue16 = nCfgValue & 0xFFFF; roam_offload_params->ht_caps_info = @@ -2924,7 +2924,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_HT_AMPDU_PARAMS"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* tSirMacHTParametersInfo */ nCfgValue8 = (uint8_t) nCfgValue; @@ -2936,13 +2936,13 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, &val) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_SUPPORTED_MCS_SET"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wlan_cfg_get_int(pMac, WNI_CFG_EXT_HT_CAP_INFO, &nCfgValue) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_EXT_HT_CAP_INFO"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* uHTCapabilityInfo.extHtCapInfo */ uHTCapabilityInfo.nCfgValue16 = nCfgValue & 0xFFFF; @@ -2952,7 +2952,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (wlan_cfg_get_int(pMac, WNI_CFG_TX_BF_CAP, &nCfgValue) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_TX_BF_CAP"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* tSirMacTxBFCapabilityInfo */ nCfgValue8 = (uint8_t) nCfgValue; @@ -2960,7 +2960,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (wlan_cfg_get_int(pMac, WNI_CFG_AS_CAP, &nCfgValue) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_AS_CAP"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* tSirMacASCapabilityInfo */ nCfgValue8 = (uint8_t) nCfgValue; @@ -2971,7 +2971,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_MAX_SP_LENGTH"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } nCfgValue8 = (uint8_t) nCfgValue; macQosInfoSta.maxSpLen = nCfgValue8; @@ -2987,7 +2987,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, */ roam_offload_params->qos_caps = (*pCfgValue8) & 0xFF; roam_offload_params->wmm_caps = 0x4 & 0xFF; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3075,7 +3075,7 @@ void wma_set_ric_req(tp_wma_handle wma, void *msg, uint8_t is_add_ts) WMA_LOGP("%s: Failed to send vdev Set RIC Req command", __func__); if (is_add_ts) - ((tAddTsParams *) msg)->status = CDF_STATUS_E_FAILURE; + ((tAddTsParams *) msg)->status = QDF_STATUS_E_FAILURE; cdf_nbuf_free(buf); } } @@ -3154,7 +3154,7 @@ static void wma_roam_ho_fail_handler(tp_wma_handle wma, uint32_t vdev_id) { tSirSmeHOFailureInd *ho_failure_ind; cds_msg_t sme_msg = { 0 }; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; ho_failure_ind = cdf_mem_malloc(sizeof(tSirSmeHOFailureInd)); @@ -3167,8 +3167,8 @@ static void wma_roam_ho_fail_handler(tp_wma_handle wma, uint32_t vdev_id) sme_msg.bodyptr = ho_failure_ind; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_HO_FAIL_IND msg to SME"); cdf_mem_free(ho_failure_ind); return; @@ -3233,7 +3233,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) { struct wma_vdev_start_req req; struct wma_target_req *msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t vdev_id, peer_id; ol_txrx_peer_handle peer; ol_txrx_pdev_handle pdev; @@ -3244,13 +3244,13 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) if (!wma_find_vdev_by_addr(wma, params->selfStaMacAddr, &vdev_id)) { WMA_LOGP("%s: Failed to find vdev id for %pM", __func__, params->selfStaMacAddr); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto send_resp; } pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto send_resp; } @@ -3264,7 +3264,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) if (!msg) { WMA_LOGP("%s: Failed to fill channel switch request for vdev %d", __func__, req.vdev_id); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto send_resp; } req.chan = params->channelNumber; @@ -3274,7 +3274,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) req.ch_center_freq_seg1 = params->ch_center_freq_seg1; req.dot11_mode = params->dot11_mode; status = wma_get_current_hw_mode(&hw_mode); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) WMA_LOGE("wma_get_current_hw_mode failed"); if ((params->nss == 2) && !hw_mode.dbs_cap) { @@ -3304,7 +3304,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) status = wma_vdev_start(wma, &req, wma->interfaces[req.vdev_id].is_channel_switch); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { wma_remove_vdev_req(wma, req.vdev_id, WMA_TARGET_REQ_TYPE_VDEV_START); WMA_LOGP("%s: vdev start failed status = %d", __func__, status); @@ -3369,7 +3369,7 @@ void wma_set_pno_channel_prediction(uint8_t *buf_ptr, * This function request FW to start PNO request. * Request: CDF status */ -CDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) +QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) { wmi_nlo_config_cmd_fixed_param *cmd; nlo_configured_parameters *nlo_list; @@ -3399,7 +3399,7 @@ CDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_nlo_config_cmd_fixed_param *) wmi_buf_data(buf); @@ -3497,7 +3497,7 @@ CDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) if (ret) { WMA_LOGE("%s: Failed to send nlo wmi cmd", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->interfaces[pno->sessionId].pno_in_progress = true; @@ -3505,7 +3505,7 @@ CDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) WMA_LOGD("PNO start request sent successfully for vdev %d", pno->sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3517,7 +3517,7 @@ CDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) * * Return: CDF status */ -CDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id) +QDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id) { wmi_nlo_config_cmd_fixed_param *cmd; int32_t len = sizeof(*cmd); @@ -3528,7 +3528,7 @@ CDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id) if (!wma->interfaces[vdev_id].pno_in_progress) { WMA_LOGD("No active pno session found for vdev %d, skip pno stop request", vdev_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } WMA_LOGD("PNO Stop"); @@ -3542,7 +3542,7 @@ CDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_nlo_config_cmd_fixed_param *) wmi_buf_data(buf); @@ -3572,14 +3572,14 @@ CDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id) if (ret) { WMA_LOGE("%s: Failed to send nlo wmi cmd", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->interfaces[vdev_id].pno_in_progress = false; WMA_LOGD("PNO stop request sent successfully for vdev %d", vdev_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3591,7 +3591,7 @@ CDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id) */ void wma_config_pno(tp_wma_handle wma, tpSirPNOScanReq pno) { - CDF_STATUS ret; + QDF_STATUS ret; if (pno->enable) ret = wma_pno_start(wma, pno); @@ -3618,7 +3618,7 @@ void wma_config_pno(tp_wma_handle wma, tpSirPNOScanReq pno) * * Return: CDF status */ -CDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) +QDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) { wmi_vdev_plmreq_start_cmd_fixed_param *cmd; uint32_t *channel_list; @@ -3630,7 +3630,7 @@ CDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) if (NULL == plm || NULL == wma) { WMA_LOGE("%s: input pointer is NULL ", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("PLM Start"); @@ -3640,7 +3640,7 @@ CDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_vdev_plmreq_start_cmd_fixed_param *) wmi_buf_data(buf); @@ -3695,14 +3695,14 @@ CDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) if (ret) { WMA_LOGE("%s: Failed to send plm start wmi cmd", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->interfaces[plm->sessionId].plm_in_progress = true; WMA_LOGD("Plm start request sent successfully for vdev %d", plm->sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3714,7 +3714,7 @@ CDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) * * Return: CDF status */ -CDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm) +QDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm) { wmi_vdev_plmreq_stop_cmd_fixed_param *cmd; int32_t len; @@ -3724,12 +3724,12 @@ CDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm) if (NULL == plm || NULL == wma) { WMA_LOGE("%s: input pointer is NULL ", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (false == wma->interfaces[plm->sessionId].plm_in_progress) { WMA_LOGE("No active plm req found, skip plm stop req"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("PLM Stop"); @@ -3738,7 +3738,7 @@ CDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_vdev_plmreq_stop_cmd_fixed_param *) wmi_buf_data(buf); @@ -3760,14 +3760,14 @@ CDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm) if (ret) { WMA_LOGE("%s: Failed to send plm stop wmi cmd", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->interfaces[plm->sessionId].plm_in_progress = false; WMA_LOGD("Plm stop request sent successfully for vdev %d", plm->sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3779,7 +3779,7 @@ CDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm) */ void wma_config_plm(tp_wma_handle wma, tpSirPlmReq plm) { - CDF_STATUS ret = 0; + QDF_STATUS ret = 0; if (NULL == plm || NULL == wma) return; @@ -3816,7 +3816,7 @@ void wma_config_plm(tp_wma_handle wma, tpSirPlmReq plm) void wma_scan_cache_updated_ind(tp_wma_handle wma, uint8_t sessionId) { tSirPrefNetworkFoundInd *nw_found_ind; - CDF_STATUS status; + QDF_STATUS status; cds_msg_t cds_msg; uint8_t len, i; @@ -3850,7 +3850,7 @@ void wma_scan_cache_updated_ind(tp_wma_handle wma, uint8_t sessionId) cds_msg.bodyval = 0; status = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to post PNO completion match event to SME", __func__); cdf_mem_free(nw_found_ind); @@ -5145,7 +5145,7 @@ wma_extscan_hotlist_ssid_match_event_handler(void *handle, * * Return: CDF Status. */ -CDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, tSirWifiScanCmdReqParams *pstart, wmi_buf_t *buf, int *buf_len) { @@ -5201,7 +5201,7 @@ CDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, if (!*buf) { WMA_LOGP("%s: failed to allocate memory" " for start extscan cmd", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(*buf); cmd = (wmi_extscan_start_cmd_fixed_param *) buf_ptr; @@ -5361,7 +5361,7 @@ CDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, buf_ptr += WMI_TLV_HDR_SIZE + (nchannels * sizeof(wmi_extscan_bucket_channel)); *buf_len = len; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5373,46 +5373,46 @@ CDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, * * Return: CDF Status. */ -CDF_STATUS wma_start_extscan(tp_wma_handle wma, +QDF_STATUS wma_start_extscan(tp_wma_handle wma, tSirWifiScanCmdReqParams *pstart) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf; int len; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed,can not issue extscan cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan feature bit not enabled", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Fill individual elements of extscan request and * TLV for buckets, channel list. */ - cdf_status = wma_get_buf_extscan_start_cmd(wma, pstart, &buf, &len); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_get_buf_extscan_start_cmd(wma, pstart, &buf, &len); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to get buffer for ext scan cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!buf) { WMA_LOGE("%s:Failed to get buffer" "for current extscan info", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_EXTSCAN_START_CMDID)) { WMA_LOGE("%s: failed to send command", __func__); cdf_nbuf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->interfaces[pstart->sessionId].extscan_in_progress = true; WMA_LOGD("Extscan start request sent successfully for vdev %d", pstart->sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5424,7 +5424,7 @@ CDF_STATUS wma_start_extscan(tp_wma_handle wma, * * Return: CDF Status. */ -CDF_STATUS wma_stop_extscan(tp_wma_handle wma, +QDF_STATUS wma_stop_extscan(tp_wma_handle wma, tSirExtScanStopReqParams *pstopcmd) { wmi_extscan_stop_cmd_fixed_param *cmd; @@ -5434,18 +5434,18 @@ CDF_STATUS wma_stop_extscan(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, cannot issue cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); cmd = (wmi_extscan_stop_cmd_fixed_param *) buf_ptr; @@ -5461,13 +5461,13 @@ CDF_STATUS wma_stop_extscan(tp_wma_handle wma, WMI_EXTSCAN_STOP_CMDID)) { WMA_LOGE("%s: failed to command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->interfaces[pstopcmd->sessionId].extscan_in_progress = false; WMA_LOGD("Extscan stop request sent successfully for vdev %d", pstopcmd->sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** wma_get_hotlist_entries_per_page() - hotlist entries per page @@ -5507,7 +5507,7 @@ static inline int wma_get_hotlist_entries_per_page(wmi_unified_t wmi_handle, * * Return: CDF Status. */ -CDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, tSirExtScanSetBssidHotListReqParams * photlist, int *buf_len) { @@ -5532,7 +5532,7 @@ CDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, */ if (!numap) { WMA_LOGE("%s: Invalid number of bssid's", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } num_entries = wma_get_hotlist_entries_per_page(wma_handle->wmi_handle, cmd_len, @@ -5547,7 +5547,7 @@ CDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } buf_ptr = (uint8_t *) wmi_buf_data(buf); cmd = (wmi_extscan_configure_hotlist_monitor_cmd_fixed_param *) @@ -5610,13 +5610,13 @@ CDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, WMI_EXTSCAN_CONFIGURE_HOTLIST_MONITOR_CMDID)) { WMA_LOGE("%s: failed to send command", __func__); cdf_nbuf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } index = index + min_entries; num_entries = numap - min_entries; len = cmd_len; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5628,28 +5628,28 @@ CDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_extscan_start_hotlist_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_start_hotlist_monitor(tp_wma_handle wma, tSirExtScanSetBssidHotListReqParams *photlist) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int len; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue hotlist cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Fill individual elements for hotlist request and * TLV for bssid entries */ - cdf_status = wma_get_buf_extscan_hotlist_cmd(wma, photlist, &len); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_get_buf_extscan_hotlist_cmd(wma, photlist, &len); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to get buffer" "for hotlist scan cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5661,7 +5661,7 @@ CDF_STATUS wma_extscan_start_hotlist_monitor(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, tSirExtScanResetBssidHotlistReqParams *photlist_reset) { @@ -5673,16 +5673,16 @@ CDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!photlist_reset) { WMA_LOGE("%s: Invalid reset hotlist buffer", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); @@ -5693,7 +5693,7 @@ CDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -5719,9 +5719,9 @@ CDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, WMI_EXTSCAN_CONFIGURE_HOTLIST_MONITOR_CMDID)) { WMA_LOGE("%s: failed to command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5735,7 +5735,7 @@ CDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, tSirExtScanSetSigChangeReqParams *psigchange, wmi_buf_t *buf, int *buf_len) @@ -5750,7 +5750,7 @@ CDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, if (!numap) { WMA_LOGE("%s: Invalid number of bssid's", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } len += WMI_TLV_HDR_SIZE; len += numap * sizeof(wmi_extscan_wlan_change_bssid_param); @@ -5759,7 +5759,7 @@ CDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, if (!*buf) { WMA_LOGP("%s: failed to allocate memory for change monitor cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } buf_ptr = (uint8_t *) wmi_buf_data(*buf); cmd = @@ -5806,7 +5806,7 @@ CDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, buf_ptr += WMI_TLV_HDR_SIZE + (numap * sizeof(wmi_extscan_wlan_change_bssid_param)); *buf_len = len; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5818,41 +5818,41 @@ CDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma, tSirExtScanSetSigChangeReqParams * psigchange) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf; int len; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed,can not issue extscan cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Fill individual elements of change monitor and * TLV info ... */ - cdf_status = wma_get_buf_extscan_change_monitor_cmd(wma, + qdf_status = wma_get_buf_extscan_change_monitor_cmd(wma, psigchange, &buf, &len); - if (cdf_status != CDF_STATUS_SUCCESS) { + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to get buffer for change monitor cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!buf) { WMA_LOGE("%s: Failed to get buffer", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_EXTSCAN_CONFIGURE_WLAN_CHANGE_MONITOR_CMDID)) { WMA_LOGE("%s: failed to send command", __func__); cdf_nbuf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5864,7 +5864,7 @@ CDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, tSirExtScanResetSignificantChangeReqParams *pResetReq) { @@ -5876,12 +5876,12 @@ CDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: ext scan not enabled", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); @@ -5891,7 +5891,7 @@ CDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -5919,9 +5919,9 @@ CDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, WMI_EXTSCAN_CONFIGURE_WLAN_CHANGE_MONITOR_CMDID)) { WMA_LOGE("%s: failed to command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5933,7 +5933,7 @@ CDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, +QDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, tSirExtScanGetCachedResultsReqParams * pcached_results) { @@ -5944,18 +5944,18 @@ CDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, cannot issue cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -5973,9 +5973,9 @@ CDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, WMI_EXTSCAN_GET_CACHED_RESULTS_CMDID)) { WMA_LOGE("%s: failed to command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5987,7 +5987,7 @@ CDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, +QDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, tSirGetExtScanCapabilitiesReqParams * pgetcapab) { @@ -5998,18 +5998,18 @@ CDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -6025,12 +6025,12 @@ CDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, WMI_EXTSCAN_GET_CAPABILITIES_CMDID)) { WMA_LOGE("%s: failed to command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, +QDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, struct sir_ipa_offload_enable_disable *ipa_offload) { wmi_ipa_offload_enable_disable_cmd_fixed_param *cmd; @@ -6044,7 +6044,7 @@ CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, @@ -6055,18 +6055,18 @@ CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, ((ipa_offload->offload_type == AP_RX_DATA_OFFLOAD) ? "WMI_SERVICE_HSOFFLOAD" : "WMI_SERVICE_STA_RX_IPA_OFFLOAD_SUPPORT")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (ipa_offload->offload_type > STA_RX_DATA_OFFLOAD) { - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } len = sizeof(*cmd); wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed (len=%d)", __func__, len); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } WMA_LOGE("%s: offload_type=%d, enable=%d", __func__, @@ -6088,7 +6088,7 @@ CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, WMI_IPA_OFFLOAD_ENABLE_DISABLE_CMDID)) { WMA_LOGE("%s: failed to command", __func__); wmi_buf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* @@ -6097,7 +6097,7 @@ CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, */ vdev = wma_find_vdev_by_id(wma, ipa_offload->vdev_id); if (!vdev) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; /* Disable Intra-BSS FWD offload when gDisableIntraBssFwd=1 in INI */ cfg = (struct txrx_pdev_cfg_t *)vdev->pdev->ctrl_pdev; @@ -6113,10 +6113,10 @@ CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, ipa_offload->vdev_id, WMI_VDEV_PARAM_INTRA_BSS_FWD, intra_bss_fwd)) { WMA_LOGE("Failed to disable WMI_VDEV_PARAM_INTRA_BSS_FWD"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** wma_set_epno_network_list() - set epno network list @@ -6128,7 +6128,7 @@ CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, * * Returns: 0 on success, error number otherwise */ -CDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, +QDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, struct wifi_epno_params *req) { wmi_nlo_config_cmd_fixed_param *cmd; @@ -6142,12 +6142,12 @@ CDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } /* TLV place holder for array of structures @@ -6161,7 +6161,7 @@ CDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_nlo_config_cmd_fixed_param *) wmi_buf_data(buf); @@ -6231,13 +6231,13 @@ CDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, if (ret) { WMA_LOGE("%s: Failed to send nlo wmi cmd", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("set ePNO list request sent successfully for vdev %d", req->session_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6248,9 +6248,9 @@ CDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, * This function reads the incoming @req and fill in the destination * WMI structure and send down the passpoint configs down to the firmware * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, +QDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, struct wifi_passpoint_req *req) { wmi_passpoint_config_cmd_fixed_param *cmd; @@ -6263,12 +6263,12 @@ CDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } len = sizeof(*cmd); @@ -6276,7 +6276,7 @@ CDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_passpoint_config_cmd_fixed_param *) @@ -6312,14 +6312,14 @@ CDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, WMA_LOGE("%s: Failed to send set passpoint network list wmi cmd", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } WMA_LOGD("Set passpoint network list request is sent successfully for vdev %d", req->session_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6330,9 +6330,9 @@ CDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, * This function sends down WMI command with network id set to wildcard id. * firmware shall clear all the config entries * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, +QDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, struct wifi_passpoint_req *req) { wmi_passpoint_config_cmd_fixed_param *cmd; @@ -6344,19 +6344,19 @@ CDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } len = sizeof(*cmd); buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_passpoint_config_cmd_fixed_param *) wmi_buf_data(buf); @@ -6373,13 +6373,13 @@ CDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, WMA_LOGE("%s: Failed to send reset passpoint network list wmi cmd", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Reset passpoint network list request is sent successfully for vdev %d", req->session_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6387,9 +6387,9 @@ CDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, * @wma: WMA handle * @request: SSID hotlist set request from SME * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS +QDF_STATUS wma_set_ssid_hotlist(tp_wma_handle wma, struct sir_set_ssid_hotlist_request *request) { @@ -6402,17 +6402,17 @@ wma_set_ssid_hotlist(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue hotlist cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!request) { WMA_LOGE("%s: Invalid request buffer", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } /* length of fixed portion */ @@ -6426,7 +6426,7 @@ wma_set_ssid_hotlist(tp_wma_handle wma, wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -6481,9 +6481,9 @@ wma_set_ssid_hotlist(tp_wma_handle wma, WMI_EXTSCAN_CONFIGURE_HOTLIST_SSID_MONITOR_CMDID)) { WMA_LOGE("%s: failed to send command", __func__); wmi_buf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -6496,7 +6496,7 @@ wma_set_ssid_hotlist(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui) +QDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui) { wmi_scan_prob_req_oui_cmd_fixed_param *cmd; wmi_buf_t wmi_buf; @@ -6506,13 +6506,13 @@ CDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui) if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } len = sizeof(*cmd); wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); cmd = (wmi_scan_prob_req_oui_cmd_fixed_param *) buf_ptr; @@ -6532,9 +6532,9 @@ CDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui) WMI_SCAN_PROB_REQ_OUI_CMDID)) { WMA_LOGE("%s: failed to send command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6674,7 +6674,7 @@ void wma_roam_better_ap_handler(tp_wma_handle wma, uint32_t vdev_id) CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, FL("posting candidate ind to SME")); - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { cdf_mem_free(candidate_ind); CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, @@ -6753,7 +6753,7 @@ int wma_roam_event_callback(WMA_HANDLE handle, uint8_t *event_buf, * * Return: 0 on success; error number otherwise */ -CDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, +QDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, struct rssi_monitor_req *req) { wmi_rssi_breach_monitor_config_fixed_param *cmd; @@ -6763,7 +6763,7 @@ CDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_rssi_breach_monitor_config_fixed_param *) wmi_buf_data(buf); @@ -6794,11 +6794,11 @@ CDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, if (ret != EOK) { WMA_LOGE("Failed to send WMI_RSSI_BREACH_MONITOR_CONFIG_CMDID"); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGI("Sent WMI_RSSI_BREACH_MONITOR_CONFIG_CMDID to FW"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6807,16 +6807,16 @@ CDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, * * This function generates the scan id. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS wma_get_scan_id(uint32_t *scan_id) +QDF_STATUS wma_get_scan_id(uint32_t *scan_id) { tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); if (!scan_id) { WMA_LOGE("Scan_id is NULL"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* host need to cycle through the lower 12 bits to generate ids */ @@ -6827,7 +6827,7 @@ CDF_STATUS wma_get_scan_id(uint32_t *scan_id) * by PREFIX 0xA000 */ *scan_id = *scan_id | WMI_HOST_SCAN_REQ_ID_PREFIX; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_LFR_SUBNET_DETECTION @@ -6839,9 +6839,9 @@ CDF_STATUS wma_get_scan_id(uint32_t *scan_id) * This function reads the incoming @req and fill in the destination * WMI structure and sends down the gateway configs down to the firmware * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS wma_set_gateway_params(tp_wma_handle wma, +QDF_STATUS wma_set_gateway_params(tp_wma_handle wma, struct gateway_param_update_req *req) { wmi_roam_subnet_change_config_fixed_param *cmd; @@ -6852,7 +6852,7 @@ CDF_STATUS wma_set_gateway_params(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_roam_subnet_change_config_fixed_param *) wmi_buf_data(buf); @@ -6884,10 +6884,10 @@ CDF_STATUS wma_set_gateway_params(tp_wma_handle wma, WMA_LOGE("Failed to send gw config parameter to fw, ret: %d", ret); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_LFR_SUBNET_DETECTION */ diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 1f91443b91..3d72314f12 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -337,7 +337,7 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf, WMI_STATS_EXT_EVENTID_param_tlvs *param_buf; tSirStatsExtEvent *stats_ext_event; wmi_stats_ext_event_fixed_param *stats_ext_info; - CDF_STATUS status; + QDF_STATUS status; cds_msg_t cds_msg; uint8_t *buf_ptr; uint32_t alloc_len; @@ -374,7 +374,7 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf, cds_msg.bodyval = 0; status = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to post stats ext event to SME", __func__); cdf_mem_free(stats_ext_event); return -EFAULT; @@ -782,9 +782,9 @@ void wma_register_ll_stats_event_handler(tp_wma_handle wma_handle) * @wma: wma handle * @clearReq: ll stats clear request command params * - * Return: CDF_STATUS_SUCCESS for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -CDF_STATUS wma_process_ll_stats_clear_req +QDF_STATUS wma_process_ll_stats_clear_req (tp_wma_handle wma, const tpSirLLStatsClearReq clearReq) { wmi_clear_link_stats_cmd_fixed_param *cmd; @@ -795,7 +795,7 @@ CDF_STATUS wma_process_ll_stats_clear_req if (!clearReq || !wma) { WMA_LOGE("%s: input pointer is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); @@ -803,7 +803,7 @@ CDF_STATUS wma_process_ll_stats_clear_req if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -834,11 +834,11 @@ CDF_STATUS wma_process_ll_stats_clear_req if (ret) { WMA_LOGE("%s: Failed to send clear link stats req", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Clear Link Layer Stats request sent successfully"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -846,9 +846,9 @@ CDF_STATUS wma_process_ll_stats_clear_req * @wma: wma handle * @setReq: ll stats set request command params * - * Return: CDF_STATUS_SUCCESS for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -CDF_STATUS wma_process_ll_stats_set_req +QDF_STATUS wma_process_ll_stats_set_req (tp_wma_handle wma, const tpSirLLStatsSetReq setReq) { wmi_start_link_stats_cmd_fixed_param *cmd; @@ -859,7 +859,7 @@ CDF_STATUS wma_process_ll_stats_set_req if (!setReq || !wma) { WMA_LOGE("%s: input pointer is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); @@ -867,7 +867,7 @@ CDF_STATUS wma_process_ll_stats_set_req if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -892,11 +892,11 @@ CDF_STATUS wma_process_ll_stats_set_req if (ret) { WMA_LOGE("%s: Failed to send set link stats request", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Set Link Layer Stats request sent successfully"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -904,9 +904,9 @@ CDF_STATUS wma_process_ll_stats_set_req * @wma:wma handle * @getReq:ll stats get request command params * - * Return: CDF_STATUS_SUCCESS for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -CDF_STATUS wma_process_ll_stats_get_req +QDF_STATUS wma_process_ll_stats_get_req (tp_wma_handle wma, const tpSirLLStatsGetReq getReq) { wmi_request_link_stats_cmd_fixed_param *cmd; @@ -917,7 +917,7 @@ CDF_STATUS wma_process_ll_stats_get_req if (!getReq || !wma) { WMA_LOGE("%s: input pointer is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); @@ -925,7 +925,7 @@ CDF_STATUS wma_process_ll_stats_get_req if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -955,11 +955,11 @@ CDF_STATUS wma_process_ll_stats_get_req if (ret) { WMA_LOGE("%s: Failed to send get link stats request", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Get Link Layer Stats request sent successfully"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1177,7 +1177,7 @@ static void wma_update_vdev_stats(tp_wma_handle wma, struct wma_txrx_node *node; uint8_t i; int8_t rssi = 0; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tAniGetRssiReq *pGetRssiReq = (tAniGetRssiReq *) wma->pGetRssiReq; cds_msg_t sme_msg = { 0 }; @@ -1268,8 +1268,8 @@ static void wma_update_vdev_stats(tp_wma_handle wma, sme_msg.bodyptr = p_snr_req; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("%s: Fail to post snr ind msg", __func__); cdf_mem_free(p_snr_req); } @@ -1378,7 +1378,7 @@ static void wma_update_peer_stats(tp_wma_handle wma, void wma_post_link_status(tAniGetLinkStatus *pGetLinkStatus, uint8_t link_status) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = { 0 }; pGetLinkStatus->linkStatus = link_status; @@ -1386,8 +1386,8 @@ void wma_post_link_status(tAniGetLinkStatus *pGetLinkStatus, sme_msg.bodyptr = pGetLinkStatus; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("%s: Fail to post link status ind msg", __func__); cdf_mem_free(pGetLinkStatus); } @@ -1520,31 +1520,31 @@ int wma_stats_event_handler(void *handle, uint8_t *cmd_param_info, * wma_send_link_speed() - send link speed to SME * @link_speed: link speed * - * Return: CDF_STATUS_SUCCESS for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -CDF_STATUS wma_send_link_speed(uint32_t link_speed) +QDF_STATUS wma_send_link_speed(uint32_t link_speed) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = { 0 }; tSirLinkSpeedInfo *ls_ind = (tSirLinkSpeedInfo *) cdf_mem_malloc(sizeof(tSirLinkSpeedInfo)); if (!ls_ind) { WMA_LOGE("%s: Memory allocation failed.", __func__); - cdf_status = CDF_STATUS_E_NOMEM; + qdf_status = QDF_STATUS_E_NOMEM; } else { ls_ind->estLinkSpeed = link_speed; sme_msg.type = eWNI_SME_LINK_SPEED_IND; sme_msg.bodyptr = ls_ind; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("%s: Fail to post linkspeed ind msg", __func__); cdf_mem_free(ls_ind); } } - return cdf_status; + return qdf_status; } /** @@ -1560,7 +1560,7 @@ int wma_link_speed_event_handler(void *handle, uint8_t *cmd_param_info, { WMI_PEER_ESTIMATED_LINKSPEED_EVENTID_param_tlvs *param_buf; wmi_peer_estimated_linkspeed_event_fixed_param *event; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; param_buf = (WMI_PEER_ESTIMATED_LINKSPEED_EVENTID_param_tlvs *) cmd_param_info; @@ -1569,8 +1569,8 @@ int wma_link_speed_event_handler(void *handle, uint8_t *cmd_param_info, return -EINVAL; } event = param_buf->fixed_param; - cdf_status = wma_send_link_speed(event->est_linkspeed_kbps); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_send_link_speed(event->est_linkspeed_kbps); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { return -EINVAL; } return 0; @@ -1580,11 +1580,11 @@ int wma_link_speed_event_handler(void *handle, uint8_t *cmd_param_info, * wma_wni_cfg_dnld() - cfg download request * @handle: wma handle * - * Return: CDF_STATUS_SUCCESS for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -CDF_STATUS wma_wni_cfg_dnld(tp_wma_handle wma_handle) +QDF_STATUS wma_wni_cfg_dnld(tp_wma_handle wma_handle) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; void *mac = cds_get_context(CDF_MODULE_ID_PE); WMA_LOGD("%s: Enter", __func__); @@ -1592,13 +1592,13 @@ CDF_STATUS wma_wni_cfg_dnld(tp_wma_handle wma_handle) if (NULL == mac) { WMA_LOGP("%s: Invalid context", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } process_cfg_download_req(mac); WMA_LOGD("%s: Exit", __func__); - return cdf_status; + return qdf_status; } /** @@ -2047,7 +2047,7 @@ static tAniGetPEStatsRsp *wma_get_stats_rsp_buf stats_rsp_params->statsMask = get_stats_param->statsMask; stats_rsp_params->msgType = WMA_GET_STATISTICS_RSP; stats_rsp_params->msgLen = len - sizeof(tAniGetPEStatsRsp); - stats_rsp_params->rc = CDF_STATUS_SUCCESS; + stats_rsp_params->rc = QDF_STATUS_SUCCESS; return stats_rsp_params; } @@ -2122,7 +2122,7 @@ void wma_get_stats_req(WMA_HANDLE handle, goto end; failed: - pGetPEStatsRspParams->rc = CDF_STATUS_E_FAILURE; + pGetPEStatsRspParams->rc = QDF_STATUS_E_FAILURE; node->stats_rsp = NULL; /* send response to UMAC */ wma_send_msg(wma_handle, WMA_GET_STATISTICS_RSP, pGetPEStatsRspParams, @@ -2301,7 +2301,7 @@ static void wma_post_ftm_response(tp_wma_handle wma_handle) uint8_t *payload; uint32_t data_len; cds_msg_t msg = { 0 }; - CDF_STATUS status; + QDF_STATUS status; ret = wma_utf_rsp(wma_handle, &payload, &data_len); @@ -2315,7 +2315,7 @@ static void wma_post_ftm_response(tp_wma_handle wma_handle) status = cds_mq_post_message(CDS_MQ_ID_SYS, &msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("failed to post ftm response to SYS"); cdf_mem_free(payload); } @@ -2537,9 +2537,9 @@ int wma_utf_cmd(tp_wma_handle wma_handle, uint8_t *data, uint16_t len) * @wma_handle: wma handle * @msg_buffer: message buffer * - * Return: CDF_STATUS_SUCCESS for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -CDF_STATUS +QDF_STATUS wma_process_ftm_command(tp_wma_handle wma_handle, struct ar6k_testmode_cmd_data *msg_buffer) { @@ -2548,13 +2548,13 @@ wma_process_ftm_command(tp_wma_handle wma_handle, int ret; if (!msg_buffer) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) { WMA_LOGE("FTM command issued in non-FTM mode"); cdf_mem_free(msg_buffer->data); cdf_mem_free(msg_buffer); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } data = msg_buffer->data; @@ -2566,9 +2566,9 @@ wma_process_ftm_command(tp_wma_handle wma_handle, cdf_mem_free(msg_buffer); if (ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* QCA_WIFI_FTM */ @@ -2578,9 +2578,9 @@ wma_process_ftm_command(tp_wma_handle wma_handle, * @pVersion: version pointer * @versionBufferSize: buffer size * - * Return: CDF_STATUS_SUCCESS for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -CDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, +QDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, uint8_t *pVersion, uint32_t versionBufferSize) { @@ -2589,12 +2589,12 @@ CDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, if (NULL == wma_handle) { WMA_LOGE("%s: Failed to get wma", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } snprintf(pVersion, versionBufferSize, "%x", (unsigned int)wma_handle->target_fw_version); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2780,7 +2780,7 @@ int8_t wma_get_hw_mode_idx_from_dbs_hw_list(enum hw_mode_ss_config mac0_ss, * * Return: Success if hw mode is obtained and the hw mode params */ -CDF_STATUS wma_get_hw_mode_from_idx(uint32_t idx, +QDF_STATUS wma_get_hw_mode_from_idx(uint32_t idx, struct sir_hw_mode_params *hw_mode) { tp_wma_handle wma; @@ -2789,17 +2789,17 @@ CDF_STATUS wma_get_hw_mode_from_idx(uint32_t idx, wma = cds_get_context(CDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (idx > wma->num_dbs_hw_modes) { WMA_LOGE("%s: Invalid index", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!wma->num_dbs_hw_modes) { WMA_LOGE("%s: No dbs hw modes available", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } param = wma->hw_mode.hw_mode_list[idx]; @@ -2813,7 +2813,7 @@ CDF_STATUS wma_get_hw_mode_from_idx(uint32_t idx, hw_mode->dbs_cap = WMI_DBS_HW_MODE_DBS_MODE_GET(param); hw_mode->agile_dfs_cap = WMI_DBS_HW_MODE_AGILE_DFS_GET(param); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2975,7 +2975,7 @@ int8_t wma_get_mac_id_of_vdev(uint32_t vdev_id) * otherwise. When no HW mode transition has happened the values of * old_hw_mode_index and new_hw_mode_index will be the same. */ -CDF_STATUS wma_get_old_and_new_hw_index(uint32_t *old_hw_mode_index, +QDF_STATUS wma_get_old_and_new_hw_index(uint32_t *old_hw_mode_index, uint32_t *new_hw_mode_index) { tp_wma_handle wma; @@ -2983,13 +2983,13 @@ CDF_STATUS wma_get_old_and_new_hw_index(uint32_t *old_hw_mode_index, wma = cds_get_context(CDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } *old_hw_mode_index = wma->old_hw_mode_index; *new_hw_mode_index = wma->new_hw_mode_index; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3055,7 +3055,7 @@ void wma_update_intf_hw_mode_params(uint32_t vdev_id, uint32_t mac_id, * false values of one_by_one_dbs/two_by_two_dbs, * indicate DBS is disabled */ -CDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs) +QDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs) { tp_wma_handle wma; uint32_t i; @@ -3069,14 +3069,14 @@ CDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs) if (wma_is_hw_dbs_capable() == false) { WMA_LOGE("%s: HW is not DBS capable", __func__); /* Caller will understand that DBS is disabled */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } wma = cds_get_context(CDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* To check 1x1 capability */ @@ -3138,7 +3138,7 @@ CDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs) if (found_two_by_two >= 0) *two_by_two_dbs = true; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3150,31 +3150,31 @@ CDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs) * * Return: Success if the current HW mode params are successfully populated */ -CDF_STATUS wma_get_current_hw_mode(struct sir_hw_mode_params *hw_mode) +QDF_STATUS wma_get_current_hw_mode(struct sir_hw_mode_params *hw_mode) { - CDF_STATUS status; + QDF_STATUS status; uint32_t old_hw_index = 0, new_hw_index = 0; WMA_LOGI("%s: Get the current hw mode", __func__); status = wma_get_old_and_new_hw_index(&old_hw_index, &new_hw_index); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { WMA_LOGE("%s: Failed to get HW mode index", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (new_hw_index == WMA_DEFAULT_HW_MODE_INDEX) { WMA_LOGE("%s: HW mode is not yet initialized", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = wma_get_hw_mode_from_idx(new_hw_index, hw_mode); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { WMA_LOGE("%s: Failed to get HW mode index", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3258,7 +3258,7 @@ bool wma_is_agile_dfs_enable(void) * * Return: 0 on success */ -CDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, +QDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, bool dbs_scan, bool dbs_plus_agile_scan, bool single_mac_scan_with_dfs) @@ -3268,7 +3268,7 @@ CDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, wma = cds_get_context(CDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } *scan_config = wma->dual_mac_cfg.cur_scan_config; @@ -3279,7 +3279,7 @@ CDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, single_mac_scan_with_dfs); WMA_LOGD("%s: *scan_config:%x ", __func__, *scan_config); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3294,7 +3294,7 @@ CDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, * * Return: 0 on success */ -CDF_STATUS wma_get_updated_fw_mode_config(uint32_t *fw_mode_config, +QDF_STATUS wma_get_updated_fw_mode_config(uint32_t *fw_mode_config, bool dbs, bool agile_dfs) { @@ -3303,7 +3303,7 @@ CDF_STATUS wma_get_updated_fw_mode_config(uint32_t *fw_mode_config, wma = cds_get_context(CDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } *fw_mode_config = wma->dual_mac_cfg.cur_fw_mode_config; @@ -3311,7 +3311,7 @@ CDF_STATUS wma_get_updated_fw_mode_config(uint32_t *fw_mode_config, WMI_DBS_FW_MODE_CFG_AGILE_DFS_SET(*fw_mode_config, agile_dfs); WMA_LOGD("%s: *fw_mode_config:%x ", __func__, *fw_mode_config); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /**