qcacld-3.0: Add qdf references in place of cdf

Replace CDF references with QDF references.

Change-Id: Ifb4571174719b5fce61dd305545d05628265f317
CRs-Fixed: 981188

core/bmi/inc/bmi.h

@@ -38,7 +38,7 @@
 #include "hif.h"
 
 struct ol_context;
-QDF_STATUS ol_cds_init(qdf_device_t cdf_dev, void *hif_ctx);
+QDF_STATUS ol_cds_init(qdf_device_t qdf_dev, void *hif_ctx);
 void ol_cds_free(void);
 
 /**

core/bmi/src/bmi.c

@@ -60,7 +60,7 @@ 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;
-	qdf_device_t cdf_dev = ol_ctx->cdf_dev;
+	qdf_device_t qdf_dev = ol_ctx->qdf_dev;
 
 	if (!scn) {
 		BMI_ERR("Invalid scn Context");
@@ -68,7 +68,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx)
 		return QDF_STATUS_NOT_INITIALIZED;
 	}
 
-	if (!cdf_dev->dev) {
+	if (!qdf_dev->dev) {
 		BMI_ERR("%s: Invalid Device Pointer", __func__);
 		return QDF_STATUS_NOT_INITIALIZED;
 	}
@@ -77,7 +77,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx)
 
 	if (!info->bmi_cmd_buff) {
 		info->bmi_cmd_buff =
-			qdf_mem_alloc_consistent(cdf_dev, cdf_dev->dev, MAX_BMI_CMDBUF_SZ,
+			qdf_mem_alloc_consistent(qdf_dev, qdf_dev->dev, MAX_BMI_CMDBUF_SZ,
 							&info->bmi_cmd_da);
 		if (!info->bmi_cmd_buff) {
 			BMI_ERR("No Memory for BMI Command");
@@ -87,7 +87,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx)
 
 	if (!info->bmi_rsp_buff) {
 		info->bmi_rsp_buff =
-			qdf_mem_alloc_consistent(cdf_dev, cdf_dev->dev, MAX_BMI_CMDBUF_SZ,
+			qdf_mem_alloc_consistent(qdf_dev, qdf_dev->dev, MAX_BMI_CMDBUF_SZ,
 							&info->bmi_rsp_da);
 		if (!info->bmi_rsp_buff) {
 			BMI_ERR("No Memory for BMI Response");
@@ -96,7 +96,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx)
 	}
 	return QDF_STATUS_SUCCESS;
 end:
-	qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ,
+	qdf_mem_free_consistent(qdf_dev, qdf_dev->dev, MAX_BMI_CMDBUF_SZ,
 				 info->bmi_cmd_buff, info->bmi_cmd_da, 0);
 	info->bmi_cmd_buff = NULL;
 	return QDF_STATUS_E_NOMEM;
@@ -105,22 +105,24 @@ end:
 void bmi_cleanup(struct ol_context *ol_ctx)
 {
 	struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx);
-	qdf_device_t cdf_dev = ol_ctx->cdf_dev;
+	qdf_device_t qdf_dev = ol_ctx->qdf_dev;
 
-	if (!cdf_dev->dev) {
+	if (!qdf_dev->dev) {
 		BMI_ERR("%s: Invalid Device Pointer", __func__);
 		return;
 	}
 
 	if (info->bmi_cmd_buff) {
-		qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ,
+		qdf_mem_free_consistent(qdf_dev, qdf_dev->dev,
+					MAX_BMI_CMDBUF_SZ,
 				    info->bmi_cmd_buff, info->bmi_cmd_da, 0);
 		info->bmi_cmd_buff = NULL;
 		info->bmi_cmd_da = 0;
 	}
 
 	if (info->bmi_rsp_buff) {
-		qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ,
+		qdf_mem_free_consistent(qdf_dev, qdf_dev->dev,
+					MAX_BMI_CMDBUF_SZ,
 				    info->bmi_rsp_buff, info->bmi_rsp_da, 0);
 		info->bmi_rsp_buff = NULL;
 		info->bmi_rsp_da = 0;
@@ -517,12 +519,12 @@ end:
 
 /**
  * ol_cds_init() - API to initialize global CDS OL Context
- * @cdf_dev: QDF Device
+ * @qdf_dev: QDF Device
  * @hif_ctx: HIF Context
  *
  * Return: Success/Failure
  */
-QDF_STATUS ol_cds_init(qdf_device_t cdf_dev, void *hif_ctx)
+QDF_STATUS ol_cds_init(qdf_device_t qdf_dev, void *hif_ctx)
 {
 	struct ol_context *ol_info;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -539,11 +541,11 @@ QDF_STATUS ol_cds_init(qdf_device_t cdf_dev, void *hif_ctx)
 		return status;
 	}
 
-	ol_info->cdf_dev = cdf_dev;
+	ol_info->qdf_dev = qdf_dev;
 	ol_info->scn = hif_ctx;
 	ol_info->tgt_def.targetdef = hif_get_targetdef(hif_ctx);
 
-	qdf_create_work(cdf_dev, &ol_info->ramdump_work, ramdump_work_handler, ol_info);
+	qdf_create_work(qdf_dev, &ol_info->ramdump_work, ramdump_work_handler, ol_info);
 
 	return status;
 }

core/bmi/src/bmi_1.c

@@ -289,7 +289,7 @@ QDF_STATUS bmi_done_local(struct ol_context *ol_ctx)
 	int status;
 	uint32_t cid;
 	struct bmi_info *info;
-	qdf_device_t cdf_dev = ol_ctx->cdf_dev;
+	qdf_device_t qdf_dev = ol_ctx->qdf_dev;
 	qdf_dma_addr_t cmd, rsp;
 
 	if (!scn) {
@@ -298,7 +298,7 @@ QDF_STATUS bmi_done_local(struct ol_context *ol_ctx)
 		return QDF_STATUS_NOT_INITIALIZED;
 	}
 
-	if (!cdf_dev->dev) {
+	if (!qdf_dev->dev) {
 		BMI_ERR("%s: Invalid device pointer", __func__);
 		return QDF_STATUS_NOT_INITIALIZED;
 	}
@@ -333,14 +333,16 @@ QDF_STATUS bmi_done_local(struct ol_context *ol_ctx)
 	}
 
 	if (info->bmi_cmd_buff) {
-		qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ,
+		qdf_mem_free_consistent(qdf_dev, qdf_dev->dev,
+					MAX_BMI_CMDBUF_SZ,
 				    info->bmi_cmd_buff, info->bmi_cmd_da, 0);
 		info->bmi_cmd_buff = NULL;
 		info->bmi_cmd_da = 0;
 	}
 
 	if (info->bmi_rsp_buff) {
-		qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ,
+		qdf_mem_free_consistent(qdf_dev, qdf_dev->dev,
+					MAX_BMI_CMDBUF_SZ,
 				    info->bmi_rsp_buff, info->bmi_rsp_da, 0);
 		info->bmi_rsp_buff = NULL;
 		info->bmi_rsp_da = 0;

core/bmi/src/bmi_2.c

@@ -88,7 +88,7 @@ bmi_done_local(struct ol_context *ol_ctx)
 	struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx);
 	uint8_t *bmi_cmd_buff = info->bmi_cmd_buff;
 	uint8_t *bmi_rsp_buff = info->bmi_rsp_buff;
-	qdf_device_t cdf_dev = ol_ctx->cdf_dev;
+	qdf_device_t qdf_dev = ol_ctx->qdf_dev;
 	qdf_dma_addr_t cmd = info->bmi_cmd_da;
 	qdf_dma_addr_t rsp = info->bmi_rsp_da;
 
@@ -102,7 +102,7 @@ bmi_done_local(struct ol_context *ol_ctx)
 		return QDF_STATUS_NOT_INITIALIZED;
 	}
 
-	if (!cdf_dev->dev) {
+	if (!qdf_dev->dev) {
 		BMI_ERR("%s Invalid Device pointer", __func__);
 		return QDF_STATUS_NOT_INITIALIZED;
 	}
@@ -127,14 +127,16 @@ bmi_done_local(struct ol_context *ol_ctx)
 	}
 
 	if (info->bmi_cmd_buff) {
-		qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ,
+		qdf_mem_free_consistent(qdf_dev, qdf_dev->dev,
+					MAX_BMI_CMDBUF_SZ,
 				    info->bmi_cmd_buff, info->bmi_cmd_da, 0);
 		info->bmi_cmd_buff = NULL;
 		info->bmi_cmd_da = 0;
 	}
 
 	if (info->bmi_rsp_buff) {
-		qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ,
+		qdf_mem_free_consistent(qdf_dev, qdf_dev->dev,
+					MAX_BMI_CMDBUF_SZ,
 				    info->bmi_rsp_buff, info->bmi_rsp_da, 0);
 		info->bmi_rsp_buff = NULL;
 		info->bmi_rsp_da = 0;

core/bmi/src/i_bmi.h

@@ -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: QDF Device
+ * @qdf_dev: QDF Device
  * @scn: HIF Context
  * @ramdump_work: WorkQueue for Ramdump collection
  * @tgt_def: Target Defnition pointer
@@ -157,7 +157,7 @@ struct ol_context {
 	struct bmi_info bmi;
 	struct ol_config_info cfg_info;
 	uint8_t *cal_in_flash;
-	qdf_device_t cdf_dev;
+	qdf_device_t qdf_dev;
 	qdf_work_t ramdump_work;
 	struct hif_opaque_softc *scn;
 	struct targetdef_t {

core/bmi/src/ol_fw.c

@@ -151,7 +151,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file,
 	struct hif_target_info *tgt_info = hif_get_target_info_handle(scn);
 	uint32_t target_type = tgt_info->target_type;
 	struct bmi_info *bmi_ctx = GET_BMI_CONTEXT(ol_ctx);
-	qdf_device_t cdf_dev = ol_ctx->cdf_dev;
+	qdf_device_t qdf_dev = ol_ctx->qdf_dev;
 
 	switch (file) {
 	default:
@@ -251,7 +251,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file,
 		break;
 	}
 
-	if (request_firmware(&fw_entry, filename, cdf_dev->dev) != 0) {
+	if (request_firmware(&fw_entry, filename, qdf_dev->dev) != 0) {
 		BMI_ERR("%s: Failed to get %s", __func__, filename);
 
 		if (file == ATH_OTP_FILE)
@@ -265,7 +265,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file,
 			BMI_INFO("%s: Trying to load default %s",
 			       __func__, filename);
 			if (request_firmware(&fw_entry, filename,
-						cdf_dev->dev) != 0) {
+						qdf_dev->dev) != 0) {
 				BMI_ERR("%s: Failed to get %s",
 				       __func__, filename);
 				return -1;

core/cds/inc/cds_concurrency.h

@@ -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);
-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);
+QDF_STATUS qdf_wait_for_connection_update(void);
+QDF_STATUS qdf_reset_connection_update(void);
+QDF_STATUS qdf_set_connection_update(void);
+QDF_STATUS qdf_init_connection_update(void);
 #endif /* __CDS_CONCURRENCY_H */

core/cds/inc/cds_mq.h

@@ -32,7 +32,7 @@
 
    \file  cds_mq.h
 
-   \brief virtual Operating System Services (CDF) message queue APIs
+   \brief virtual Operating System Services (QDF) message queue APIs
 
    Message Queue Definitions and API
 
@@ -123,7 +123,7 @@ typedef enum {
    will be posted.
 
    \param message - a pointer to a message buffer.  Memory for this message
-   buffer is allocated by the caller and free'd by the CDF after the
+   buffer is allocated by the caller and free'd by the QDF after the
    message is posted to the message queue.  If the consumer of the
    message needs anything in this message, it needs to copy the contents
    before returning from the message queue handler.

core/cds/inc/cds_sched.h

@@ -87,7 +87,7 @@ typedef void (*cds_ol_rx_thread_cb)(void *context, void *rxpkt, uint16_t staid);
 #endif
 
 /*
-** CDF Message queue definition.
+** QDF Message queue definition.
 */
 typedef struct _cds_mq_type {
 	/* Lock use to synchronize access to this message queue */
@@ -242,7 +242,7 @@ typedef struct _cds_context_type {
 	cds_mq_type freeVosMq;
 
 	/* Scheduler Context */
-	cds_sched_context cdf_sched;
+	cds_sched_context qdf_sched;
 
 	/* HDD Module Context  */
 	void *pHDDContext;
@@ -265,7 +265,7 @@ typedef struct _cds_context_type {
 
 	void *g_ol_context;
 	/*
-	 * qdf_ctx will be used by cdf
+	 * qdf_ctx will be used by qdf
 	 * while allocating dma memory
 	 * to access dev information.
 	 */
@@ -285,7 +285,7 @@ typedef struct _cds_context_type {
 	struct cds_log_complete log_complete;
 	qdf_spinlock_t bug_report_lock;
 	qdf_event_t connection_update_done_evt;
-	qdf_mutex_t cdf_conc_list_lock;
+	qdf_mutex_t qdf_conc_list_lock;
 
 } cds_context_type, *p_cds_contextType;
 
@@ -369,7 +369,7 @@ void cds_free_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext);
 
      - The Tx thread is created and ready to receive and dispatch messages
 
-   \param  p_cds_context - pointer to the global CDF Context
+   \param  p_cds_context - pointer to the global QDF Context
 
    \param  p_cds_sched_context - pointer to a previously allocated buffer big
    enough to hold a scheduler context.
@@ -407,7 +407,7 @@ QDF_STATUS cds_sched_open(void *p_cds_context,
 
      - The Tx thread is closed
 
-   \param  p_cds_context - pointer to the global CDF Context
+   \param  p_cds_context - pointer to the global QDF Context
 
    \return QDF_STATUS_SUCCESS - Scheduler was successfully initialized and
    is ready to be used.

core/cds/src/cds_api.c

@@ -162,7 +162,7 @@ static void cds_set_nan_enable(tMacOpenParameters *param,
  * - All the WLAN SW components should have been opened. This includes
  * SYS, MAC, SME, WMA and TL.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS cds_open(void)
 {
@@ -228,7 +228,7 @@ QDF_STATUS cds_open(void)
 	}
 
 	/* Now Open the CDS Scheduler */
-	qdf_status = cds_sched_open(gp_cds_context, &gp_cds_context->cdf_sched,
+	qdf_status = cds_sched_open(gp_cds_context, &gp_cds_context->qdf_sched,
 				    sizeof(cds_sched_context));
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -482,7 +482,7 @@ err_probe_event:
  * cds_pre_enable() - pre enable cds
  * @cds_context: CDS context
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context)
 {
@@ -588,7 +588,7 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context)
  * cds_enable() - start/enable cds module
  * @cds_context: CDS context
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS cds_enable(v_CONTEXT_t cds_context)
 {
@@ -714,7 +714,7 @@ err_wma_stop:
  * cds_disable() - stop/disable cds module
  * @cds_context: CDS context
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS cds_disable(v_CONTEXT_t cds_context)
 {
@@ -753,7 +753,7 @@ QDF_STATUS cds_disable(v_CONTEXT_t cds_context)
  * cds_close() - close cds module
  * @cds_context: CDS context
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS cds_close(v_CONTEXT_t cds_context)
 {
@@ -1036,7 +1036,7 @@ void cds_clear_driver_state(enum cds_driver_state state)
  * This API allows any user to allocate a user context area within the
  * CDS Global Context.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID,
 			     void **ppModuleContext, uint32_t size)
@@ -1165,7 +1165,7 @@ QDF_STATUS cds_set_context(QDF_MODULE_ID module_id, void *context)
  *  This API allows a user to free the user context area within the
  *  CDS Global Context.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID,
 			    void *pModuleContext)
@@ -1248,12 +1248,12 @@ QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID,
  * @msgQueueId: identifies the message queue upon which the message
  *	will be posted.
  * @message: a pointer to a message buffer. Memory for this message
- *	buffer is allocated by the caller and free'd by the CDF after the
+ *	buffer is allocated by the caller and free'd by the QDF after the
  *	message is posted to the message queue.  If the consumer of the
  *	message needs anything in this message, it needs to copy the contents
  *	before returning from the message queue handler.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg)
 {
@@ -1273,28 +1273,28 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg)
 	/* Message Queue ID for messages bound for SME */
 	case CDS_MQ_ID_SME:
 	{
-		pTargetMq = &(gp_cds_context->cdf_sched.smeMcMq);
+		pTargetMq = &(gp_cds_context->qdf_sched.smeMcMq);
 		break;
 	}
 
 	/* Message Queue ID for messages bound for PE */
 	case CDS_MQ_ID_PE:
 	{
-		pTargetMq = &(gp_cds_context->cdf_sched.peMcMq);
+		pTargetMq = &(gp_cds_context->qdf_sched.peMcMq);
 		break;
 	}
 
 	/* Message Queue ID for messages bound for wma */
 	case CDS_MQ_ID_WMA:
 	{
-		pTargetMq = &(gp_cds_context->cdf_sched.wmaMcMq);
+		pTargetMq = &(gp_cds_context->qdf_sched.wmaMcMq);
 		break;
 	}
 
 	/* Message Queue ID for messages bound for the SYS module */
 	case CDS_MQ_ID_SYS:
 	{
-		pTargetMq = &(gp_cds_context->cdf_sched.sysMcMq);
+		pTargetMq = &(gp_cds_context->qdf_sched.sysMcMq);
 		break;
 	}
 
@@ -1337,8 +1337,8 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg)
 
 	cds_mq_put(pTargetMq, pMsgWrapper);
 
-	set_bit(MC_POST_EVENT_MASK, &gp_cds_context->cdf_sched.mcEventFlag);
-	wake_up_interruptible(&gp_cds_context->cdf_sched.mcWaitQueue);
+	set_bit(MC_POST_EVENT_MASK, &gp_cds_context->qdf_sched.mcEventFlag);
+	wake_up_interruptible(&gp_cds_context->qdf_sched.mcWaitQueue);
 
 	return QDF_STATUS_SUCCESS;
 } /* cds_mq_post_message() */
@@ -1425,7 +1425,7 @@ void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper)
  * cds_shutdown() - shutdown CDS
  * @cds_context: global cds context
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context)
 {

core/cds/src/cds_concurrency.c

@@ -2203,7 +2203,7 @@ static void cds_update_hw_mode_conn_info(uint32_t num_vdev_mac_entries,
 		return;
 	}
 
-	qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock);
 	for (i = 0; i < num_vdev_mac_entries; i++) {
 		conn_index = 0;
 		found = 0;
@@ -2236,7 +2236,7 @@ static void cds_update_hw_mode_conn_info(uint32_t num_vdev_mac_entries,
 			  conc_connection_list[conn_index].rx_spatial_stream);
 		}
 	}
-	qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 }
 
 /**
@@ -2432,7 +2432,7 @@ static void cds_soc_set_hw_mode_cb(uint32_t status,
 			vdev_mac_map,
 			hw_mode);
 
-	ret = cdf_set_connection_update();
+	ret = qdf_set_connection_update();
 	if (!QDF_IS_STATUS_SUCCESS(ret))
 		cds_err("ERROR: set connection_update_done event failed");
 
@@ -3533,7 +3533,7 @@ void cds_incr_active_session(enum tQDF_ADAPTER_MODE mode,
 	 * Need to aquire mutex as entire functionality in this function
 	 * is in critical section
 	 */
-	qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock);
 	switch (mode) {
 	case QDF_STA_MODE:
 	case QDF_P2P_CLIENT_MODE:
@@ -3558,7 +3558,7 @@ void cds_incr_active_session(enum tQDF_ADAPTER_MODE mode,
 		cds_info("Set PCL of STA to FW");
 	}
 	cds_incr_connection_count(session_id);
-	qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 }
 
 /**
@@ -3716,7 +3716,7 @@ void cds_decr_session_set_pcl(enum tQDF_ADAPTER_MODE mode,
 	 * given to the FW. After setting the PCL, we need to restore
 	 * the entry that we have saved before.
 	 */
-	qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock);
 	cds_set_pcl_for_existing_combo(CDS_STA_MODE);
 	/* do we need to change the HW mode */
 	if (cds_need_opportunistic_upgrade()) {
@@ -3729,7 +3729,7 @@ void cds_decr_session_set_pcl(enum tQDF_ADAPTER_MODE mode,
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 			cds_err("Failed to start dbs opportunistic timer");
 	}
-	qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 
 	return;
 }
@@ -3768,7 +3768,7 @@ void cds_decr_active_session(enum tQDF_ADAPTER_MODE mode,
 	 * Need to aquire mutex as entire functionality in this function
 	 * is in critical section
 	 */
-	qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock);
 	switch (mode) {
 	case QDF_STA_MODE:
 	case QDF_P2P_CLIENT_MODE:
@@ -3784,7 +3784,7 @@ void cds_decr_active_session(enum tQDF_ADAPTER_MODE mode,
 	cds_info("No.# of active sessions for mode %d = %d",
 		mode, hdd_ctx->no_of_active_sessions[mode]);
 	cds_decr_connection_count(session_id);
-	qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 }
 
 /**
@@ -3807,7 +3807,7 @@ void cds_dbs_opportunistic_timer_handler(void *data)
 		return;
 	}
 
-	qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock);
 	/* if we still need it */
 	action = cds_need_opportunistic_upgrade();
 	if (action) {
@@ -3819,7 +3819,7 @@ void cds_dbs_opportunistic_timer_handler(void *data)
 		cds_next_actions(0, action,
 				CDS_UPDATE_REASON_OPPORTUNISTIC);
 	}
-	qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 
 }
 
@@ -3841,8 +3841,8 @@ QDF_STATUS cds_deinit_policy_mgr(void)
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_destroy(
-					&cds_ctx->cdf_conc_list_lock))) {
-		cds_err("Failed to destroy cdf_conc_list_lock");
+					&cds_ctx->qdf_conc_list_lock))) {
+		cds_err("Failed to destroy qdf_conc_list_lock");
 		return QDF_STATUS_E_FAILURE;
 	}
 	return QDF_STATUS_SUCCESS;
@@ -3880,8 +3880,8 @@ QDF_STATUS cds_init_policy_mgr(void)
 	qdf_mem_zero(conc_connection_list, sizeof(conc_connection_list));
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_create(
-					&cds_ctx->cdf_conc_list_lock))) {
-		cds_err("Failed to init cdf_conc_list_lock");
+					&cds_ctx->qdf_conc_list_lock))) {
+		cds_err("Failed to init qdf_conc_list_lock");
 		/* Lets us not proceed further */
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -3897,7 +3897,7 @@ QDF_STATUS cds_init_policy_mgr(void)
 		return status;
 	}
 
-	status = cdf_init_connection_update();
+	status = qdf_init_connection_update();
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		cds_err("connection_update_done_evt init failed");
 		return status;
@@ -4093,7 +4093,7 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id)
 		return status;
 	}
 
-	qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock);
 	while (CONC_CONNECTION_LIST_VALID_INDEX(conn_index)) {
 		if (vdev_id == conc_connection_list[conn_index].vdev_id) {
 			/* debug msg */
@@ -4104,7 +4104,7 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id)
 	}
 	if (!found) {
 		/* err msg */
-		qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+		qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 		cds_err("can't find vdev_id %d in conc_connection_list",
 			vdev_id);
 		return status;
@@ -4114,7 +4114,7 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id)
 
 	if (NULL == wma_conn_table_entry) {
 		/* err msg*/
-		qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+		qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 		cds_err("can't find vdev_id %d in WMA table", vdev_id);
 		return status;
 	}
@@ -4129,7 +4129,7 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id)
 			wma_conn_table_entry->tx_streams,
 			wma_conn_table_entry->rx_streams,
 			wma_conn_table_entry->nss, vdev_id, true);
-	qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -4878,7 +4878,7 @@ bool cds_allow_concurrency(enum cds_con_mode mode,
 		return status;
 	}
 
-	qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock);
 	/* find the current connection state from conc_connection_list*/
 	num_connections = cds_get_connection_count();
 
@@ -5065,7 +5065,7 @@ bool cds_allow_concurrency(enum cds_con_mode mode,
 	status = true;
 
 done:
-	qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 	return status;
 }
 
@@ -5572,7 +5572,7 @@ QDF_STATUS cds_current_connections_update(uint32_t session_id,
 	else
 		band = CDS_BAND_5;
 
-	qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock);
 	num_connections = cds_get_connection_count();
 
 	cds_debug("num_connections=%d channel=%d",
@@ -5629,7 +5629,7 @@ QDF_STATUS cds_current_connections_update(uint32_t session_id,
 		reason, session_id);
 
 done:
-	qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 	return status;
 }
 
@@ -5721,10 +5721,10 @@ void cds_nss_update_cb(void *context, uint8_t tx_status, uint8_t vdev_id,
 	/*
 	 * Check if we are ok to request for HW mode change now
 	 */
-	qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock);
 	conn_index = cds_get_connection_for_vdev_id(vdev_id);
 	if (MAX_NUMBER_OF_CONC_CONNECTIONS == conn_index) {
-		qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+		qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 		cds_err("connection not found for vdev %d", vdev_id);
 		return;
 	}
@@ -5747,7 +5747,7 @@ void cds_nss_update_cb(void *context, uint8_t tx_status, uint8_t vdev_id,
 		cds_next_actions(vdev_id,
 				next_action,
 				CDS_UPDATE_REASON_NSS_UPDATE);
-	qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 	return;
 }
 
@@ -6584,7 +6584,7 @@ QDF_STATUS cds_handle_conc_multiport(uint8_t session_id, uint8_t channel)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	status = cdf_reset_connection_update();
+	status = qdf_reset_connection_update();
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		cds_err("clearing event failed");
 
@@ -6692,7 +6692,7 @@ static void cds_check_sta_ap_concurrent_ch_intf(void *data)
 	uint16_t intf_ch = 0;
 
 	if ((hdd_ctx->config->WlanMccToSccSwitchMode ==
-				CDF_MCC_TO_SCC_SWITCH_DISABLE)
+				QDF_MCC_TO_SCC_SWITCH_DISABLE)
 			|| !(cds_concurrent_open_sessions_running()
 			    || !(cds_get_concurrency_mode() ==
 					(QDF_STA_MASK | QDF_SAP_MASK))))
@@ -6745,7 +6745,7 @@ void cds_check_concurrent_intf_and_restart_sap(hdd_station_ctx_t *hdd_sta_ctx,
 	}
 
 	if ((hdd_ctx->config->WlanMccToSccSwitchMode
-				!= CDF_MCC_TO_SCC_SWITCH_DISABLE) &&
+				!= QDF_MCC_TO_SCC_SWITCH_DISABLE) &&
 			((0 == hdd_ctx->config->conc_custom_rule1) &&
 			 (0 == hdd_ctx->config->conc_custom_rule2))
 #ifdef FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE
@@ -7053,7 +7053,7 @@ int32_t cds_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapater,
  */
 QDF_STATUS cds_change_mcc_go_beacon_interval(hdd_adapter_t *pHostapdAdapter)
 {
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	void *hHal;
 
 	cds_info("UPDATE Beacon Params");
@@ -7064,11 +7064,11 @@ QDF_STATUS cds_change_mcc_go_beacon_interval(hdd_adapter_t *pHostapdAdapter)
 			cds_err("Hal ctx is null");
 			return QDF_STATUS_E_FAULT;
 		}
-		cdf_ret_status =
+		qdf_ret_status =
 			sme_change_mcc_beacon_interval(hHal,
 					pHostapdAdapter->
 					sessionId);
-		if (cdf_ret_status == QDF_STATUS_E_FAILURE) {
+		if (qdf_ret_status == QDF_STATUS_E_FAILURE) {
 			cds_err("Failed to update Beacon Params");
 			return QDF_STATUS_E_FAILURE;
 		}
@@ -7289,11 +7289,11 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter)
 #endif
 		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);
+		qdf_event_reset(&hostapd_state->qdf_stop_bss_event);
 		if (QDF_STATUS_SUCCESS == wlansap_stop_bss(sap_ctx)) {
 			qdf_status =
 				qdf_wait_single_event(&hostapd_state->
-						cdf_stop_bss_event,
+						qdf_stop_bss_event,
 						BSS_WAIT_TIMEOUT);
 
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -7322,7 +7322,7 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter)
 
 		cds_info("Waiting for SAP to start");
 		qdf_status =
-			qdf_wait_single_event(&hostapd_state->cdf_event,
+			qdf_wait_single_event(&hostapd_state->qdf_event,
 					BSS_WAIT_TIMEOUT);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			cds_err("SAP Start failed");
@@ -7404,7 +7404,7 @@ QDF_STATUS cds_update_connection_info_utfw(
 		return status;
 	}
 
-	qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock);
 	while (CONC_CONNECTION_LIST_VALID_INDEX(conn_index)) {
 		if (vdev_id == conc_connection_list[conn_index].vdev_id) {
 			/* debug msg */
@@ -7415,7 +7415,7 @@ QDF_STATUS cds_update_connection_info_utfw(
 	}
 	if (!found) {
 		/* err msg */
-		qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+		qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 		cds_err("can't find vdev_id %d in conc_connection_list",
 			vdev_id);
 		return status;
@@ -7426,7 +7426,7 @@ QDF_STATUS cds_update_connection_info_utfw(
 			cds_get_mode(type, sub_type),
 			channelid, mac_id, chain_mask, tx_streams,
 			rx_streams, 0, vdev_id, true);
-	qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -7453,11 +7453,11 @@ QDF_STATUS cds_incr_connection_count_utfw(
 		return status;
 	}
 
-	qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock);
 	conn_index = cds_get_connection_count();
 	if (MAX_NUMBER_OF_CONC_CONNECTIONS <= conn_index) {
 		/* err msg */
-		qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+		qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 		cds_err("exceeded max connection limit %d",
 			MAX_NUMBER_OF_CONC_CONNECTIONS);
 		return status;
@@ -7468,7 +7468,7 @@ QDF_STATUS cds_incr_connection_count_utfw(
 			     cds_get_mode(type, sub_type),
 			     channelid, mac_id, chain_mask, tx_streams,
 			     rx_streams, 0, vdev_id, true);
-	qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+	qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -7492,9 +7492,9 @@ QDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all,
 			return QDF_STATUS_E_FAILURE;
 		}
 	} else {
-		qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock);
+		qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock);
 		cds_decr_connection_count(vdev_id);
-		qdf_mutex_release(&cds_ctx->cdf_conc_list_lock);
+		qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);
 	}
 
 	return QDF_STATUS_SUCCESS;
@@ -7735,14 +7735,14 @@ bool cds_is_sta_active_connection_exists(void)
 }
 
 /**
- * cdf_wait_for_connection_update() - Wait for hw mode command to get processed
+ * qdf_wait_for_connection_update() - Wait for hw mode command to get processed
  *
  * Waits for CONNECTION_UPDATE_TIMEOUT duration until the set hw mode
  * response sets the event connection_update_done_evt
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS cdf_wait_for_connection_update(void)
+QDF_STATUS qdf_wait_for_connection_update(void)
 {
 	QDF_STATUS status;
 	p_cds_contextType cds_context;
@@ -7766,13 +7766,13 @@ QDF_STATUS cdf_wait_for_connection_update(void)
 }
 
 /**
- * cdf_reset_connection_update() - Reset connection update event
+ * qdf_reset_connection_update() - Reset connection update event
  *
  * Resets the concurrent connection update event
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS cdf_reset_connection_update(void)
+QDF_STATUS qdf_reset_connection_update(void)
 {
 	QDF_STATUS status;
 	p_cds_contextType cds_context;
@@ -7794,13 +7794,13 @@ QDF_STATUS cdf_reset_connection_update(void)
 }
 
 /**
- * cdf_set_connection_update() - Set connection update event
+ * qdf_set_connection_update() - Set connection update event
  *
  * Sets the concurrent connection update event
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS cdf_set_connection_update(void)
+QDF_STATUS qdf_set_connection_update(void)
 {
 	QDF_STATUS status;
 	p_cds_contextType cds_context;
@@ -7822,13 +7822,13 @@ QDF_STATUS cdf_set_connection_update(void)
 }
 
 /**
- * cdf_init_connection_update() - Initialize connection update event
+ * qdf_init_connection_update() - Initialize connection update event
  *
  * Initializes the concurrent connection update event
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS cdf_init_connection_update(void)
+QDF_STATUS qdf_init_connection_update(void)
 {
 	QDF_STATUS qdf_status;
 	p_cds_contextType cds_context;

core/cds/src/cds_mq.c

@@ -53,7 +53,7 @@ tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, void *pMb);
  *
  * This function initializes the Message queue.
  *
- * Return: cdf status
+ * Return: qdf status
  */
 inline QDF_STATUS cds_mq_init(p_cds_mq_type pMq)
 {
@@ -184,11 +184,11 @@ inline bool cds_is_mq_empty(p_cds_mq_type pMq)
  * cds_send_mb_message_to_mac() - post a message to a message queue
  * @pBuf: Pointer to buffer allocated by caller
  *
- * Return: cdf status
+ * Return: qdf status
  */
 QDF_STATUS cds_send_mb_message_to_mac(void *pBuf)
 {
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	tSirRetStatus sirStatus;
 	v_CONTEXT_t cds_context;
 	void *hHal;
@@ -205,11 +205,11 @@ QDF_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 = QDF_STATUS_SUCCESS;
+				qdf_ret_status = QDF_STATUS_SUCCESS;
 		}
 	}
 
 	qdf_mem_free(pBuf);
 
-	return cdf_ret_status;
+	return qdf_ret_status;
 }

core/cds/src/cds_packet.c

@@ -292,7 +292,7 @@ void cds_pkt_proto_trace_close(void)
 QDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket,
 				  uint8_t *file_name, uint32_t line_num)
 {
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	qdf_nbuf_t nbuf;
 
 	nbuf = qdf_nbuf_alloc_debug(NULL,
@@ -305,10 +305,10 @@ QDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket,
 		qdf_nbuf_set_protocol(nbuf, ETH_P_CONTROL);
 		*ppPacket = nbuf;
 		*data = qdf_nbuf_data(nbuf);
-		cdf_ret_status = QDF_STATUS_SUCCESS;
+		qdf_ret_status = QDF_STATUS_SUCCESS;
 	}
 
-	return cdf_ret_status;
+	return qdf_ret_status;
 }
 #else
 /*---------------------------------------------------------------------------
@@ -317,7 +317,7 @@ QDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket,
    ---------------------------------------------------------------------------*/
 QDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket)
 {
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	qdf_nbuf_t nbuf;
 
 	nbuf = qdf_nbuf_alloc(NULL, roundup(size + TX_PKT_MIN_HEADROOM, 4),
@@ -328,10 +328,10 @@ QDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket)
 		qdf_nbuf_set_protocol(nbuf, ETH_P_CONTROL);
 		*ppPacket = nbuf;
 		*data = qdf_nbuf_data(nbuf);
-		cdf_ret_status = QDF_STATUS_SUCCESS;
+		qdf_ret_status = QDF_STATUS_SUCCESS;
 	}
 
-	return cdf_ret_status;
+	return qdf_ret_status;
 }
 
 #endif

core/cds/src/cds_sched.c

@@ -184,7 +184,7 @@ static struct notifier_block cds_cpu_hotplug_notifier = {
  *	dispatch messages.
  *
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS cds_sched_open(void *p_cds_context,
 		p_cds_sched_context pSchedContext,
@@ -893,7 +893,7 @@ static int cds_ol_rx_thread(void *arg)
  *	- The Tx thread is closed
  *
  *
- * Return: cdf status
+ * Return: qdf status
  */
 QDF_STATUS cds_sched_close(void *p_cds_context)
 {
@@ -938,7 +938,7 @@ QDF_STATUS cds_sched_close(void *p_cds_context)
  *
  * This api initializes the cds scheduler message queues.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext)
 {

core/cds/src/cds_utils.c

@@ -485,7 +485,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm)
 
 	/* Validate IPN */
 	rx_ipn = mmie->sequence_number;
-	if (OS_MEMCMP(rx_ipn, ipn, CMAC_IPN_LEN) != 0) {
+	if (OS_MEMCMP(rx_ipn, ipn, CMAC_IPN_LEN) > 0) {
 		/* Replay error */
 		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "Replay error mmie ipn %02X %02X %02X %02X %02X %02X"
@@ -591,7 +591,7 @@ err_tfm:
  * @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
  *
  */
 
@@ -753,7 +753,7 @@ QDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle,      /* Handle */
  * @param keyLen length of key
  * @param digest holds resultant MD5 HMAC (20B)
  *
- * @return CDF_STATUS_SUCCSS if the operation succeeds
+ * @return QDF_STATUS_SUCCSS if the operation succeeds
  *
  */
 struct hmac_md5_result {

core/dp/htt/htt_internal.h

@@ -194,18 +194,18 @@ static inline void htt_print_rx_desc_lro(struct htt_host_rx_desc_base *rx_desc)
 static inline void htt_rx_extract_lro_info(qdf_nbuf_t msdu,
 	 struct htt_host_rx_desc_base *rx_desc)
 {
-	NBUF_CB_RX_LRO_ELIGIBLE(msdu) = rx_desc->msdu_end.lro_eligible;
+	QDF_NBUF_CB_RX_LRO_ELIGIBLE(msdu) = rx_desc->msdu_end.lro_eligible;
 	if (rx_desc->msdu_end.lro_eligible) {
-		NBUF_CB_RX_TCP_PURE_ACK(msdu) = rx_desc->msdu_start.tcp_only_ack;
-		NBUF_CB_RX_TCP_CHKSUM(msdu) = rx_desc->msdu_end.tcp_udp_chksum;
-		NBUF_CB_RX_TCP_SEQ_NUM(msdu) = rx_desc->msdu_end.tcp_seq_number;
-		NBUF_CB_RX_TCP_ACK_NUM(msdu) = rx_desc->msdu_end.tcp_ack_number;
-		NBUF_CB_RX_TCP_WIN(msdu) = rx_desc->msdu_end.window_size;
-		NBUF_CB_RX_TCP_PROTO(msdu) = rx_desc->msdu_start.tcp_proto;
-		NBUF_CB_RX_IPV6_PROTO(msdu) = rx_desc->msdu_start.ipv6_proto;
-		NBUF_CB_RX_IP_OFFSET(msdu) = rx_desc->msdu_start.l3_offset;
-		NBUF_CB_RX_TCP_OFFSET(msdu) = rx_desc->msdu_start.l4_offset;
-		NBUF_CB_RX_FLOW_ID_TOEPLITZ(msdu) =
+		QDF_NBUF_CB_RX_TCP_PURE_ACK(msdu) = rx_desc->msdu_start.tcp_only_ack;
+		QDF_NBUF_CB_RX_TCP_CHKSUM(msdu) = rx_desc->msdu_end.tcp_udp_chksum;
+		QDF_NBUF_CB_RX_TCP_SEQ_NUM(msdu) = rx_desc->msdu_end.tcp_seq_number;
+		QDF_NBUF_CB_RX_TCP_ACK_NUM(msdu) = rx_desc->msdu_end.tcp_ack_number;
+		QDF_NBUF_CB_RX_TCP_WIN(msdu) = rx_desc->msdu_end.window_size;
+		QDF_NBUF_CB_RX_TCP_PROTO(msdu) = rx_desc->msdu_start.tcp_proto;
+		QDF_NBUF_CB_RX_IPV6_PROTO(msdu) = rx_desc->msdu_start.ipv6_proto;
+		QDF_NBUF_CB_RX_IP_OFFSET(msdu) = rx_desc->msdu_start.l3_offset;
+		QDF_NBUF_CB_RX_TCP_OFFSET(msdu) = rx_desc->msdu_start.l4_offset;
+		QDF_NBUF_CB_RX_FLOW_ID_TOEPLITZ(msdu) =
 			 rx_desc->msdu_start.flow_id_toeplitz;
 	}
 }

core/dp/htt/htt_rx.c

@@ -346,7 +346,7 @@ void htt_rx_detach(struct htt_pdev_t *pdev)
 	qdf_timer_free(&pdev->rx_ring.refill_retry_timer);
 
 	if (pdev->cfg.is_full_reorder_offload) {
-		qdf_mem_free_consistent(pdev->osdev,
+		qdf_mem_free_consistent(pdev->osdev, pdev->osdev->dev,
 					   sizeof(uint32_t),
 					   pdev->rx_ring.target_idx.vaddr,
 					   pdev->rx_ring.target_idx.paddr,
@@ -378,7 +378,7 @@ void htt_rx_detach(struct htt_pdev_t *pdev)
 		qdf_mem_free(pdev->rx_ring.buf.netbufs_ring);
 	}
 
-	qdf_mem_free_consistent(pdev->osdev,
+	qdf_mem_free_consistent(pdev->osdev, pdev->osdev->dev,
 				   sizeof(uint32_t),
 				   pdev->rx_ring.alloc_idx.vaddr,
 				   pdev->rx_ring.alloc_idx.paddr,
@@ -386,7 +386,7 @@ void htt_rx_detach(struct htt_pdev_t *pdev)
 							    alloc_idx),
 							   memctx));
 
-	qdf_mem_free_consistent(pdev->osdev,
+	qdf_mem_free_consistent(pdev->osdev, pdev->osdev->dev,
 				   pdev->rx_ring.size * sizeof(qdf_dma_addr_t),
 				   pdev->rx_ring.buf.paddrs_ring,
 				   pdev->rx_ring.base_paddr,
@@ -1326,7 +1326,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev,
 /* Util fake function that has same prototype as qdf_nbuf_clone that just
  * retures the same nbuf
  */
-qdf_nbuf_t htt_rx_cdf_noclone_buf(qdf_nbuf_t buf)
+qdf_nbuf_t htt_rx_qdf_noclone_buf(qdf_nbuf_t buf)
 {
 	return buf;
 }
@@ -1415,7 +1415,7 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev,
 	 * waste cycles cloning the packets
 	 */
 	clone_nbuf_fn =
-		clone_not_reqd ? htt_rx_cdf_noclone_buf : qdf_nbuf_clone;
+		clone_not_reqd ? htt_rx_qdf_noclone_buf : qdf_nbuf_clone;
 
 	/* The nbuf has been pulled just beyond the status and points to the
 	 * payload
@@ -1625,7 +1625,7 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev,
 
 	}
 
-	/* TODO: Convert this to suitable cdf routines */
+	/* TODO: Convert this to suitable qdf routines */
 	qdf_nbuf_append_ext_list(mpdu_buf, head_frag_list_cloned,
 				 frag_list_sum_len);
 
@@ -2049,7 +2049,7 @@ int htt_rx_hash_init(struct htt_pdev_t *pdev)
 {
 	int i, j;
 
-	HTT_ASSERT2(CDF_IS_PWR2(RX_NUM_HASH_BUCKETS));
+	HTT_ASSERT2(QDF_IS_PWR2(RX_NUM_HASH_BUCKETS));
 
 	pdev->rx_ring.hash_table =
 		qdf_mem_malloc(RX_NUM_HASH_BUCKETS *
@@ -2132,7 +2132,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev)
 	uint32_t ring_elem_size = sizeof(qdf_dma_addr_t);
 
 	pdev->rx_ring.size = htt_rx_ring_size(pdev);
-	HTT_ASSERT2(CDF_IS_PWR2(pdev->rx_ring.size));
+	HTT_ASSERT2(QDF_IS_PWR2(pdev->rx_ring.size));
 	pdev->rx_ring.size_mask = pdev->rx_ring.size - 1;
 
 	/*
@@ -2247,7 +2247,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev)
 	return 0;               /* success */
 
 fail3:
-	qdf_mem_free_consistent(pdev->osdev,
+	qdf_mem_free_consistent(pdev->osdev, pdev->osdev->dev,
 				   pdev->rx_ring.size * sizeof(qdf_dma_addr_t),
 				   pdev->rx_ring.buf.paddrs_ring,
 				   pdev->rx_ring.base_paddr,
@@ -2256,7 +2256,7 @@ fail3:
 
 fail2:
 	if (pdev->cfg.is_full_reorder_offload) {
-		qdf_mem_free_consistent(pdev->osdev,
+		qdf_mem_free_consistent(pdev->osdev, pdev->osdev->dev,
 					   sizeof(uint32_t),
 					   pdev->rx_ring.target_idx.vaddr,
 					   pdev->rx_ring.target_idx.paddr,
@@ -2315,7 +2315,7 @@ int htt_rx_ipa_uc_alloc_wdi2_rsc(struct htt_pdev_t *pdev,
 	if (!pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.vaddr) {
 		qdf_print("%s: RX PROC DONE IND alloc fail", __func__);
 		qdf_mem_free_consistent(
-			pdev->osdev,
+			pdev->osdev, pdev->osdev->dev,
 			pdev->ipa_uc_rx_rsc.rx2_ind_ring_size,
 			pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr,
 			pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.paddr,
@@ -2377,7 +2377,7 @@ int htt_rx_ipa_uc_attach(struct htt_pdev_t *pdev,
 	if (!pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.vaddr) {
 		qdf_print("%s: RX PROC DONE IND alloc fail", __func__);
 		qdf_mem_free_consistent(
-			pdev->osdev,
+			pdev->osdev, pdev->osdev->dev,
 			pdev->ipa_uc_rx_rsc.rx_ind_ring_size,
 			pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr,
 			pdev->ipa_uc_rx_rsc.rx_ind_ring_base.paddr,
@@ -2403,7 +2403,7 @@ void htt_rx_ipa_uc_free_wdi2_rsc(struct htt_pdev_t *pdev)
 {
 	if (pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr) {
 		qdf_mem_free_consistent(
-			pdev->osdev,
+			pdev->osdev, pdev->osdev->dev,
 			pdev->ipa_uc_rx_rsc.rx2_ind_ring_size,
 			pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr,
 			pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.paddr,
@@ -2414,7 +2414,7 @@ void htt_rx_ipa_uc_free_wdi2_rsc(struct htt_pdev_t *pdev)
 
 	if (pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.vaddr) {
 		qdf_mem_free_consistent(
-			pdev->osdev,
+			pdev->osdev, pdev->osdev->dev,
 			4,
 			pdev->ipa_uc_rx_rsc.
 			rx_ipa_prc_done_idx.vaddr,
@@ -2435,7 +2435,7 @@ int htt_rx_ipa_uc_detach(struct htt_pdev_t *pdev)
 {
 	if (pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr) {
 		qdf_mem_free_consistent(
-			pdev->osdev,
+			pdev->osdev, pdev->osdev->dev,
 			pdev->ipa_uc_rx_rsc.rx_ind_ring_size,
 			pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr,
 			pdev->ipa_uc_rx_rsc.rx_ind_ring_base.paddr,
@@ -2446,7 +2446,7 @@ int htt_rx_ipa_uc_detach(struct htt_pdev_t *pdev)
 
 	if (pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.vaddr) {
 		qdf_mem_free_consistent(
-			pdev->osdev,
+			pdev->osdev, pdev->osdev->dev,
 			4,
 			pdev->ipa_uc_rx_rsc.
 			rx_ipa_prc_done_idx.vaddr,

core/dp/htt/htt_tx.c

@@ -1052,7 +1052,7 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev,
 	return 0;
 
 free_tx_comp_base:
-	qdf_mem_free_consistent(pdev->osdev,
+	qdf_mem_free_consistent(pdev->osdev, pdev->osdev->dev,
 				   tx_comp_ring_size,
 				   pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr,
 				   pdev->ipa_uc_tx_rsc.tx_comp_base.paddr,
@@ -1061,7 +1061,7 @@ free_tx_comp_base:
 							    tx_comp_base),
 							   memctx));
 free_tx_ce_idx:
-	qdf_mem_free_consistent(pdev->osdev,
+	qdf_mem_free_consistent(pdev->osdev, pdev->osdev->dev,
 				   4,
 				   pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr,
 				   pdev->ipa_uc_tx_rsc.tx_ce_idx.paddr,
@@ -1078,7 +1078,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev)
 
 	if (pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr) {
 		qdf_mem_free_consistent(
-			pdev->osdev,
+			pdev->osdev, pdev->osdev->dev,
 			4,
 			pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr,
 			pdev->ipa_uc_tx_rsc.tx_ce_idx.paddr,
@@ -1089,7 +1089,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev)
 
 	if (pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr) {
 		qdf_mem_free_consistent(
-			pdev->osdev,
+			pdev->osdev, pdev->osdev->dev,
 			ol_cfg_ipa_uc_tx_max_buf_cnt(pdev->ctrl_pdev) *
 							sizeof(qdf_nbuf_t),
 			pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr,
@@ -1125,7 +1125,7 @@ htt_tx_desc_fill_tso_info(htt_pdev_handle pdev, void *desc,
 {
 	u_int32_t *word;
 	int i;
-	struct cdf_tso_seg_elem_t *tso_seg = tso_info->curr_seg;
+	struct qdf_tso_seg_elem_t *tso_seg = tso_info->curr_seg;
 	struct msdu_ext_desc_t *msdu_ext_desc = (struct msdu_ext_desc_t *)desc;
 
 	word = (u_int32_t *)(desc);

core/dp/htt/htt_types.h

@@ -195,7 +195,7 @@ struct msdu_ext_frag_desc {
 };
 
 struct msdu_ext_desc_t {
-	struct cdf_tso_flags_t tso_flags;
+	struct qdf_tso_flags_t tso_flags;
 	struct msdu_ext_frag_desc frags[6];
 /*
 	u_int32_t frag_ptr0;

core/dp/ol/inc/ol_txrx_ctrl_api.h

@@ -762,7 +762,7 @@ enum ol_txrx_peer_state {
  * @param data_peer - which peer has changed its state
  * @param state - the new state of the peer
  *
- * Return: CDF Status
+ * Return: QDF Status
  */
 QDF_STATUS
 ol_txrx_peer_state_update(ol_txrx_pdev_handle pdev, uint8_t *peer_addr,

core/dp/txrx/ol_rx_reorder.c

@@ -27,7 +27,7 @@
 
 /*=== header file includes ===*/
 /* generic utilities */
-#include <qdf_nbuf.h>           /* cdf_nbuf_t, etc. */
+#include <qdf_nbuf.h>           /* qdf_nbuf_t, etc. */
 #include <qdf_mem.h>         /* qdf_mem_malloc */
 
 #include <ieee80211.h>          /* IEEE80211_SEQ_MAX */

core/dp/txrx/ol_tx.c

@@ -99,7 +99,7 @@ static inline uint8_t ol_tx_prepare_tso(ol_txrx_vdev_handle vdev,
 		msdu_info->tso_info.tso_seg_list = NULL;
 		msdu_info->tso_info.num_segs = num_seg;
 		while (num_seg) {
-			struct cdf_tso_seg_elem_t *tso_seg =
+			struct qdf_tso_seg_elem_t *tso_seg =
 				ol_tso_alloc_segment(vdev->pdev);
 			if (tso_seg) {
 				tso_seg->next =
@@ -108,8 +108,8 @@ static inline uint8_t ol_tx_prepare_tso(ol_txrx_vdev_handle vdev,
 					= tso_seg;
 				num_seg--;
 			} else {
-				struct cdf_tso_seg_elem_t *next_seg;
-				struct cdf_tso_seg_elem_t *free_seg =
+				struct qdf_tso_seg_elem_t *next_seg;
+				struct qdf_tso_seg_elem_t *free_seg =
 					msdu_info->tso_info.tso_seg_list;
 				qdf_print("TSO seg alloc failed!\n");
 				while (free_seg) {
@@ -288,7 +288,7 @@ qdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list)
 		while (segments) {
 
 			if (msdu_info.tso_info.curr_seg)
-				NBUF_CB_PADDR(msdu) =
+				QDF_NBUF_CB_PADDR(msdu) =
 					msdu_info.tso_info.curr_seg->
 					seg.tso_frags[0].paddr_low_32;
 
@@ -558,7 +558,7 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list)
 		while (segments) {
 
 			if (msdu_info.tso_info.curr_seg)
-				NBUF_CB_PADDR(msdu) = msdu_info.tso_info.
+				QDF_NBUF_CB_PADDR(msdu) = msdu_info.tso_info.
 					curr_seg->seg.tso_frags[0].paddr_low_32;
 
 			segments--;
@@ -1368,13 +1368,13 @@ qdf_nbuf_t ol_tx_reinject(struct ol_txrx_vdev_t *vdev,
 void ol_tso_seg_list_init(struct ol_txrx_pdev_t *pdev, uint32_t num_seg)
 {
 	int i;
-	struct cdf_tso_seg_elem_t *c_element;
+	struct qdf_tso_seg_elem_t *c_element;
 
-	c_element = qdf_mem_malloc(sizeof(struct cdf_tso_seg_elem_t));
+	c_element = qdf_mem_malloc(sizeof(struct qdf_tso_seg_elem_t));
 	pdev->tso_seg_pool.freelist = c_element;
 	for (i = 0; i < (num_seg - 1); i++) {
 		c_element->next =
-			qdf_mem_malloc(sizeof(struct cdf_tso_seg_elem_t));
+			qdf_mem_malloc(sizeof(struct qdf_tso_seg_elem_t));
 		c_element = c_element->next;
 		c_element->next = NULL;
 	}
@@ -1385,8 +1385,8 @@ void ol_tso_seg_list_init(struct ol_txrx_pdev_t *pdev, uint32_t num_seg)
 void ol_tso_seg_list_deinit(struct ol_txrx_pdev_t *pdev)
 {
 	int i;
-	struct cdf_tso_seg_elem_t *c_element;
-	struct cdf_tso_seg_elem_t *temp;
+	struct qdf_tso_seg_elem_t *c_element;
+	struct qdf_tso_seg_elem_t *temp;
 
 	qdf_spin_lock_bh(&pdev->tso_seg_pool.tso_mutex);
 	c_element = pdev->tso_seg_pool.freelist;

core/dp/txrx/ol_tx_desc.c

@@ -28,7 +28,7 @@
 #include <qdf_net_types.h>      /* QDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */
 #include <qdf_nbuf.h>           /* qdf_nbuf_t, etc. */
 #include <qdf_util.h>           /* qdf_assert */
-#include <qdf_lock.h>           /* cdf_spinlock */
+#include <qdf_lock.h>           /* qdf_spinlock */
 #ifdef QCA_COMPUTE_TX_DELAY
 #include <qdf_time.h>           /* qdf_system_ticks */
 #endif
@@ -546,9 +546,9 @@ void ol_tx_desc_frame_free_nonstd(struct ol_txrx_pdev_t *pdev,
  *
  * Return: none
  */
-struct cdf_tso_seg_elem_t *ol_tso_alloc_segment(struct ol_txrx_pdev_t *pdev)
+struct qdf_tso_seg_elem_t *ol_tso_alloc_segment(struct ol_txrx_pdev_t *pdev)
 {
-	struct cdf_tso_seg_elem_t *tso_seg = NULL;
+	struct qdf_tso_seg_elem_t *tso_seg = NULL;
 
 	qdf_spin_lock_bh(&pdev->tso_seg_pool.tso_mutex);
 	if (pdev->tso_seg_pool.freelist) {
@@ -574,7 +574,7 @@ struct cdf_tso_seg_elem_t *ol_tso_alloc_segment(struct ol_txrx_pdev_t *pdev)
  */
 
 void ol_tso_free_segment(struct ol_txrx_pdev_t *pdev,
-	 struct cdf_tso_seg_elem_t *tso_seg)
+	 struct qdf_tso_seg_elem_t *tso_seg)
 {
 	qdf_spin_lock_bh(&pdev->tso_seg_pool.tso_mutex);
 	tso_seg->next = pdev->tso_seg_pool.freelist;

core/dp/txrx/ol_tx_desc.h

@@ -159,10 +159,10 @@ void *ol_ath_get_bcn_header(ol_pdev_handle pdev, A_UINT32 vdev_id);
 void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc);
 
 #if defined(FEATURE_TSO)
-struct cdf_tso_seg_elem_t *ol_tso_alloc_segment(struct ol_txrx_pdev_t *pdev);
+struct qdf_tso_seg_elem_t *ol_tso_alloc_segment(struct ol_txrx_pdev_t *pdev);
 
 void ol_tso_free_segment(struct ol_txrx_pdev_t *pdev,
-	 struct cdf_tso_seg_elem_t *tso_seg);
+	 struct qdf_tso_seg_elem_t *tso_seg);
 #else
 #define ol_tso_alloc_segment(pdev) /*no-op*/
 #define ol_tso_free_segment(pdev, tso_seg) /*no-op*/

core/dp/txrx/ol_tx_send.c

@@ -26,7 +26,7 @@
  */
 
 #include <qdf_atomic.h>         /* qdf_atomic_inc, etc. */
-#include <qdf_lock.h>           /* cdf_os_spinlock */
+#include <qdf_lock.h>           /* qdf_os_spinlock */
 #include <qdf_time.h>           /* qdf_system_ticks, etc. */
 #include <qdf_nbuf.h>           /* qdf_nbuf_t */
 #include <qdf_net_types.h>      /* QDF_NBUF_TX_EXT_TID_INVALID */

core/dp/txrx/ol_txrx_flow_control.c

@@ -27,7 +27,7 @@
 
 /* OS abstraction libraries */
 #include <qdf_nbuf.h>           /* qdf_nbuf_t, etc. */
-#include <cdf_atomic.h>         /* qdf_atomic_read, etc. */
+#include <qdf_atomic.h>         /* qdf_atomic_read, etc. */
 #include <qdf_util.h>           /* qdf_unlikely */
 
 /* APIs for other modules */

core/dp/txrx/ol_txrx_internal.h

@@ -29,7 +29,7 @@
 #define _OL_TXRX_INTERNAL__H_
 
 #include <qdf_util.h>               /* qdf_assert */
-#include <qdf_nbuf.h>               /* cdf_nbuf_t */
+#include <qdf_nbuf.h>               /* qdf_nbuf_t */
 #include <qdf_mem.h>             /* qdf_mem_set */
 #include <cds_ieee80211_common.h>   /* ieee80211_frame */
 #include <ol_htt_rx_api.h>          /* htt_rx_msdu_desc_completes_mpdu, etc. */

core/dp/txrx/ol_txrx_types.h

@@ -32,7 +32,7 @@
 #ifndef _OL_TXRX_TYPES__H_
 #define _OL_TXRX_TYPES__H_
 
-#include <qdf_nbuf.h>           /* cdf_nbuf_t */
+#include <qdf_nbuf.h>           /* qdf_nbuf_t */
 #include <qdf_mem.h>
 #include <cds_queue.h>          /* TAILQ */
 #include <a_types.h>            /* A_UINT8 */
@@ -40,7 +40,7 @@
 #include <qdf_atomic.h>         /* qdf_atomic_t */
 #include <wdi_event_api.h>      /* wdi_event_subscribe */
 #include <qdf_timer.h>		/* qdf_timer_t */
-#include <qdf_lock.h>           /* cdf_spinlock */
+#include <qdf_lock.h>           /* qdf_spinlock */
 #include <pktlog.h>             /* ol_pktlog_dev_handle */
 #include <ol_txrx_stats.h>
 #include <txrx.h>
@@ -757,7 +757,7 @@ struct ol_txrx_pdev_t {
 	struct {
 		uint16_t pool_size;
 		uint16_t num_free;
-		struct cdf_tso_seg_elem_t *freelist;
+		struct qdf_tso_seg_elem_t *freelist;
 		/* tso mutex */
 		OL_TX_MUTEX_TYPE tso_mutex;
 	} tso_seg_pool;
@@ -854,7 +854,7 @@ struct ol_txrx_vdev_t {
 	struct {
 		int pool_elems; /* total number of elements in the pool */
 		int alloc_cnt; /* number of allocated elements */
-		uint32_t *freelist; /* free list of cdf_tso_seg_elem_t */
+		uint32_t *freelist; /* free list of qdf_tso_seg_elem_t */
 	} tso_pool_t;
 #endif
 

core/hdd/inc/wlan_hdd_cfg.h

@@ -346,9 +346,9 @@ typedef enum {
 
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 #define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE          "gWlanMccToSccSwitchMode"
-#define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_MIN      (CDF_MCC_TO_SCC_SWITCH_DISABLE)
-#define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_MAX      (CDF_MCC_TO_SCC_SWITCH_FORCE)
-#define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_DEFAULT  (CDF_MCC_TO_SCC_SWITCH_DISABLE)
+#define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_MIN      (QDF_MCC_TO_SCC_SWITCH_DISABLE)
+#define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_MAX      (QDF_MCC_TO_SCC_SWITCH_FORCE)
+#define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_DEFAULT  (QDF_MCC_TO_SCC_SWITCH_DISABLE)
 #endif
 
 #define CFG_DISABLE_PACKET_FILTER "gDisablePacketFilter"
@@ -1278,14 +1278,14 @@ typedef enum {
 #endif /* FEATURE_WLAN_FORCE_SAP_SCC */
 
 /*
- * CDF Trace Enable Control
+ * QDF Trace Enable Control
  * Notes:
  *  the MIN/MAX/DEFAULT values apply for all modules
  *  the DEFAULT value is outside the valid range.  if the DEFAULT
  *    value is not overridden, then no change will be made to the
  *    "built in" default values compiled into the code
  *  values are a bitmap indicating which log levels are to enabled
- *    (must match order of cdf_trace_level enumerations)
+ *    (must match order of qdf_trace_level enumerations)
  *    00000001  FATAL
  *    00000010  ERROR
  *    00000100  WARN
@@ -1298,29 +1298,29 @@ typedef enum {
  *  hence a value of 0xFF would set all bits (enable all logs)
  */
 
-#define CFG_CDF_TRACE_ENABLE_WDI_NAME     "cdf_trace_enable_wdi"
-#define CFG_CDF_TRACE_ENABLE_HDD_NAME     "cdf_trace_enable_hdd"
-#define CFG_CDF_TRACE_ENABLE_SME_NAME     "cdf_trace_enable_sme"
-#define CFG_CDF_TRACE_ENABLE_PE_NAME      "cdf_trace_enable_pe"
-#define CFG_CDF_TRACE_ENABLE_PMC_NAME     "cdf_trace_enable_pmc"
-#define CFG_CDF_TRACE_ENABLE_WMA_NAME     "cdf_trace_enable_wma"
-#define CFG_CDF_TRACE_ENABLE_SYS_NAME     "cdf_trace_enable_sys"
-#define CFG_CDF_TRACE_ENABLE_CDF_NAME     "cdf_trace_enable_cdf"
-#define CFG_CDF_TRACE_ENABLE_SAP_NAME     "cdf_trace_enable_sap"
-#define CFG_CDF_TRACE_ENABLE_HDD_SAP_NAME "cdf_trace_enable_hdd_sap"
-#define CFG_CDF_TRACE_ENABLE_BMI_NAME     "cdf_trace_enable_bmi"
-#define CFG_CDF_TRACE_ENABLE_CFG_NAME     "cdf_trace_enable_cfg"
-#define CFG_CDF_TRACE_ENABLE_EPPING       "cdf_trace_enable_epping"
-#define CFG_CDF_TRACE_ENABLE_CDF_DEVICES  "cdf_trace_enable_cdf_devices"
-#define CFG_CDF_TRACE_ENABLE_TXRX_NAME    "cfd_trace_enable_txrx"
-#define CFG_CDF_TRACE_ENABLE_HTC_NAME     "cdf_trace_enable_htc"
-#define CFG_CDF_TRACE_ENABLE_HIF_NAME     "cdf_trace_enable_hif"
-#define CFG_CDR_TRACE_ENABLE_HDD_SAP_DATA_NAME   "cdf_trace_enable_hdd_sap_data"
-#define CFG_CDF_TRACE_ENABLE_HDD_DATA_NAME       "cdf_trace_enable_hdd_data"
-
-#define CFG_CDF_TRACE_ENABLE_MIN          (0)
-#define CFG_CDF_TRACE_ENABLE_MAX          (0xff)
-#define CFG_CDF_TRACE_ENABLE_DEFAULT      (0xffff)
+#define CFG_QDF_TRACE_ENABLE_WDI_NAME     "qdf_trace_enable_wdi"
+#define CFG_QDF_TRACE_ENABLE_HDD_NAME     "qdf_trace_enable_hdd"
+#define CFG_QDF_TRACE_ENABLE_SME_NAME     "qdf_trace_enable_sme"
+#define CFG_QDF_TRACE_ENABLE_PE_NAME      "qdf_trace_enable_pe"
+#define CFG_QDF_TRACE_ENABLE_PMC_NAME     "qdf_trace_enable_pmc"
+#define CFG_QDF_TRACE_ENABLE_WMA_NAME     "qdf_trace_enable_wma"
+#define CFG_QDF_TRACE_ENABLE_SYS_NAME     "qdf_trace_enable_sys"
+#define CFG_QDF_TRACE_ENABLE_QDF_NAME     "qdf_trace_enable_qdf"
+#define CFG_QDF_TRACE_ENABLE_SAP_NAME     "qdf_trace_enable_sap"
+#define CFG_QDF_TRACE_ENABLE_HDD_SAP_NAME "qdf_trace_enable_hdd_sap"
+#define CFG_QDF_TRACE_ENABLE_BMI_NAME     "qdf_trace_enable_bmi"
+#define CFG_QDF_TRACE_ENABLE_CFG_NAME     "qdf_trace_enable_cfg"
+#define CFG_QDF_TRACE_ENABLE_EPPING       "qdf_trace_enable_epping"
+#define CFG_QDF_TRACE_ENABLE_QDF_DEVICES  "qdf_trace_enable_qdf_devices"
+#define CFG_QDF_TRACE_ENABLE_TXRX_NAME    "cfd_trace_enable_txrx"
+#define CFG_QDF_TRACE_ENABLE_HTC_NAME     "qdf_trace_enable_htc"
+#define CFG_QDF_TRACE_ENABLE_HIF_NAME     "qdf_trace_enable_hif"
+#define CFG_CDR_TRACE_ENABLE_HDD_SAP_DATA_NAME   "qdf_trace_enable_hdd_sap_data"
+#define CFG_QDF_TRACE_ENABLE_HDD_DATA_NAME       "qdf_trace_enable_hdd_data"
+
+#define CFG_QDF_TRACE_ENABLE_MIN          (0)
+#define CFG_QDF_TRACE_ENABLE_MAX          (0xff)
+#define CFG_QDF_TRACE_ENABLE_DEFAULT      (0xffff)
 
 #define HDD_MCASTBCASTFILTER_FILTER_NONE                       0x00
 #define HDD_MCASTBCASTFILTER_FILTER_ALL_MULTICAST              0x01
@@ -3096,26 +3096,26 @@ struct hdd_config {
 	bool fEnableBeaconEarlyTermination;
 	bool teleBcnWakeupEn;
 
-/* CDF Trace Control*/
-	uint16_t cdf_trace_enable_wdi;
-	uint16_t cdf_trace_enable_hdd;
-	uint16_t cdf_trace_enable_sme;
-	uint16_t cdf_trace_enable_pe;
-	uint16_t cdf_trace_enable_pmc;
-	uint16_t cdf_trace_enable_wma;
-	uint16_t cdf_trace_enable_sys;
-	uint16_t cdf_trace_enable_cdf;
-	uint16_t cdf_trace_enable_sap;
-	uint16_t cdf_trace_enable_hdd_sap;
-	uint16_t cdf_trace_enable_bmi;
-	uint16_t cdf_trace_enable_cfg;
+/* QDF Trace Control*/
+	uint16_t qdf_trace_enable_wdi;
+	uint16_t qdf_trace_enable_hdd;
+	uint16_t qdf_trace_enable_sme;
+	uint16_t qdf_trace_enable_pe;
+	uint16_t qdf_trace_enable_pmc;
+	uint16_t qdf_trace_enable_wma;
+	uint16_t qdf_trace_enable_sys;
+	uint16_t qdf_trace_enable_qdf;
+	uint16_t qdf_trace_enable_sap;
+	uint16_t qdf_trace_enable_hdd_sap;
+	uint16_t qdf_trace_enable_bmi;
+	uint16_t qdf_trace_enable_cfg;
 	uint16_t cfd_trace_enable_txrx;
-	uint16_t cdf_trace_enable_htc;
-	uint16_t cdf_trace_enable_hif;
-	uint16_t cdf_trace_enable_hdd_sap_data;
-	uint16_t cdf_trace_enable_hdd_data;
-	uint16_t cdf_trace_enable_epping;
-	uint16_t cdf_trace_enable_cdf_devices;
+	uint16_t qdf_trace_enable_htc;
+	uint16_t qdf_trace_enable_hif;
+	uint16_t qdf_trace_enable_hdd_sap_data;
+	uint16_t qdf_trace_enable_hdd_data;
+	uint16_t qdf_trace_enable_epping;
+	uint16_t qdf_trace_enable_qdf_devices;
 
 	uint16_t nTeleBcnTransListenInterval;
 	uint16_t nTeleBcnMaxListenInterval;

core/hdd/inc/wlan_hdd_main.h

@@ -672,8 +672,8 @@ struct hdd_station_ctx {
 #define BSS_START   1
 typedef struct hdd_hostapd_state_s {
 	int bssState;
-	qdf_event_t cdf_event;
-	qdf_event_t cdf_stop_bss_event;
+	qdf_event_t qdf_event;
+	qdf_event_t qdf_stop_bss_event;
 	QDF_STATUS qdf_status;
 	bool bCommit;
 
@@ -1109,7 +1109,7 @@ struct hdd_context_s {
 	qdf_list_t hddAdapters; /* List of adapters */
 
 	/* One per STA: 1 for BCMC_STA_ID, 1 for each SAP_SELF_STA_ID, 1 for WDS_STAID */
-	hdd_adapter_t *sta_to_adapter[WLAN_MAX_STA_COUNT + CDF_MAX_NO_OF_SAP_MODE + 2]; /* One per sta. For quick reference. */
+	hdd_adapter_t *sta_to_adapter[WLAN_MAX_STA_COUNT + QDF_MAX_NO_OF_SAP_MODE + 2]; /* One per sta. For quick reference. */
 
 	/** Pointer for firmware image data */
 	const struct firmware *fw;

core/hdd/inc/wlan_hdd_wext.h

@@ -249,8 +249,8 @@ typedef struct hdd_wext_state_s {
 	/**auth key mgmt */
 	int32_t authKeyMgmt;
 
-	/* cdf event */
-	qdf_event_t hdd_cdf_event;
+	/* qdf event */
+	qdf_event_t hdd_qdf_event;
 
 	qdf_event_t scanevent;
 

core/hdd/src/wlan_hdd_assoc.c

@@ -1179,7 +1179,7 @@ void hdd_set_peer_authorized_event(uint32_t vdev_id)
  * @sta_state: peer state
  * @roam_synch_in_progress: roam synch in progress
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter,
 				 uint8_t sta_id,
@@ -1661,7 +1661,7 @@ static QDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter,
  */
 void hdd_perform_roam_set_key_complete(hdd_adapter_t *pAdapter)
 {
-	QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
 	hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
 	tCsrRoamInfo roamInfo;
 	roamInfo.fAuthRequired = false;
@@ -1670,13 +1670,13 @@ void hdd_perform_roam_set_key_complete(hdd_adapter_t *pAdapter)
 	qdf_mem_copy(roamInfo.peerMac.bytes,
 		     pHddStaCtx->roam_info.peerMac, QDF_MAC_ADDR_SIZE);
 
-	cdf_ret_status =
+	qdf_ret_status =
 			hdd_roam_set_key_complete_handler(pAdapter,
 					   &roamInfo,
 					   pHddStaCtx->roam_info.roamId,
 					   pHddStaCtx->roam_info.roamStatus,
 					   eCSR_ROAM_RESULT_AUTHENTICATED);
-	if (cdf_ret_status != QDF_STATUS_SUCCESS)
+	if (qdf_ret_status != QDF_STATUS_SUCCESS)
 		hddLog(LOGE, FL("Set Key complete failure"));
 
 	pHddStaCtx->roam_info.deferKeyComplete = false;
@@ -3841,7 +3841,7 @@ QDF_STATUS
 hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 		      eRoamCmdStatus roamStatus, eCsrRoamResult roamResult)
 {
-	QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS;
+	QDF_STATUS qdf_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;
@@ -3881,7 +3881,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 		       FL
 		       ("Reassoc Failed with roamStatus: %d roamResult: %d SessionID: %d"),
 		       roamStatus, roamResult, pAdapter->sessionId);
-		cdf_ret_status =
+		qdf_ret_status =
 			hdd_dis_connect_handler(pAdapter, pRoamInfo, roamId,
 						roamStatus, roamResult);
 		/*
@@ -3917,7 +3917,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 		status = hdd_roam_deregister_sta(pAdapter,
 					pHddStaCtx->conn_info.staId[0]);
 		if (!QDF_IS_STATUS_SUCCESS(status))
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		pHddStaCtx->ft_carrier_on = true;
 		pHddStaCtx->hdd_ReassocScenario = true;
 		hddLog(LOG1,
@@ -3949,7 +3949,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 	case eCSR_ROAM_DISASSOCIATED:
 	{
 		hddLog(LOG1, "****eCSR_ROAM_DISASSOCIATED****");
-		cdf_ret_status =
+		qdf_ret_status =
 			hdd_dis_connect_handler(pAdapter, pRoamInfo, roamId,
 						roamStatus, roamResult);
 		/* Check if Mcast/Bcast Filters are set, if yes clear the filters here */
@@ -3984,7 +3984,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 	break;
 	case eCSR_ROAM_IBSS_LEAVE:
 		hddLog(LOG1, "****eCSR_ROAM_IBSS_LEAVE****");
-		cdf_ret_status =
+		qdf_ret_status =
 			hdd_dis_connect_handler(pAdapter, pRoamInfo, roamId,
 						roamStatus, roamResult);
 		break;
@@ -3999,7 +3999,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 			hdd_conn_remove_connect_info(
 				WLAN_HDD_GET_STATION_CTX_PTR(pAdapter));
 		}
-		cdf_ret_status =
+		qdf_ret_status =
 			hdd_association_completion_handler(pAdapter, pRoamInfo,
 							   roamId, roamStatus,
 							   roamResult);
@@ -4009,7 +4009,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 #endif
 		break;
 	case eCSR_ROAM_ASSOCIATION_FAILURE:
-		cdf_ret_status = hdd_association_completion_handler(pAdapter,
+		qdf_ret_status = hdd_association_completion_handler(pAdapter,
 								    pRoamInfo,
 								    roamId,
 								    roamStatus,
@@ -4021,7 +4021,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 		break;
 
 	case eCSR_ROAM_CONNECT_STATUS_UPDATE:
-		cdf_ret_status =
+		qdf_ret_status =
 			roam_roam_connect_status_update_handler(pAdapter,
 								pRoamInfo,
 								roamId,
@@ -4030,7 +4030,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 		break;
 
 	case eCSR_ROAM_MIC_ERROR_IND:
-		cdf_ret_status =
+		qdf_ret_status =
 			hdd_roam_mic_error_indication_handler(pAdapter,
 							      pRoamInfo,
 							      roamId,
@@ -4040,7 +4040,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 
 	case eCSR_ROAM_SET_KEY_COMPLETE:
 	{
-		cdf_ret_status =
+		qdf_ret_status =
 			hdd_roam_set_key_complete_handler(pAdapter, pRoamInfo,
 							  roamId, roamStatus,
 							  roamResult);
@@ -4066,7 +4066,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 		if (eCSR_AUTH_TYPE_RSN == pHddStaCtx->conn_info.authType
 				|| hdd_is_8021x_sha256_auth_type(pHddStaCtx)) {
 			/* notify the supplicant of a new candidate */
-			cdf_ret_status =
+			qdf_ret_status =
 				wlan_hdd_cfg80211_pmksa_candidate_notify(
 						pAdapter, pRoamInfo, 1, false);
 		}
@@ -4078,7 +4078,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 		if (QDF_STATUS_SUCCESS !=
 		    wlan_hdd_cfg80211_roam_metrics_preauth(pAdapter,
 							   pRoamInfo)) {
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		}
 		break;
 	case eCSR_ROAM_PREAUTH_STATUS_SUCCESS:
@@ -4088,7 +4088,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 		if (QDF_STATUS_SUCCESS !=
 		    wlan_hdd_cfg80211_roam_metrics_preauth_status(pAdapter,
 							 pRoamInfo, 1)) {
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		}
 		break;
 	case eCSR_ROAM_PREAUTH_STATUS_FAILURE:
@@ -4098,7 +4098,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 		if (QDF_STATUS_SUCCESS !=
 		    wlan_hdd_cfg80211_roam_metrics_preauth_status(pAdapter,
 								pRoamInfo, 0)) {
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		}
 		break;
 	case eCSR_ROAM_HANDOVER_SUCCESS:
@@ -4107,7 +4107,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 		if (QDF_STATUS_SUCCESS !=
 		    wlan_hdd_cfg80211_roam_metrics_handover(pAdapter,
 							    pRoamInfo)) {
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		}
 		break;
 #endif
@@ -4121,7 +4121,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 		break;
 #ifdef FEATURE_WLAN_TDLS
 	case eCSR_ROAM_TDLS_STATUS_UPDATE:
-		cdf_ret_status =
+		qdf_ret_status =
 			hdd_roam_tdls_status_update_handler(pAdapter, pRoamInfo,
 							    roamId,
 							    roamStatus,
@@ -4173,7 +4173,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 	default:
 		break;
 	}
-	return cdf_ret_status;
+	return qdf_ret_status;
 }
 
 /**

core/hdd/src/wlan_hdd_cfg.c

@@ -1653,132 +1653,132 @@ REG_TABLE_ENTRY g_registry_table[] = {
 		     CFG_ENABLE_BEACON_EARLY_TERMINATION_MIN,
 		     CFG_ENABLE_BEACON_EARLY_TERMINATION_MAX),
 
-/* CFG_CDF_TRACE_ENABLE Parameters */
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_WDI_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_wdi,
+/* CFG_QDF_TRACE_ENABLE Parameters */
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_WDI_NAME, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_wdi,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_HDD_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_hdd,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_HDD_NAME, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_hdd,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_BMI_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_bmi,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_BMI_NAME, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_bmi,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_SME_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_sme,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_SME_NAME, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_sme,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_PE_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_pe,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_PE_NAME, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_pe,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_WMA_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_wma,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_WMA_NAME, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_wma,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_SYS_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_sys,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_SYS_NAME, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_sys,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_CDF_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_cdf,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_QDF_NAME, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_qdf,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_SAP_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_sap,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_SAP_NAME, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_sap,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_HDD_SAP_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_hdd_sap,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_HDD_SAP_NAME, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_hdd_sap,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_CFG_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_cfg,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_CFG_NAME, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_cfg,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_TXRX_NAME, WLAN_PARAM_Integer,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_TXRX_NAME, WLAN_PARAM_Integer,
 		     struct hdd_config, cfd_trace_enable_txrx,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_HTC_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_htc,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_HTC_NAME, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_htc,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_HIF_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_hif,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_HIF_NAME, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_hif,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
 	REG_VARIABLE(CFG_CDR_TRACE_ENABLE_HDD_SAP_DATA_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_hdd_sap_data,
+		     struct hdd_config, qdf_trace_enable_hdd_sap_data,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_HDD_DATA_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_hdd_data,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_HDD_DATA_NAME, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_hdd_data,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_EPPING, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_epping,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_EPPING, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_epping,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
-	REG_VARIABLE(CFG_CDF_TRACE_ENABLE_CDF_DEVICES, WLAN_PARAM_Integer,
-		     struct hdd_config, cdf_trace_enable_cdf_devices,
+	REG_VARIABLE(CFG_QDF_TRACE_ENABLE_QDF_DEVICES, WLAN_PARAM_Integer,
+		     struct hdd_config, qdf_trace_enable_qdf_devices,
 		     VAR_FLAGS_OPTIONAL,
-		     CFG_CDF_TRACE_ENABLE_DEFAULT,
-		     CFG_CDF_TRACE_ENABLE_MIN,
-		     CFG_CDF_TRACE_ENABLE_MAX),
+		     CFG_QDF_TRACE_ENABLE_DEFAULT,
+		     CFG_QDF_TRACE_ENABLE_MIN,
+		     CFG_QDF_TRACE_ENABLE_MAX),
 
 	REG_VARIABLE(CFG_TELE_BCN_TRANS_LI_NAME, WLAN_PARAM_Integer,
 		     struct hdd_config, nTeleBcnTransListenInterval,

core/hdd/src/wlan_hdd_cfg80211.c

@@ -397,7 +397,7 @@ static const struct ieee80211_iface_limit
 static const struct ieee80211_iface_limit
 	wlan_hdd_ap_iface_limit[] = {
 	{
-		.max = (CDF_MAX_NO_OF_SAP_MODE + SAP_MAX_OBSS_STA_CNT),
+		.max = (QDF_MAX_NO_OF_SAP_MODE + SAP_MAX_OBSS_STA_CNT),
 		.types = BIT(NL80211_IFTYPE_AP),
 	},
 };
@@ -425,7 +425,7 @@ static const struct ieee80211_iface_limit
 		.types = BIT(NL80211_IFTYPE_STATION),
 	},
 	{
-		.max = CDF_MAX_NO_OF_SAP_MODE,
+		.max = QDF_MAX_NO_OF_SAP_MODE,
 		.types = BIT(NL80211_IFTYPE_AP),
 	},
 };
@@ -524,7 +524,7 @@ static struct ieee80211_iface_combination
 	{
 		.limits = wlan_hdd_ap_iface_limit,
 		.num_different_channels = 2,
-		.max_interfaces = (SAP_MAX_OBSS_STA_CNT + CDF_MAX_NO_OF_SAP_MODE),
+		.max_interfaces = (SAP_MAX_OBSS_STA_CNT + QDF_MAX_NO_OF_SAP_MODE),
 		.n_limits = ARRAY_SIZE(wlan_hdd_ap_iface_limit),
 	},
 	/* P2P */
@@ -538,7 +538,7 @@ static struct ieee80211_iface_combination
 	{
 		.limits = wlan_hdd_sta_ap_iface_limit,
 		.num_different_channels = 2,
-		.max_interfaces = (1 + SAP_MAX_OBSS_STA_CNT + CDF_MAX_NO_OF_SAP_MODE),
+		.max_interfaces = (1 + SAP_MAX_OBSS_STA_CNT + QDF_MAX_NO_OF_SAP_MODE),
 		.n_limits = ARRAY_SIZE(wlan_hdd_sta_ap_iface_limit),
 		.beacon_int_infra_match = true,
 	},
@@ -4233,7 +4233,7 @@ static int __wlan_hdd_cfg80211_set_probable_oper_channel(struct wiphy *wiphy,
 	}
 
 	if (hdd_ctx->config->policy_manager_enabled) {
-		ret = cdf_reset_connection_update();
+		ret = qdf_reset_connection_update();
 		if (!QDF_IS_STATUS_SUCCESS(ret))
 			hdd_err("clearing event failed");
 
@@ -4253,9 +4253,9 @@ static int __wlan_hdd_cfg80211_set_probable_oper_channel(struct wiphy *wiphy,
 			 * For any other return value it should be a pass
 			 * through
 			 */
-			ret = cdf_wait_for_connection_update();
+			ret = qdf_wait_for_connection_update();
 			if (!QDF_IS_STATUS_SUCCESS(ret)) {
-				hdd_err("ERROR: cdf wait for event failed!!");
+				hdd_err("ERROR: qdf wait for event failed!!");
 				return -EINVAL;
 			}
 
@@ -5500,7 +5500,7 @@ int wlan_hdd_cfg80211_init(struct device *dev,
 }
 
 /*
- * In this function, wiphy structure is updated after CDF
+ * In this function, wiphy structure is updated after QDF
  * initialization. In wlan_hdd_cfg80211_init, only the
  * default values will be initialized. The final initialization
  * of all required members can be done here.
@@ -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;
-	QDF_STATUS cdf_ret_status;
+	QDF_STATUS qdf_ret_status;
 
 	ENTER();
 
@@ -5889,12 +5889,12 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy,
 		pAdapter->sessionCtx.ap.apDisableIntraBssFwd =
 			!!params->ap_isolate;
 
-		cdf_ret_status = sme_ap_disable_intra_bss_fwd(pHddCtx->hHal,
+		qdf_ret_status = sme_ap_disable_intra_bss_fwd(pHddCtx->hHal,
 							      pAdapter->sessionId,
 							      pAdapter->sessionCtx.
 							      ap.
 							      apDisableIntraBssFwd);
-		if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
+		if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) {
 			ret = -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;
-	QDF_STATUS cdf_ret_status;
+	QDF_STATUS qdf_ret_status;
 	hdd_context_t *pHddCtx;
 	hdd_ap_ctx_t *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(pAdapter);
 
@@ -6826,13 +6826,13 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 		/* The supplicant may attempt to set the PTK once pre-authentication
 		   is done. Save the key in the UMAC and include it in the ADD BSS
 		   request */
-		cdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter),
+		qdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter),
 						   pAdapter->sessionId, &setKey);
-		if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) {
+		if (qdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) {
 			hddLog(QDF_TRACE_LEVEL_INFO_MED,
 			       "%s: Update PreAuth Key success", __func__);
 			return 0;
-		} else if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) {
+		} else if (qdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) {
 			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: Update PreAuth Key failed", __func__);
 			return -EINVAL;
@@ -7612,7 +7612,7 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify(hdd_adapter_t *pAdapter,
  *
  * 802.11r/LFR metrics reporting function to report preauth initiation
  *
- * Return: CDF status
+ * Return: QDF status
  */
 #define MAX_LFR_METRICS_EVENT_LENGTH 100
 QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter,
@@ -7654,7 +7654,7 @@ QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter,
  *
  * 802.11r/LFR metrics reporting function to report handover initiation
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS
 wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t *pAdapter,
@@ -7704,7 +7704,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t *pAdapter,
  *
  * 802.11r/LFR metrics reporting function to report handover initiation
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(hdd_adapter_t *pAdapter,
 						   tCsrRoamInfo *pRoamInfo)
@@ -9369,7 +9369,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
 		return -ECONNREFUSED;
 	}
 	if (pHddCtx->config->policy_manager_enabled) {
-		status = cdf_reset_connection_update();
+		status = qdf_reset_connection_update();
 		if (!QDF_IS_STATUS_SUCCESS(status))
 			hdd_err("ERR: clear event failed");
 
@@ -9382,9 +9382,9 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
 		}
 
 		if (QDF_STATUS_SUCCESS == status) {
-			status = cdf_wait_for_connection_update();
+			status = qdf_wait_for_connection_update();
 			if (!QDF_IS_STATUS_SUCCESS(status)) {
-				hdd_err("ERROR: cdf wait for event failed!!");
+				hdd_err("ERROR: qdf wait for event failed!!");
 				return -EINVAL;
 			}
 		}
@@ -9891,7 +9891,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 							DFS_CAC_IN_PROGRESS)
 						goto fn_end;
 
-					qdf_event_reset(&hapd_state->cdf_event);
+					qdf_event_reset(&hapd_state->qdf_event);
 					hdd_softap_sta_disassoc(pAdapter,
 								mac);
 					qdf_status =
@@ -9902,7 +9902,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 						isDeauthInProgress = true;
 						qdf_status =
 							qdf_wait_single_event(
-								&hapd_state->cdf_event,
+								&hapd_state->qdf_event,
 								1000);
 						if (!QDF_IS_STATUS_SUCCESS(
 								qdf_status))
@@ -9955,7 +9955,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 			if (pHddCtx->dev_dfs_cac_status == DFS_CAC_IN_PROGRESS)
 				goto fn_end;
 
-			qdf_event_reset(&hapd_state->cdf_event);
+			qdf_event_reset(&hapd_state->qdf_event);
 			hdd_softap_sta_disassoc(pAdapter, mac);
 			qdf_status = hdd_softap_sta_deauth(pAdapter,
 							   pDelStaParams);
@@ -9969,7 +9969,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 				return -ENOENT;
 			} else {
 				qdf_status = qdf_wait_single_event(
-							&hapd_state->cdf_event,
+							&hapd_state->qdf_event,
 							1000);
 				if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 					hddLog(LOGE,

core/hdd/src/wlan_hdd_driver_ops.c

@@ -296,18 +296,18 @@ static void hdd_hif_close(void *hif_ctx)
 }
 
 /**
- * hdd_init_cdf_ctx() - API to initialize global CDF Device structure
+ * hdd_init_qdf_ctx() - API to initialize global QDF Device structure
  * @dev: Device Pointer
  * @bdev: Bus Device pointer
  *
  * Return: void
  */
-void hdd_init_cdf_ctx(struct device *dev, void *bdev)
+void hdd_init_qdf_ctx(struct device *dev, void *bdev)
 {
-	qdf_device_t cdf_dev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
+	qdf_device_t qdf_dev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
 
-	cdf_dev->dev = dev;
-	cdf_dev->drv_hdl = bdev;
+	qdf_dev->dev = dev;
+	qdf_dev->drv_hdl = bdev;
 }
 
 /**
@@ -329,7 +329,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid,
 	void *hif_ctx;
 	QDF_STATUS status;
 	int ret = 0;
-	qdf_device_t cdf_dev;
+	qdf_device_t qdf_dev;
 	uint32_t mode = cds_get_conparam();
 
 	pr_info("%s: %sprobing driver v%s\n", WLAN_MODULE_NAME,
@@ -361,7 +361,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid,
 			goto err_hdd_deinit;
 	}
 
-	hdd_init_cdf_ctx(dev, bdev);
+	hdd_init_qdf_ctx(dev, bdev);
 
 	ret = hdd_hif_open(dev, bdev, bid, bus_type, reinit);
 
@@ -369,9 +369,9 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid,
 		goto err_epping_close;
 
 	hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
-	cdf_dev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
+	qdf_dev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
 
-	status = ol_cds_init(cdf_dev, hif_ctx);
+	status = ol_cds_init(qdf_dev, hif_ctx);
 
 	if (status != QDF_STATUS_SUCCESS) {
 		pr_err("%s No Memory to Create BMI Context\n", __func__);

core/hdd/src/wlan_hdd_ftm.c

@@ -154,7 +154,7 @@ static inline void hdd_is_lpass_supported(tMacOpenParameters *mac_openParms,
  * @p_cds_context: pointer to the global CDS context
  * @hddContextSize: Size of the HDD context to allocate.
  *
- * The wlan_ftm_cds_open() function opens the CDF Scheduler
+ * The wlan_ftm_cds_open() function opens the QDF Scheduler
  * Upon successful initialization:
  * - All CDS submodules should have been initialized
  * - The CDS scheduler should have opened
@@ -232,7 +232,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 	}
 
 	/* Now Open the CDS Scheduler */
-	vStatus = cds_sched_open(gp_cds_context, &gp_cds_context->cdf_sched,
+	vStatus = cds_sched_open(gp_cds_context, &gp_cds_context->qdf_sched,
 				 sizeof(cds_sched_context));
 
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
@@ -402,10 +402,10 @@ err_probe_event:
 } /* wlan_ftm_cds_open() */
 
 /**
- * wlan_ftm_cds_close() - Close the CDF Module in FTM mode
+ * wlan_ftm_cds_close() - Close the QDF Module in FTM mode
  * @cds_context:  context of cds
  *
- * The wlan_ftm_cds_close() function closes the CDF Module
+ * The wlan_ftm_cds_close() function closes the QDF Module
  *
  * Return: QDF_STATUS_SUCCESS - successfully closed
  */
@@ -484,7 +484,7 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context)
  * in FTM mode.
  *
  * Return: QDF_STATUS_SUCCESS if pre-start was successful, an
- *	   appropriate CDF_STATUS_E_* error code otherwise
+ *	   appropriate QDF_STATUS_E_** error code otherwise
  */
 static QDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context)
 {
@@ -569,14 +569,14 @@ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx)
 		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Trying to open CDS without a PreOpen", __func__);
 		QDF_ASSERT(0);
-		goto err_cdf_status_failure;
+		goto err_qdf_status_failure;
 	}
 
 	vStatus = wlan_ftm_cds_open(p_cds_context, 0);
 
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
 		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: cds_open failed", __func__);
-		goto err_cdf_status_failure;
+		goto err_qdf_status_failure;
 	}
 
 	/*
@@ -598,7 +598,7 @@ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx)
 err_ftm_close:
 	wlan_ftm_cds_close(p_cds_context);
 
-err_cdf_status_failure:
+err_qdf_status_failure:
 	return -EPERM;
 }
 
@@ -1012,7 +1012,7 @@ static void wlanqcmbr_mc_process_msg(void *message)
  * @data: FTM testmode command
  * @len: length of @data
  *
- * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error
+ * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error
  */
 QDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len)
 {

core/hdd/src/wlan_hdd_green_ap.c

@@ -302,7 +302,7 @@ 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: QDF_STATUS_SUCCESS on success, otherwise CDF_STATUS_E_* error
+ * Return: QDF_STATUS_SUCCESS on success, otherwise QDF_STATUS_E_** error
  */
 static QDF_STATUS hdd_wlan_green_ap_attach(struct hdd_context_s *hdd_ctx)
 {
@@ -340,7 +340,7 @@ error:
  * hdd_wlan_green_ap_deattach() - Detach Green AP context from HDD context
  * @hdd_ctx: Global HDD contect
  *
- * Return: QDF_STATUS_SUCCESS on success, otherwise CDF_STATUS_E_* error
+ * Return: QDF_STATUS_SUCCESS on success, otherwise QDF_STATUS_E_** error
  */
 static QDF_STATUS hdd_wlan_green_ap_deattach(struct hdd_context_s *hdd_ctx)
 {

core/hdd/src/wlan_hdd_hostapd.c

@@ -379,7 +379,7 @@ static int hdd_hostapd_change_mtu(struct net_device *dev, int new_mtu)
 QDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter,
 				   uint8_t channel_type)
 {
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	void *hHal = NULL;
 
 	hddLog(LOGE, FL("change HT20/40 mode"));
@@ -390,10 +390,10 @@ QDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter,
 			hddLog(LOGE, FL("Hal ctx is null"));
 			return QDF_STATUS_E_FAULT;
 		}
-		cdf_ret_status =
+		qdf_ret_status =
 			sme_set_ht2040_mode(hHal, pHostapdAdapter->sessionId,
 					channel_type, true);
-		if (cdf_ret_status == QDF_STATUS_E_FAILURE) {
+		if (qdf_ret_status == QDF_STATUS_E_FAILURE) {
 			hddLog(LOGE, FL("Failed to change HT20/40 mode"));
 			return QDF_STATUS_E_FAILURE;
 		}
@@ -933,7 +933,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 
 		pHostapdState->qdf_status =
 			pSapEvent->sapevt.sapStartBssCompleteEvent.status;
-		qdf_status = qdf_event_set(&pHostapdState->cdf_event);
+		qdf_status = qdf_event_set(&pHostapdState->qdf_event);
 
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)
 		    || pHostapdState->qdf_status) {
@@ -1443,7 +1443,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 		hddLog(LOG1, " disassociated " MAC_ADDRESS_STR,
 		       MAC_ADDR_ARRAY(wrqu.addr.sa_data));
 
-		qdf_status = qdf_event_set(&pHostapdState->cdf_event);
+		qdf_status = qdf_event_set(&pHostapdState->qdf_event);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 			hddLog(LOGE, "ERR: Station Deauth event Set failed");
 
@@ -1863,7 +1863,7 @@ stopbss:
 		 * not be touched since they are now subject to being deleted
 		 * by another thread */
 		if (eSAP_STOP_BSS_EVENT == sapEvent)
-			qdf_event_set(&pHostapdState->cdf_stop_bss_event);
+			qdf_event_set(&pHostapdState->qdf_stop_bss_event);
 
 		/* notify userspace that the BSS has stopped */
 		memset(&we_custom_event, '\0', sizeof(we_custom_event));
@@ -4441,7 +4441,7 @@ __iw_softap_setwpsie(struct net_device *dev,
 	v_CONTEXT_t cds_ctx;
 #endif
 	hdd_hostapd_state_t *pHostapdState;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
 	uint8_t *wps_genie;
 	uint8_t *fwps_genie;
 	uint8_t *pos;
@@ -4496,7 +4496,7 @@ __iw_softap_setwpsie(struct net_device *dev,
 
 	pSap_WPSIe = qdf_mem_malloc(sizeof(tSap_WPSIE));
 	if (NULL == pSap_WPSIe) {
-		hddLog(LOGE, "CDF unable to allocate memory");
+		hddLog(LOGE, "QDF unable to allocate memory");
 		kfree(fwps_genie);
 		return -ENOMEM;
 	}
@@ -4993,11 +4993,11 @@ __iw_softap_setwpsie(struct net_device *dev,
 		} /* switch */
 	}
 #ifdef WLAN_FEATURE_MBSSID
-	cdf_ret_status =
+	qdf_ret_status =
 		wlansap_set_wps_ie(WLAN_HDD_GET_SAP_CTX_PTR(pHostapdAdapter),
 				   pSap_WPSIe);
 #else
-	cdf_ret_status = wlansap_set_wps_ie(p_cds_context, pSap_WPSIe);
+	qdf_ret_status = wlansap_set_wps_ie(p_cds_context, pSap_WPSIe);
 #endif
 	pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pHostapdAdapter);
 	if (pHostapdState->bCommit && WPSIeType == eQC_WPS_PROBE_RSP_IE) {
@@ -5011,7 +5011,7 @@ __iw_softap_setwpsie(struct net_device *dev,
 	qdf_mem_free(pSap_WPSIe);
 	kfree(fwps_genie);
 	EXIT();
-	return cdf_ret_status;
+	return qdf_ret_status;
 }
 
 static int iw_softap_setwpsie(struct net_device *dev,
@@ -5049,7 +5049,7 @@ __iw_softap_stopbss(struct net_device *dev,
 		hdd_hostapd_state_t *pHostapdState =
 			WLAN_HDD_GET_HOSTAP_STATE_PTR(pHostapdAdapter);
 
-		qdf_event_reset(&pHostapdState->cdf_stop_bss_event);
+		qdf_event_reset(&pHostapdState->qdf_stop_bss_event);
 #ifdef WLAN_FEATURE_MBSSID
 		status =
 			wlansap_stop_bss(WLAN_HDD_GET_SAP_CTX_PTR(pHostapdAdapter));
@@ -5061,7 +5061,7 @@ __iw_softap_stopbss(struct net_device *dev,
 		if (QDF_IS_STATUS_SUCCESS(status)) {
 			qdf_status =
 				qdf_wait_single_event(&pHostapdState->
-						      cdf_stop_bss_event,
+						      qdf_stop_bss_event,
 						      10000);
 
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -5240,7 +5240,7 @@ static int __iw_set_ap_genie(struct net_device *dev,
 	v_CONTEXT_t cds_ctx;
 #endif
 	hdd_context_t *hdd_ctx;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
 	uint8_t *genie = (uint8_t *)extra;
 	int ret;
 
@@ -5255,7 +5255,7 @@ static int __iw_set_ap_genie(struct net_device *dev,
 	cds_ctx = hdd_ctx->pcds_context;
 	if (NULL == cds_ctx) {
 		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
-			  "%s: CDF Context is NULL", __func__);
+			  "%s: QDF Context is NULL", __func__);
 		return -EINVAL;
 	}
 #endif
@@ -5274,12 +5274,12 @@ static int __iw_set_ap_genie(struct net_device *dev,
 		}
 		(WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->uPrivacy = 1;
 #ifdef WLAN_FEATURE_MBSSID
-		cdf_ret_status =
+		qdf_ret_status =
 			wlansap_set_wparsn_ies(WLAN_HDD_GET_SAP_CTX_PTR
 						       (pHostapdAdapter), genie,
 					       wrqu->data.length);
 #else
-		cdf_ret_status =
+		qdf_ret_status =
 			wlansap_set_wparsn_ies(cds_ctx, genie,
 					       wrqu->data.length);
 #endif
@@ -5287,11 +5287,11 @@ static int __iw_set_ap_genie(struct net_device *dev,
 
 	default:
 		hddLog(LOGE, FL("Set UNKNOWN IE %X"), genie[0]);
-		cdf_ret_status = 0;
+		qdf_ret_status = 0;
 	}
 
 	EXIT();
-	return cdf_ret_status;
+	return qdf_ret_status;
 }
 
 /**
@@ -6035,16 +6035,16 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter)
 		return status;
 	}
 
-	qdf_status = qdf_event_create(&phostapdBuf->cdf_event);
+	qdf_status = qdf_event_create(&phostapdBuf->qdf_event);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		hddLog(LOGE, ("ERROR: Hostapd HDD cdf event init failed!!"));
+		hddLog(LOGE, ("ERROR: Hostapd HDD qdf event init failed!!"));
 #ifdef WLAN_FEATURE_MBSSID
 		wlansap_close(sapContext);
 #endif
 		return qdf_status;
 	}
 
-	qdf_status = qdf_event_create(&phostapdBuf->cdf_stop_bss_event);
+	qdf_status = qdf_event_create(&phostapdBuf->qdf_stop_bss_event);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  ("ERROR: Hostapd HDD stop bss event init failed!!"));
@@ -6189,7 +6189,7 @@ hdd_adapter_t *hdd_wlan_create_ap_dev(hdd_context_t *pHddCtx,
  * @pAdapter: Pointer to hostapd adapter
  * @rtnl_lock_held: RTNL lock held
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter,
 				uint8_t rtnl_lock_held) {
@@ -7778,7 +7778,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 
 	(WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->dfs_cac_block_tx = true;
 
-	qdf_event_reset(&pHostapdState->cdf_event);
+	qdf_event_reset(&pHostapdState->qdf_event);
 	status = wlansap_start_bss(
 #ifdef WLAN_FEATURE_MBSSID
 		WLAN_HDD_GET_SAP_CTX_PTR
@@ -7798,13 +7798,13 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 	hddLog(LOG1,
 	       FL("Waiting for Scan to complete(auto mode) and BSS to start"));
 
-	qdf_status = qdf_wait_single_event(&pHostapdState->cdf_event, 10000);
+	qdf_status = qdf_wait_single_event(&pHostapdState->qdf_event, 10000);
 
 	wlansap_reset_sap_config_add_ie(pConfig, eUPDATE_IE_ALL);
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		hddLog(LOGE,
-			FL("ERROR: HDD cdf wait for single_event failed!!"));
+			FL("ERROR: HDD qdf wait for single_event failed!!"));
 		cds_set_connection_in_progress(false);
 		sme_get_command_q_status(hHal);
 #ifdef WLAN_FEATURE_MBSSID
@@ -7961,7 +7961,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 		hdd_hostapd_state_t *pHostapdState =
 			WLAN_HDD_GET_HOSTAP_STATE_PTR(pAdapter);
 
-		qdf_event_reset(&pHostapdState->cdf_stop_bss_event);
+		qdf_event_reset(&pHostapdState->qdf_stop_bss_event);
 #ifdef WLAN_FEATURE_MBSSID
 		status = wlansap_stop_bss(WLAN_HDD_GET_SAP_CTX_PTR(pAdapter));
 #else
@@ -7970,12 +7970,12 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 		if (QDF_IS_STATUS_SUCCESS(status)) {
 			qdf_status =
 				qdf_wait_single_event(&pHostapdState->
-						      cdf_stop_bss_event,
+						      qdf_stop_bss_event,
 						      10000);
 
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 				hddLog(LOGE,
-				       FL("HDD cdf wait for single_event failed!!"));
+				       FL("HDD qdf wait for single_event failed!!"));
 				QDF_ASSERT(0);
 			}
 		}
@@ -8137,7 +8137,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 	if (pHddCtx->config->policy_manager_enabled) {
-		status = cdf_reset_connection_update();
+		status = qdf_reset_connection_update();
 		if (!QDF_IS_STATUS_SUCCESS(status))
 			hdd_err("ERR: clear event failed");
 
@@ -8150,9 +8150,9 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 		}
 
 		if (QDF_STATUS_SUCCESS == status) {
-			status = cdf_wait_for_connection_update();
+			status = qdf_wait_for_connection_update();
 			if (!QDF_IS_STATUS_SUCCESS(status)) {
-				hdd_err("ERROR: cdf wait for event failed!!");
+				hdd_err("ERROR: qdf wait for event failed!!");
 				return -EINVAL;
 			}
 		}

core/hdd/src/wlan_hdd_ioctl.c

@@ -474,7 +474,7 @@ hdd_parse_send_action_frame_v1_data(const uint8_t *pValue,
 	 */
 	*pBuf = qdf_mem_malloc((*pBufLen + 1) / 2);
 	if (NULL == *pBuf) {
-		hddLog(LOGE, FL("cdf_mem_alloc failed"));
+		hddLog(LOGE, FL("qdf_mem_malloc failed"));
 		return -ENOMEM;
 	}
 
@@ -1577,7 +1577,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter,
 			      tpSirExtWoWParams arg_params)
 {
 	tSirExtWoWParams params;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_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;
@@ -1586,13 +1586,13 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter,
 
 	INIT_COMPLETION(hdd_ctx->ready_to_extwow);
 
-	cdf_ret_status = sme_configure_ext_wow(hHal, &params,
+	qdf_ret_status = sme_configure_ext_wow(hHal, &params,
 						&wlan_hdd_ready_to_extwow,
 						hdd_ctx);
-	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
+	if (QDF_STATUS_SUCCESS != qdf_ret_status) {
 		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("sme_configure_ext_wow returned failure %d"),
-		       cdf_ret_status);
+		       qdf_ret_status);
 		return -EPERM;
 	}
 
@@ -1620,11 +1620,11 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter,
 					__func__, rc);
 				return rc;
 			}
-			cdf_ret_status = wlan_hdd_bus_suspend(state);
-			if (cdf_ret_status != QDF_STATUS_SUCCESS) {
+			qdf_ret_status = wlan_hdd_bus_suspend(state);
+			if (qdf_ret_status != QDF_STATUS_SUCCESS) {
 				QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 					"%s: wlan_hdd_suspend failed, status = %d",
-					__func__, cdf_ret_status);
+					__func__, qdf_ret_status);
 				wlan_hdd_cfg80211_resume_wlan(hdd_ctx->wiphy);
 				return -EPERM;
 			}
@@ -1685,15 +1685,15 @@ static int hdd_set_app_type1_params(tHalHandle hHal,
 				    tpSirAppType1Params arg_params)
 {
 	tSirAppType1Params params;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 
 	qdf_mem_copy(&params, arg_params, sizeof(params));
 
-	cdf_ret_status = sme_configure_app_type1_params(hHal, &params);
-	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
+	qdf_ret_status = sme_configure_app_type1_params(hHal, &params);
+	if (QDF_STATUS_SUCCESS != qdf_ret_status) {
 		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("sme_configure_app_type1_params returned failure %d"),
-		       cdf_ret_status);
+		       qdf_ret_status);
 		return -EPERM;
 	}
 
@@ -1743,15 +1743,15 @@ static int hdd_set_app_type2_params(tHalHandle hHal,
 				    tpSirAppType2Params arg_params)
 {
 	tSirAppType2Params params;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 
 	qdf_mem_copy(&params, arg_params, sizeof(params));
 
-	cdf_ret_status = sme_configure_app_type2_params(hHal, &params);
-	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
+	qdf_ret_status = sme_configure_app_type2_params(hHal, &params);
+	if (QDF_STATUS_SUCCESS != qdf_ret_status) {
 		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("sme_configure_app_type2_params returned failure %d"),
-		       cdf_ret_status);
+		       qdf_ret_status);
 		return -EPERM;
 	}
 
@@ -2376,7 +2376,7 @@ static int hdd_parse_get_cckm_ie(uint8_t *pValue, uint8_t **pCckmIe,
 	 */
 	*pCckmIe = qdf_mem_malloc((*pCckmIeLen + 1) / 2);
 	if (NULL == *pCckmIe) {
-		hddLog(LOGE, FL("cdf_mem_alloc failed"));
+		hddLog(LOGE, FL("qdf_mem_malloc failed"));
 		return -ENOMEM;
 	}
 	qdf_mem_zero(*pCckmIe, (*pCckmIeLen + 1) / 2);
@@ -4145,7 +4145,7 @@ static void hdd_wma_send_fastreassoc_cmd(int sessionId, tSirMacAddr bssid,
 
 	fastreassoc = qdf_mem_malloc(sizeof(*fastreassoc));
 	if (NULL == fastreassoc) {
-		hddLog(LOGE, FL("cdf_mem_alloc failed for fastreassoc"));
+		hddLog(LOGE, FL("qdf_mem_malloc failed for fastreassoc"));
 		return;
 	}
 	fastreassoc->vdev_id = sessionId;

core/hdd/src/wlan_hdd_lro.c

@@ -67,14 +67,14 @@
 static int hdd_lro_get_skb_header(struct sk_buff *skb, void **ip_hdr,
 	void **tcpudp_hdr, u64 *hdr_flags, void *priv)
 {
-	if (NBUF_CB_RX_IPV6_PROTO(skb)) {
+	if (QDF_NBUF_CB_RX_IPV6_PROTO(skb)) {
 		hdr_flags = 0;
 		return -EINVAL;
 	}
 
 	*hdr_flags |= (LRO_IPV4 | LRO_TCP);
 	(*ip_hdr) = skb->data;
-	(*tcpudp_hdr) = skb->data + NBUF_CB_RX_TCP_OFFSET(skb);
+	(*tcpudp_hdr) = skb->data + QDF_NBUF_CB_RX_TCP_OFFSET(skb);
 	return 0;
 }
 
@@ -215,7 +215,7 @@ static int hdd_lro_desc_find(hdd_adapter_t *adapter,
 	struct hdd_lro_desc_info *desc_info = &adapter->lro_info.lro_desc_info;
 
 	*lro_desc = NULL;
-	i = NBUF_CB_RX_FLOW_ID_TOEPLITZ(skb) & LRO_DESC_TABLE_SZ_MASK;
+	i = QDF_NBUF_CB_RX_FLOW_ID_TOEPLITZ(skb) & LRO_DESC_TABLE_SZ_MASK;
 
 	lro_hash_table = &desc_info->lro_hash_table[i];
 
@@ -321,7 +321,8 @@ static bool hdd_lro_eligible(hdd_adapter_t *adapter, struct sk_buff *skb,
 {
 	struct net_lro_desc *lro_desc = NULL;
 	int hw_lro_eligible =
-		 NBUF_CB_RX_LRO_ELIGIBLE(skb) && (!NBUF_CB_RX_TCP_PURE_ACK(skb));
+		 QDF_NBUF_CB_RX_LRO_ELIGIBLE(skb) &&
+		 (!QDF_NBUF_CB_RX_TCP_PURE_ACK(skb));
 
 	if (!hw_lro_eligible)
 		return false;
@@ -624,12 +625,12 @@ enum hdd_lro_rx_status hdd_lro_rx(hdd_context_t *hdd_ctx,
 	enum hdd_lro_rx_status status = HDD_LRO_NO_RX;
 
 	if ((adapter->dev->features & NETIF_F_LRO) &&
-		 NBUF_CB_RX_TCP_PROTO(skb)) {
+		 QDF_NBUF_CB_RX_TCP_PROTO(skb)) {
 		struct iphdr *iph;
 		struct tcphdr *tcph;
 		struct net_lro_desc *lro_desc = NULL;
 		iph = (struct iphdr *)skb->data;
-		tcph = (struct tcphdr *)(skb->data + NBUF_CB_RX_TCP_OFFSET(skb));
+		tcph = (struct tcphdr *)(skb->data + QDF_NBUF_CB_RX_TCP_OFFSET(skb));
 		if (hdd_lro_eligible(adapter, skb, iph, tcph, &lro_desc)) {
 			struct net_lro_info hdd_lro_info;
 
@@ -637,11 +638,11 @@ enum hdd_lro_rx_status hdd_lro_rx(hdd_context_t *hdd_ctx,
 
 			hdd_lro_info.lro_desc = lro_desc;
 			hdd_lro_info.lro_eligible = 1;
-			hdd_lro_info.tcp_ack_num = NBUF_CB_RX_TCP_ACK_NUM(skb);
+			hdd_lro_info.tcp_ack_num = QDF_NBUF_CB_RX_TCP_ACK_NUM(skb);
 			hdd_lro_info.tcp_data_csum =
-				 csum_unfold(htons(NBUF_CB_RX_TCP_CHKSUM(skb)));
-			hdd_lro_info.tcp_seq_num = NBUF_CB_RX_TCP_SEQ_NUM(skb);
-			hdd_lro_info.tcp_win = NBUF_CB_RX_TCP_WIN(skb);
+				 csum_unfold(htons(QDF_NBUF_CB_RX_TCP_CHKSUM(skb)));
+			hdd_lro_info.tcp_seq_num = QDF_NBUF_CB_RX_TCP_SEQ_NUM(skb);
+			hdd_lro_info.tcp_win = QDF_NBUF_CB_RX_TCP_WIN(skb);
 
 			lro_receive_skb_ext(adapter->lro_info.lro_mgr, skb,
 				 (void *)adapter, &hdd_lro_info);

core/hdd/src/wlan_hdd_main.c

@@ -473,7 +473,7 @@ uint8_t wlan_hdd_find_opclass(tHalHandle hal, uint8_t channel,
 }
 
 /**
- * hdd_cdf_trace_enable() - configure initial CDF Trace enable
+ * hdd_qdf_trace_enable() - configure initial QDF Trace enable
  * @moduleId:	Module whose trace level is being configured
  * @bitmask:	Bitmask of log levels to be enabled
  *
@@ -482,7 +482,7 @@ uint8_t wlan_hdd_find_opclass(tHalHandle hal, uint8_t channel,
  *
  * Return: None
  */
-static void hdd_cdf_trace_enable(QDF_MODULE_ID moduleId, uint32_t bitmask)
+static void hdd_qdf_trace_enable(QDF_MODULE_ID moduleId, uint32_t bitmask)
 {
 	QDF_TRACE_LEVEL level;
 
@@ -491,7 +491,7 @@ static void hdd_cdf_trace_enable(QDF_MODULE_ID moduleId, uint32_t bitmask)
 	 * specified in cfg.ini, so leave the logging level alone (it
 	 * will remain at the "compiled in" default value)
 	 */
-	if (CFG_CDF_TRACE_ENABLE_DEFAULT == bitmask) {
+	if (CFG_QDF_TRACE_ENABLE_DEFAULT == bitmask) {
 		return;
 	}
 
@@ -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;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
 	int ret;
 
 	ENTER();
@@ -1650,7 +1650,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr)
 	memcpy(dev->dev_addr, psta_mac_addr->sa_data, ETH_ALEN);
 
 	EXIT();
-	return cdf_ret_status;
+	return qdf_ret_status;
 }
 
 /**
@@ -1937,7 +1937,7 @@ QDF_STATUS hdd_register_interface(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 ); */
-	/* QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; */
+	/* QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; */
 
 	if (rtnl_held) {
 		if (strnchr(pWlanDev->name, strlen(pWlanDev->name), '%')) {
@@ -2015,7 +2015,7 @@ 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);
-	QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	uint32_t type, subType;
 	unsigned long rc;
@@ -2029,14 +2029,14 @@ QDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter)
 		goto error_sme_open;
 	}
 	/* Open a SME session for future operation */
-	cdf_ret_status =
+	qdf_ret_status =
 		sme_open_session(hdd_ctx->hHal, hdd_sme_roam_callback, adapter,
 				 (uint8_t *) &adapter->macAddressCurrent,
 				 &adapter->sessionId, type, subType);
-	if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
+	if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) {
 		hddLog(LOGP,
 		       FL("sme_open_session() failed, status code %08d [x%08x]"),
-		       cdf_ret_status, cdf_ret_status);
+		       qdf_ret_status, qdf_ret_status);
 		status = QDF_STATUS_E_FAILURE;
 		goto error_sme_open;
 	}
@@ -2053,11 +2053,11 @@ QDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter)
 	}
 
 	/* Register wireless extensions */
-	cdf_ret_status = hdd_register_wext(pWlanDev);
-	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
+	qdf_ret_status = hdd_register_wext(pWlanDev);
+	if (QDF_STATUS_SUCCESS != qdf_ret_status) {
 		hddLog(LOGP,
 		       FL("hdd_register_wext() failed, status code %08d [x%08x]"),
-		       cdf_ret_status, cdf_ret_status);
+		       qdf_ret_status, qdf_ret_status);
 		status = QDF_STATUS_E_FAILURE;
 		goto error_register_wext;
 	}
@@ -2711,7 +2711,7 @@ QDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
  *
  * Close all open adapters.
  *
- * Return: CDF status code
+ * Return: QDF status code
  */
 QDF_STATUS hdd_close_all_adapters(hdd_context_t *hdd_ctx, bool rtnl_held)
 {
@@ -2783,7 +2783,7 @@ void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter)
 QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
 			    const bool bCloseSession)
 {
-	QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
 	hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
 	union iwreq_data wrqu;
 	tSirUpdateIE updateIE;
@@ -2805,17 +2805,17 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
 				WLAN_HDD_GET_STATION_CTX_PTR(adapter))) {
 			if (pWextState->roamProfile.BSSType ==
 			    eCSR_BSS_TYPE_START_IBSS)
-				cdf_ret_status =
+				qdf_ret_status =
 					sme_roam_disconnect(hdd_ctx->hHal,
 							    adapter->sessionId,
 							    eCSR_DISCONNECT_REASON_IBSS_LEAVE);
 			else
-				cdf_ret_status =
+				qdf_ret_status =
 					sme_roam_disconnect(hdd_ctx->hHal,
 							    adapter->sessionId,
 							    eCSR_DISCONNECT_REASON_UNSPECIFIED);
 			/* success implies disconnect command got queued up successfully */
-			if (cdf_ret_status == QDF_STATUS_SUCCESS) {
+			if (qdf_ret_status == QDF_STATUS_SUCCESS) {
 				rc = wait_for_completion_timeout(
 					&adapter->disconnect_comp_var,
 					msecs_to_jiffies
@@ -2921,10 +2921,10 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
 				hdd_hostapd_state_t *hostapd_state =
 					WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter);
 				qdf_event_reset(&hostapd_state->
-						cdf_stop_bss_event);
+						qdf_stop_bss_event);
 				qdf_status =
 					qdf_wait_single_event(&hostapd_state->
-							cdf_stop_bss_event,
+							qdf_stop_bss_event,
 							BSS_WAIT_TIMEOUT);
 
 				if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -3943,19 +3943,19 @@ int hdd_wlan_notify_modem_power_state(int state)
  */
 QDF_STATUS hdd_post_cds_enable_config(hdd_context_t *hdd_ctx)
 {
-	QDF_STATUS cdf_ret_status;
+	QDF_STATUS qdf_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 (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
+	qdf_ret_status = sme_hdd_ready_ind(hdd_ctx->hHal);
+	if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) {
 		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL(
 			  "sme_hdd_ready_ind() failed with status code %08d [x%08x]"
 			 ),
-		       cdf_ret_status, cdf_ret_status);
+		       qdf_ret_status, qdf_ret_status);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -5016,42 +5016,42 @@ static void hdd_override_ini_config(hdd_context_t *hdd_ctx)
  */
 static void hdd_set_trace_level_for_each(hdd_context_t *hdd_ctx)
 {
-	hdd_cdf_trace_enable(QDF_MODULE_ID_WMI,
-			     hdd_ctx->config->cdf_trace_enable_wdi);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_HDD,
-			     hdd_ctx->config->cdf_trace_enable_hdd);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_SME,
-			     hdd_ctx->config->cdf_trace_enable_sme);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_PE,
-			     hdd_ctx->config->cdf_trace_enable_pe);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_WMA,
-			     hdd_ctx->config->cdf_trace_enable_wma);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_SYS,
-			     hdd_ctx->config->cdf_trace_enable_sys);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_QDF,
-			     hdd_ctx->config->cdf_trace_enable_cdf);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_SAP,
-			     hdd_ctx->config->cdf_trace_enable_sap);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_HDD_SOFTAP,
-			     hdd_ctx->config->cdf_trace_enable_hdd_sap);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_BMI,
-				hdd_ctx->config->cdf_trace_enable_bmi);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_CFG,
-				hdd_ctx->config->cdf_trace_enable_cfg);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_EPPING,
-				hdd_ctx->config->cdf_trace_enable_epping);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_QDF_DEVICE,
-				hdd_ctx->config->cdf_trace_enable_cdf_devices);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_TXRX,
+	hdd_qdf_trace_enable(QDF_MODULE_ID_WMI,
+			     hdd_ctx->config->qdf_trace_enable_wdi);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_HDD,
+			     hdd_ctx->config->qdf_trace_enable_hdd);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_SME,
+			     hdd_ctx->config->qdf_trace_enable_sme);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_PE,
+			     hdd_ctx->config->qdf_trace_enable_pe);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_WMA,
+			     hdd_ctx->config->qdf_trace_enable_wma);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_SYS,
+			     hdd_ctx->config->qdf_trace_enable_sys);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_QDF,
+			     hdd_ctx->config->qdf_trace_enable_qdf);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_SAP,
+			     hdd_ctx->config->qdf_trace_enable_sap);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_HDD_SOFTAP,
+			     hdd_ctx->config->qdf_trace_enable_hdd_sap);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_BMI,
+				hdd_ctx->config->qdf_trace_enable_bmi);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_CFG,
+				hdd_ctx->config->qdf_trace_enable_cfg);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_EPPING,
+				hdd_ctx->config->qdf_trace_enable_epping);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_QDF_DEVICE,
+				hdd_ctx->config->qdf_trace_enable_qdf_devices);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_TXRX,
 				hdd_ctx->config->cfd_trace_enable_txrx);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_HTC,
-				hdd_ctx->config->cdf_trace_enable_htc);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_HIF,
-				hdd_ctx->config->cdf_trace_enable_hif);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_HDD_SAP_DATA,
-				hdd_ctx->config->cdf_trace_enable_hdd_sap_data);
-	hdd_cdf_trace_enable(QDF_MODULE_ID_HDD_DATA,
-				hdd_ctx->config->cdf_trace_enable_hdd_data);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_HTC,
+				hdd_ctx->config->qdf_trace_enable_htc);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_HIF,
+				hdd_ctx->config->qdf_trace_enable_hif);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_HDD_SAP_DATA,
+				hdd_ctx->config->qdf_trace_enable_hdd_sap_data);
+	hdd_qdf_trace_enable(QDF_MODULE_ID_HDD_DATA,
+				hdd_ctx->config->qdf_trace_enable_hdd_data);
 
 	hdd_cfg_print(hdd_ctx);
 }
@@ -5168,7 +5168,7 @@ hdd_context_t *hdd_init_context(struct device *dev, void *hif_sc)
 		goto err_free_config;
 
 	/*
-	 * Update CDF trace levels based upon the code. The multicast
+	 * Update QDF trace levels based upon the code. The multicast
 	 * levels of the code need not be set when the logger thread
 	 * is not enabled.
 	 */
@@ -6593,11 +6593,11 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter)
 		hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter);
 		hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 		       FL("Now doing SAP STOPBSS"));
-		qdf_event_reset(&hostapd_state->cdf_stop_bss_event);
+		qdf_event_reset(&hostapd_state->qdf_stop_bss_event);
 		if (QDF_STATUS_SUCCESS == wlansap_stop_bss(hdd_ap_ctx->
 							sapContext)) {
 			qdf_status = qdf_wait_single_event(&hostapd_state->
-							   cdf_stop_bss_event,
+							   qdf_stop_bss_event,
 							   BSS_WAIT_TIMEOUT);
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 				mutex_unlock(&hdd_ctx->sap_lock);
@@ -6674,7 +6674,7 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter)
 
 	hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 	       FL("Waiting for SAP to start"));
-	qdf_status = qdf_wait_single_event(&hostapd_state->cdf_event,
+	qdf_status = qdf_wait_single_event(&hostapd_state->qdf_event,
 					BSS_WAIT_TIMEOUT);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		hddLog(QDF_TRACE_LEVEL_ERROR, FL("SAP Start failed"));
@@ -6819,7 +6819,7 @@ static int __hdd_module_init(void)
 		goto out;
 	}
 
-	pr_info("%s: qdf converged driver loaded\n", WLAN_MODULE_NAME);
+	pr_info("%s: driver loaded\n", WLAN_MODULE_NAME);
 
 	return 0;
 out:

core/hdd/src/wlan_hdd_memdump.c

@@ -84,13 +84,13 @@ static void memdump_cleanup_timer_cb(void *data)
 
 	qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
 	if (!qdf_ctx) {
-		hddLog(LOGE, FL("CDF context is NULL"));
+		hddLog(LOGE, FL("QDF context is NULL"));
 		return;
 	}
 
 	paddr = hdd_ctx->dump_loc_paddr;
 	mutex_lock(&hdd_ctx->memdump_lock);
-	qdf_mem_free_consistent(qdf_ctx,
+	qdf_mem_free_consistent(qdf_ctx, qdf_ctx->dev,
 		FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx);
 	hdd_ctx->fw_dump_loc = NULL;
 	hdd_ctx->memdump_in_progress = false;
@@ -216,7 +216,7 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy,
 
 	qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
 	if (!qdf_ctx) {
-		hddLog(LOGE, FL("CDF context is NULL"));
+		hddLog(LOGE, FL("QDF context is NULL"));
 		return -EINVAL;
 	}
 
@@ -299,7 +299,7 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy,
 	if (QDF_STATUS_SUCCESS != sme_status) {
 		hddLog(LOGE, FL("sme_fw_mem_dump Failed"));
 		mutex_lock(&hdd_ctx->memdump_lock);
-		qdf_mem_free_consistent(qdf_ctx,
+		qdf_mem_free_consistent(qdf_ctx, qdf_ctx->dev,
 			FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx);
 		hdd_ctx->fw_dump_loc = NULL;
 		mutex_unlock(&hdd_ctx->memdump_lock);
@@ -407,7 +407,7 @@ static ssize_t memdump_read(struct file *file, char __user *buf,
 	}
 	qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
 	if (!qdf_ctx) {
-		hddLog(LOGE, FL("CDF context is NULL"));
+		hddLog(LOGE, FL("QDF context is NULL"));
 		return -EINVAL;
 	}
 
@@ -443,7 +443,7 @@ static ssize_t memdump_read(struct file *file, char __user *buf,
 	if (*pos >= FW_MEM_DUMP_SIZE) {
 		paddr = hdd_ctx->dump_loc_paddr;
 		mutex_lock(&hdd_ctx->memdump_lock);
-		qdf_mem_free_consistent(qdf_ctx,
+		qdf_mem_free_consistent(qdf_ctx, qdf_ctx->dev,
 			FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx);
 		hdd_ctx->fw_dump_loc = NULL;
 		hdd_ctx->memdump_in_progress = false;
@@ -609,7 +609,7 @@ void memdump_deinit(void)
 
 	qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
 	if (!qdf_ctx) {
-		hddLog(LOGE, FL("CDF context is NULL"));
+		hddLog(LOGE, FL("QDF context is NULL"));
 		return;
 	}
 
@@ -619,7 +619,7 @@ void memdump_deinit(void)
 	mutex_lock(&hdd_ctx->memdump_lock);
 	if (hdd_ctx->fw_dump_loc) {
 		paddr = hdd_ctx->dump_loc_paddr;
-		qdf_mem_free_consistent(qdf_ctx,
+		qdf_mem_free_consistent(qdf_ctx, qdf_ctx->dev,
 			FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx);
 		hdd_ctx->fw_dump_loc = NULL;
 		hdd_ctx->memdump_in_progress = false;

core/hdd/src/wlan_hdd_ocb.c

@@ -422,7 +422,7 @@ static int hdd_ocb_set_config_req(hdd_adapter_t *adapter,
 		hdd_ocb_set_config_callback, config);
 	if (qdf_status != QDF_STATUS_SUCCESS) {
 		hddLog(LOGE, FL("Error calling SME function."));
-		/* Convert from ecdf_status to errno */
+		/* Convert from qdf_status to errno */
 		return -EINVAL;
 	}
 
@@ -1369,7 +1369,7 @@ __wlan_hdd_cfg80211_ocb_get_tsf_timer(struct wiphy *wiphy,
 				   &request);
 	if (rc) {
 		hddLog(LOGE, FL("Error calling SME function"));
-		/* Need to convert from ecdf_status to errno. */
+		/* Need to convert from qdf_status to errno. */
 		return -EINVAL;
 	}
 

core/hdd/src/wlan_hdd_power.c

@@ -832,12 +832,12 @@ static void hdd_mcbc_filter_modification(hdd_context_t *pHddCtx,
  */
 void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter)
 {
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	tpSirWlanSetRxpFilters wlanRxpFilterParam =
 		qdf_mem_malloc(sizeof(tSirWlanSetRxpFilters));
 	if (NULL == wlanRxpFilterParam) {
 		hddLog(QDF_TRACE_LEVEL_FATAL,
-		       "%s: cdf_mem_alloc failed ", __func__);
+		       "%s: qdf_mem_malloc failed ", __func__);
 		return;
 	}
 	hddLog(QDF_TRACE_LEVEL_INFO,
@@ -854,20 +854,20 @@ void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter)
 	}
 
 	wlanRxpFilterParam->setMcstBcstFilter = setfilter;
-	cdf_ret_status =
+	qdf_ret_status =
 		sme_configure_rxp_filter(pHddCtx->hHal, wlanRxpFilterParam);
 
-	if (setfilter && (QDF_STATUS_SUCCESS == cdf_ret_status))
+	if (setfilter && (QDF_STATUS_SUCCESS == qdf_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"),
-		(QDF_STATUS_SUCCESS != cdf_ret_status) ? "Failed" : "Success",
-		cdf_ret_status,
+		(QDF_STATUS_SUCCESS != qdf_ret_status) ? "Failed" : "Success",
+		qdf_ret_status,
 		wlanRxpFilterParam->configuredMcstBcstFilterSetting,
 		wlanRxpFilterParam->setMcstBcstFilter);
 
-	if (QDF_STATUS_SUCCESS != cdf_ret_status)
+	if (QDF_STATUS_SUCCESS != qdf_ret_status)
 		qdf_mem_free(wlanRxpFilterParam);
 }
 
@@ -1001,20 +1001,20 @@ static void hdd_send_suspend_ind(hdd_context_t *pHddCtx,
 						  bool suspended),
 				 void *callbackContext)
 {
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 
 	hdd_info("%s: send wlan suspend indication", __func__);
 
-	cdf_ret_status =
+	qdf_ret_status =
 		sme_configure_suspend_ind(pHddCtx->hHal, conn_state_mask,
 					  callback, callbackContext);
 
-	if (QDF_STATUS_SUCCESS == cdf_ret_status) {
+	if (QDF_STATUS_SUCCESS == qdf_ret_status) {
 		pHddCtx->hdd_mcastbcast_filter_set = true;
 	} else {
 		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("sme_configure_suspend_ind returned failure %d"),
-		       cdf_ret_status);
+		       qdf_ret_status);
 	}
 }
 
@@ -1027,14 +1027,14 @@ 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);
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 
-	cdf_ret_status = sme_configure_resume_req(pHddCtx->hHal, NULL);
+	qdf_ret_status = sme_configure_resume_req(pHddCtx->hHal, NULL);
 
-	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
+	if (QDF_STATUS_SUCCESS != qdf_ret_status) {
 		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: sme_configure_resume_req return failure %d",
-		       __func__, cdf_ret_status);
+		       __func__, qdf_ret_status);
 
 	}
 
@@ -1405,7 +1405,7 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc)
 	QDF_STATUS qdf_status;
 	v_CONTEXT_t p_cds_context = NULL;
 	hdd_context_t *pHddCtx = NULL;
-	QDF_STATUS cdf_ret_status;
+	QDF_STATUS qdf_ret_status;
 	hdd_adapter_t *pAdapter;
 	int i;
 
@@ -1488,14 +1488,14 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc)
 
 	/* Set the MAC Address, currently this is used by HAL to add self sta.
 	 * Remove this once self sta is added as part of session open. */
-	cdf_ret_status = cfg_set_str(pHddCtx->hHal, WNI_CFG_STA_ID,
+	qdf_ret_status = cfg_set_str(pHddCtx->hHal, WNI_CFG_STA_ID,
 				     (uint8_t *) &pHddCtx->config->
 				     intfMacAddr[0],
 				     sizeof(pHddCtx->config->intfMacAddr[0]));
-	if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
+	if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) {
 		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Failed to set MAC Address. "
-		       "HALStatus is %08d [x%08x]", __func__, cdf_ret_status,
-		       cdf_ret_status);
+		       "HALStatus is %08d [x%08x]", __func__, qdf_ret_status,
+		       qdf_ret_status);
 		goto err_cds_close;
 	}
 

core/hdd/src/wlan_hdd_scan.c

@@ -1087,7 +1087,7 @@ nla_put_failure:
  * @scanId: Scan Id
  * @status: Scan status
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle,
 					   void *pContext,

core/hdd/src/wlan_hdd_softap_tx_rx.c

@@ -600,7 +600,7 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context,
  * @pAdapter: pointer to adapter context
  * @staId: Station ID to deregister
  *
- * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error
+ * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error
  */
 QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId)
 {
@@ -653,7 +653,7 @@ QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId)
  * @pPeerMacAddress: station MAC address
  * @fWmmEnabled: is WMM enabled for this STA?
  *
- * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error
+ * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error
  */
 QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter,
 				   bool fAuthRequired,
@@ -753,7 +753,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter,
  * @pAdapter: pointer to adapter context
  * @fPrivacyBit: should 802.11 privacy bit be set?
  *
- * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error
+ * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error
  */
 QDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter,
 				      bool fPrivacyBit)
@@ -784,7 +784,7 @@ QDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter,
  * hdd_softap_deregister_bc_sta() - Deregister the SoftAP broadcast STA
  * @pAdapter: pointer to adapter context
  *
- * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error
+ * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error
  */
 QDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter)
 {
@@ -797,7 +797,7 @@ QDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter)
  * hdd_softap_stop_bss() - Stop the BSS
  * @pAdapter: pointer to adapter context
  *
- * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error
+ * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error
  */
 QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter)
 {
@@ -845,7 +845,7 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter)
  * @pDestMacAddress: MAC address of the station
  * @state: new state of the station
  *
- * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error
+ * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error
  */
 QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter,
 				       struct qdf_mac_addr *pDestMacAddress,

core/hdd/src/wlan_hdd_tdls.c

@@ -535,7 +535,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter)
 	int i;
 	uint8_t staIdx;
 	tdlsInfo_t *tInfo;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 
 	if (NULL == pHddCtx)
 		return -EINVAL;
@@ -680,7 +680,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter)
 	tInfo = qdf_mem_malloc(sizeof(tdlsInfo_t));
 	if (NULL == tInfo) {
 		hddLog(QDF_TRACE_LEVEL_ERROR,
-		       FL("cdf_mem_alloc failed for tInfo"));
+		       FL("qdf_mem_malloc failed for tInfo"));
 		qdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer);
 		qdf_mem_free(pHddTdlsCtx);
 		return -ENOMEM;
@@ -722,8 +722,8 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter)
 		pHddCtx->config->tdls_peer_kickout_threshold;
 	dump_tdls_state_param_setting(tInfo);
 
-	cdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tInfo, true);
-	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
+	qdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tInfo, true);
+	if (QDF_STATUS_SUCCESS != qdf_ret_status) {
 		qdf_mem_free(tInfo);
 		qdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer);
 		qdf_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;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 
 	pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 	if (!pHddCtx) {
@@ -824,14 +824,14 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter)
 				pHddCtx->config->tdls_peer_kickout_threshold;
 			dump_tdls_state_param_setting(tInfo);
 
-			cdf_ret_status =
+			qdf_ret_status =
 				sme_update_fw_tdls_state(pHddCtx->hHal, tInfo, false);
-			if (QDF_STATUS_SUCCESS != cdf_ret_status) {
+			if (QDF_STATUS_SUCCESS != qdf_ret_status) {
 				qdf_mem_free(tInfo);
 			}
 		} else {
 			hddLog(QDF_TRACE_LEVEL_ERROR,
-			       "%s: cdf_mem_alloc failed for tInfo", __func__);
+			       "%s: qdf_mem_malloc failed for tInfo", __func__);
 		}
 	}
 
@@ -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;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 
 	if (NULL == pHddTdlsCtx) {
 		hddLog(LOGE, FL("TDLS not enabled!"));
@@ -1631,7 +1631,7 @@ int wlan_hdd_tdls_set_params(struct net_device *dev,
 	tdlsParams = qdf_mem_malloc(sizeof(tdlsInfo_t));
 	if (NULL == tdlsParams) {
 		hddLog(QDF_TRACE_LEVEL_ERROR,
-		       "%s: cdf_mem_alloc failed for tdlsParams", __func__);
+		       "%s: qdf_mem_malloc failed for tdlsParams", __func__);
 		return -ENOMEM;
 	}
 
@@ -1665,8 +1665,8 @@ 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 (QDF_STATUS_SUCCESS != cdf_ret_status) {
+	qdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tdlsParams, true);
+	if (QDF_STATUS_SUCCESS != qdf_ret_status) {
 		qdf_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;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 
 	if (!hdd_tdls_ctx) {
 		/* may be TDLS is not applicable for this adapter */
@@ -1774,10 +1774,10 @@ void wlan_hdd_update_tdls_info(hdd_adapter_t *adapter, bool tdls_prohibited,
 
 	dump_tdls_state_param_setting(tdls_param);
 
-	cdf_ret_status = sme_update_fw_tdls_state(hdd_ctx->hHal,
+	qdf_ret_status = sme_update_fw_tdls_state(hdd_ctx->hHal,
 					       tdls_param,
 					       true);
-	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
+	if (QDF_STATUS_SUCCESS != qdf_ret_status) {
 		qdf_mem_free(tdls_param);
 		return;
 	}
@@ -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;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	hddTdlsPeer_t *pTdlsPeer;
 
 	ENTER();
@@ -4384,12 +4384,12 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 						supported_oper_classes[i];
 				}
 
-				cdf_ret_status =
+				qdf_ret_status =
 					sme_update_tdls_peer_state(pHddCtx->
 								   hHal,
 								   &smeTdlsPeerStateParams);
 				if (QDF_STATUS_SUCCESS !=
-				    cdf_ret_status) {
+				    qdf_ret_status) {
 					QDF_TRACE(QDF_MODULE_ID_HDD,
 						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: sme_update_tdls_peer_state failed for "

core/hdd/src/wlan_hdd_wext.c

@@ -1088,7 +1088,7 @@ 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: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error
+ * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error
  */
 QDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value)
 {
@@ -1177,7 +1177,7 @@ QDF_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: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error
+ * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error
  */
 QDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr)
 {
@@ -1327,7 +1327,7 @@ hdd_get_link_speed_cb(tSirLinkSpeedInfo *pLinkSpeed, void *pContext)
  * given peer, and then wait for the callback to be invoked.
  *
  * Return: QDF_STATUS_SUCCESS if linkspeed data is available,
- * otherwise a CDF_STATUS_E_* error.
+ * otherwise a QDF_STATUS_E_** error.
  */
 QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter,
 					      struct qdf_mac_addr macAddress) {
@@ -1487,7 +1487,7 @@ void hdd_statistics_cb(void *pStats, void *pContext)
 
 	if (pAdapter) {
 		pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
-		qdf_status = qdf_event_set(&pWextState->hdd_cdf_event);
+		qdf_status = qdf_event_set(&pWextState->hdd_qdf_event);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			hddLog(LOGE, FL("qdf_event_set failed"));
 			return;
@@ -2274,7 +2274,7 @@ static int __iw_get_bitrate(struct net_device *dev,
 		pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
 
 		qdf_status =
-			qdf_wait_single_event(&pWextState->hdd_cdf_event,
+			qdf_wait_single_event(&pWextState->hdd_qdf_event,
 					      WLAN_WAIT_TIME_STATS);
 
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -4036,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;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
 	tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile;
 	int ret;
 	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
@@ -4187,13 +4187,13 @@ static int __iw_set_encodeext(struct net_device *dev,
 	 * pre-authentication is done. Save the key in the UMAC and
 	 * include it in the ADD BSS request
 	 */
-	cdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter),
+	qdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter),
 					   pAdapter->sessionId, &setKey);
-	if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) {
+	if (qdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) {
 		hddLog(QDF_TRACE_LEVEL_INFO_MED,
 		       "%s: Update PreAuth Key success", __func__);
 		return 0;
-	} else if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) {
+	} else if (qdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) {
 		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Update PreAuth Key failed", __func__);
 		return -EINVAL;
@@ -4201,19 +4201,19 @@ static int __iw_set_encodeext(struct net_device *dev,
 
 	pHddStaCtx->roam_info.roamingState = HDD_ROAM_STATE_SETTING_KEY;
 
-	cdf_ret_status = sme_roam_set_key(WLAN_HDD_GET_HAL_CTX(pAdapter),
+	qdf_ret_status = sme_roam_set_key(WLAN_HDD_GET_HAL_CTX(pAdapter),
 					  pAdapter->sessionId,
 					  &setKey, &roamId);
 
-	if (cdf_ret_status != QDF_STATUS_SUCCESS) {
+	if (qdf_ret_status != QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "[%4d] sme_roam_set_key returned ERROR status= %d",
-			  __LINE__, cdf_ret_status);
+			  __LINE__, qdf_ret_status);
 
 		pHddStaCtx->roam_info.roamingState = HDD_ROAM_STATE_NONE;
 	}
 
-	return cdf_ret_status;
+	return qdf_ret_status;
 }
 
 /**
@@ -7906,7 +7906,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
 		unitTestArgs = qdf_mem_malloc(sizeof(*unitTestArgs));
 		if (NULL == unitTestArgs) {
 			hddLog(LOGE,
-			       FL("cdf_mem_alloc failed for unitTestArgs"));
+			       FL("qdf_mem_malloc failed for unitTestArgs"));
 			return -ENOMEM;
 		}
 		unitTestArgs->vdev_id = (int)pAdapter->sessionId;
@@ -8857,7 +8857,7 @@ static int __iw_get_statistics(struct net_device *dev,
 		pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
 
 		qdf_status =
-			qdf_wait_single_event(&pWextState->hdd_cdf_event,
+			qdf_wait_single_event(&pWextState->hdd_qdf_event,
 					      WLAN_WAIT_TIME_STATS);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			hddLog(QDF_TRACE_LEVEL_ERROR,
@@ -10770,9 +10770,9 @@ int hdd_register_wext(struct net_device *dev)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->hdd_cdf_event))) {
+	if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->hdd_qdf_event))) {
 		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
-			  ("ERROR: HDD cdf event init failed!!"));
+			  ("ERROR: HDD qdf event init failed!!"));
 		return QDF_STATUS_E_FAILURE;
 	}
 

core/hdd/src/wlan_hdd_wowl.c

@@ -57,10 +57,10 @@ static inline int find_ptrn_len(const char *ptrn)
 	return len;
 }
 
-static void hdd_wowl_callback(void *pContext, QDF_STATUS cdf_ret_status)
+static void hdd_wowl_callback(void *pContext, QDF_STATUS qdf_ret_status)
 {
 	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
-		  "%s: Return code = (%d)", __func__, cdf_ret_status);
+		  "%s: Return code = (%d)", __func__, qdf_ret_status);
 }
 
 #ifdef WLAN_WAKEUP_EVENTS
@@ -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;
-	QDF_STATUS cdf_ret_status;
+	QDF_STATUS qdf_ret_status;
 	const char *temp;
 	tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
 	uint8_t sessionId = pAdapter->sessionId;
@@ -253,14 +253,14 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn)
 		localPattern.session_id = sessionId;
 
 		/* Register the pattern downstream */
-		cdf_ret_status =
+		qdf_ret_status =
 			sme_wow_add_pattern(hHal, &localPattern,
 						   sessionId);
-		if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
+		if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) {
 			/* Add failed, so invalidate the local storage */
 			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "sme_wowl_add_bcast_pattern failed with error code (%d)",
-				  cdf_ret_status);
+				  qdf_ret_status);
 			kfree(g_hdd_wowl_ptrns[first_empty_slot]);
 			g_hdd_wowl_ptrns[first_empty_slot] = NULL;
 		}
@@ -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;
-	QDF_STATUS cdf_ret_status;
+	QDF_STATUS qdf_ret_status;
 	uint8_t sessionId = pAdapter->sessionId;
 	hdd_context_t *pHddCtx = pAdapter->pHddCtx;
 
@@ -311,10 +311,10 @@ bool hdd_del_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn)
 	if (patternFound) {
 		delPattern.pattern_id = id;
 		delPattern.session_id = sessionId;
-		cdf_ret_status =
+		qdf_ret_status =
 			sme_wow_delete_pattern(hHal, &delPattern,
 						   sessionId);
-		if (QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
+		if (QDF_IS_STATUS_SUCCESS(qdf_ret_status)) {
 			/* Remove from local storage as well */
 			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_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;
-	QDF_STATUS cdf_ret_status;
+	QDF_STATUS qdf_ret_status;
 	tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
 	uint8_t session_id = pAdapter->sessionId;
 	uint16_t pattern_len, mask_len, i;
@@ -429,13 +429,13 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx,
 	}
 
 	/* Register the pattern downstream */
-	cdf_ret_status =
+	qdf_ret_status =
 		sme_wow_add_pattern(hHal, &localPattern, session_id);
 
-	if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
+	if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) {
 		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: sme_wowl_add_bcast_pattern failed with error code (%d).",
-			  __func__, cdf_ret_status);
+			  __func__, qdf_ret_status);
 
 		return false;
 	}
@@ -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);
-	QDF_STATUS cdf_ret_status;
+	QDF_STATUS qdf_ret_status;
 	uint8_t sessionId = pAdapter->sessionId;
 
 	if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) {
@@ -484,13 +484,13 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx)
 
 	delPattern.pattern_id = pattern_idx;
 	delPattern.session_id = sessionId;
-	cdf_ret_status = sme_wow_delete_pattern(hHal, &delPattern,
+	qdf_ret_status = sme_wow_delete_pattern(hHal, &delPattern,
 						    sessionId);
 
-	if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
+	if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) {
 		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: sme_wowl_del_bcast_pattern failed with error code (%d).",
-			  __func__, cdf_ret_status);
+			  __func__, qdf_ret_status);
 
 		return false;
 	}
@@ -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;
-	QDF_STATUS cdf_ret_status;
+	QDF_STATUS qdf_ret_status;
 	tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
 
 	qdf_mem_zero(&wowParams, sizeof(tSirSmeWowlEnterParams));
@@ -534,19 +534,19 @@ bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm)
 #endif /* WLAN_WAKEUP_EVENTS */
 
 	/* Request to put FW into WoWL */
-	cdf_ret_status = sme_enter_wowl(hHal, hdd_wowl_callback, pAdapter,
+	qdf_ret_status = sme_enter_wowl(hHal, hdd_wowl_callback, pAdapter,
 #ifdef WLAN_WAKEUP_EVENTS
 					hdd_wowl_wake_indication_callback,
 					pAdapter,
 #endif /* WLAN_WAKEUP_EVENTS */
 					&wowParams, pAdapter->sessionId);
 
-	if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
-		if (QDF_STATUS_PMC_PENDING != cdf_ret_status) {
+	if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) {
+		if (QDF_STATUS_PMC_PENDING != qdf_ret_status) {
 			/* We failed to enter WoWL */
 			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "sme_enter_wowl failed with error code (%d)",
-				  cdf_ret_status);
+				  qdf_ret_status);
 			return false;
 		}
 	}
@@ -563,15 +563,15 @@ bool hdd_exit_wowl(hdd_adapter_t *pAdapter)
 {
 	tSirSmeWowlExitParams wowParams;
 	tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
-	QDF_STATUS cdf_ret_status;
+	QDF_STATUS qdf_ret_status;
 
 	wowParams.sessionId = pAdapter->sessionId;
 
-	cdf_ret_status = sme_exit_wowl(hHal, &wowParams);
-	if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
+	qdf_ret_status = sme_exit_wowl(hHal, &wowParams);
+	if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) {
 		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "sme_exit_wowl failed with error code (%d)",
-			  cdf_ret_status);
+			  qdf_ret_status);
 		return false;
 	}
 

core/mac/src/pe/lim/lim_api.c

@@ -1816,7 +1816,7 @@ void lim_fill_join_rsp_ht_caps(tpPESession session, tpSirSmeJoinRsp join_rsp)
 		return;
 	}
 	if (session->cc_switch_mode !=
-			CDF_MCC_TO_SCC_SWITCH_DISABLE) {
+			QDF_MCC_TO_SCC_SWITCH_DISABLE) {
 		ht_profile = &join_rsp->HTProfile;
 		ht_profile->htSupportedChannelWidthSet =
 			session->htSupportedChannelWidthSet;

core/mac/src/pe/lim/lim_process_mlm_req_messages.c

@@ -2423,7 +2423,7 @@ static void lim_process_periodic_probe_req_timer(tpAniSirGlobal mac_ctx)
 	TX_TIMER *probe_req_timer =
 		&mac_ctx->lim.limTimers.gLimPeriodicProbeReqTimer;
 
-	if (qdf_mc_timer_get_current_state(&probe_req_timer->cdf_timer)
+	if (qdf_mc_timer_get_current_state(&probe_req_timer->qdf_timer)
 					   != QDF_TIMER_STATE_STOPPED) {
 		lim_log(mac_ctx, LOG1, FL("Invalid state of timer"));
 		return;

core/mac/src/pe/lim/lim_send_sme_rsp_messages.c

@@ -343,7 +343,7 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx,
 			session_entry->ch_width;
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 		if (session_entry->cc_switch_mode !=
-				CDF_MCC_TO_SCC_SWITCH_DISABLE) {
+				QDF_MCC_TO_SCC_SWITCH_DISABLE) {
 			ht_profile = &sme_join_rsp->HTProfile;
 			ht_profile->htSupportedChannelWidthSet =
 				session_entry->htSupportedChannelWidthSet;
@@ -637,7 +637,7 @@ lim_send_sme_start_bss_rsp(tpAniSirGlobal pMac,
 			size += ieLen - sizeof(uint32_t);
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 			if (psessionEntry->cc_switch_mode
-			    != CDF_MCC_TO_SCC_SWITCH_DISABLE) {
+			    != QDF_MCC_TO_SCC_SWITCH_DISABLE) {
 				pSirSmeRsp->HTProfile.
 				htSupportedChannelWidthSet =
 					psessionEntry->htSupportedChannelWidthSet;

core/mac/src/pe/sch/sch_debug.c

@@ -44,17 +44,17 @@
 void sch_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...)
 {
 
-	QDF_TRACE_LEVEL cdf_debug_level;
+	QDF_TRACE_LEVEL qdf_debug_level;
 	char logBuffer[LOG_SIZE];
 	va_list marker;
 
 	/* getting proper Debug level */
-	cdf_debug_level = get_vos_debug_level(loglevel);
+	qdf_debug_level = get_vos_debug_level(loglevel);
 
 	/* extracting arguments from pstring */
 	va_start(marker, pString);
 	vsnprintf(logBuffer, LOG_SIZE, pString, marker);
-	QDF_TRACE(QDF_MODULE_ID_PE, cdf_debug_level, "%s", logBuffer);
+	QDF_TRACE(QDF_MODULE_ID_PE, qdf_debug_level, "%s", logBuffer);
 	va_end(marker);
 }
 

core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h

@@ -110,7 +110,7 @@ typedef struct TX_TIMER_STRUCT {
 	uint32_t expireInput;
 	uint64_t initScheduleTimeInMsecs;
 	uint64_t rescheduleTimeInMsecs;
-	qdf_mc_timer_t cdf_timer;
+	qdf_mc_timer_t qdf_timer;
 
 	/* Pointer to the MAC global structure, which stores the context for the NIC, */
 	/* for which this timer is supposed to operate. */

core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c

@@ -43,7 +43,7 @@
 
    when        who    what, where, why
    --------    ---    --------------------------------------------------------
-   03/31/09    sho    Remove the use of cdf_timerIsActive flag as it is not
+   03/31/09    sho    Remove the use of qdf_timerIsActive flag as it is not
 			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.
@@ -138,7 +138,7 @@ uint32_t tx_timer_activate(TX_TIMER *timer_ptr)
 	QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO,
 		  "Timer %s being activated\n", TIMER_NAME);
 
-	status = qdf_mc_timer_start(&timer_ptr->cdf_timer,
+	status = qdf_mc_timer_start(&timer_ptr->qdf_timer,
 				    timer_ptr->initScheduleTimeInMsecs);
 
 	if (QDF_STATUS_SUCCESS == status) {
@@ -184,7 +184,7 @@ uint32_t tx_timer_change(TX_TIMER *timer_ptr,
 	}
 	/* changes cannot be applied until timer stops running */
 	if (QDF_TIMER_STATE_STOPPED ==
-	    qdf_mc_timer_get_current_state(&timer_ptr->cdf_timer)) {
+	    qdf_mc_timer_get_current_state(&timer_ptr->qdf_timer)) {
 		timer_ptr->initScheduleTimeInMsecs =
 			TX_MSECS_IN_1_TICK * initScheduleTimeInTicks;
 		timer_ptr->rescheduleTimeInMsecs =
@@ -223,7 +223,7 @@ uint32_t tx_timer_change_context(TX_TIMER *timer_ptr,
 	}
 	/* changes cannot be applied until timer stops running */
 	if (QDF_TIMER_STATE_STOPPED ==
-	    qdf_mc_timer_get_current_state(&timer_ptr->cdf_timer)) {
+	    qdf_mc_timer_get_current_state(&timer_ptr->qdf_timer)) {
 		timer_ptr->expireInput = expiration_input;
 		return TX_SUCCESS;
 	} else {
@@ -271,7 +271,7 @@ static void tx_main_timer_func(void *functionContext)
 	/* check if this needs to be rescheduled */
 	if (0 != timer_ptr->rescheduleTimeInMsecs) {
 		QDF_STATUS status;
-		status = qdf_mc_timer_start(&timer_ptr->cdf_timer,
+		status = qdf_mc_timer_start(&timer_ptr->qdf_timer,
 					    timer_ptr->rescheduleTimeInMsecs);
 		timer_ptr->rescheduleTimeInMsecs = 0;
 
@@ -334,7 +334,7 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal,
 #endif /* Store the timer name, for Debug build only */
 
 	status =
-		qdf_mc_timer_init_debug(&timer_ptr->cdf_timer, QDF_TIMER_TYPE_SW,
+		qdf_mc_timer_init_debug(&timer_ptr->qdf_timer, QDF_TIMER_TYPE_SW,
 					tx_main_timer_func, (void *) timer_ptr,
 					fileName, lineNum);
 	if (QDF_STATUS_SUCCESS != status) {
@@ -393,7 +393,7 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr,
 	strlcpy(timer_ptr->timerName, name_ptr, sizeof(timer_ptr->timerName));
 #endif /* Store the timer name, for Debug build only */
 
-	status = qdf_mc_timer_init(&timer_ptr->cdf_timer, QDF_TIMER_TYPE_SW,
+	status = qdf_mc_timer_init(&timer_ptr->qdf_timer, QDF_TIMER_TYPE_SW,
 				   tx_main_timer_func, (void *) timer_ptr);
 	if (QDF_STATUS_SUCCESS != status) {
 		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
@@ -442,7 +442,7 @@ uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr)
 		return TX_TIMER_ERROR;
 	}
 	/* if the timer is not running then we do not need to do anything here */
-	vStatus = qdf_mc_timer_stop(&timer_ptr->cdf_timer);
+	vStatus = qdf_mc_timer_stop(&timer_ptr->qdf_timer);
 	if (QDF_STATUS_SUCCESS != vStatus) {
 		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "Unable to stop timer %s; status =%d\n",
@@ -463,7 +463,7 @@ uint32_t tx_timer_delete(TX_TIMER *timer_ptr)
 		return TX_TIMER_ERROR;
 	}
 
-	qdf_mc_timer_destroy(&timer_ptr->cdf_timer);
+	qdf_mc_timer_destroy(&timer_ptr->qdf_timer);
 	return TX_SUCCESS;
 } /*** tx_timer_delete() ***/
 
@@ -493,7 +493,7 @@ bool tx_timer_running(TX_TIMER *timer_ptr)
 		return false;
 
 	if (QDF_TIMER_STATE_RUNNING ==
-	    qdf_mc_timer_get_current_state(&timer_ptr->cdf_timer)) {
+	    qdf_mc_timer_get_current_state(&timer_ptr->qdf_timer)) {
 		return true;
 	}
 	return false;

core/mac/src/sys/legacy/src/utils/src/log_api.c

@@ -183,15 +183,15 @@ static inline QDF_MODULE_ID get_vos_module_id(uint8_t modId)
 void log_debug(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel,
 	       const char *pStr, va_list marker)
 {
-	QDF_TRACE_LEVEL cdf_debug_level;
-	QDF_MODULE_ID cdf_module_id;
+	QDF_TRACE_LEVEL qdf_debug_level;
+	QDF_MODULE_ID qdf_module_id;
 	char logBuffer[LOG_SIZE];
 
-	cdf_debug_level = get_vos_debug_level(debugLevel);
-	cdf_module_id = get_vos_module_id(modId);
+	qdf_debug_level = get_vos_debug_level(debugLevel);
+	qdf_module_id = get_vos_module_id(modId);
 
 	vsnprintf(logBuffer, LOG_SIZE - 1, pStr, marker);
-	QDF_TRACE(cdf_module_id, cdf_debug_level, "%s", logBuffer);
+	QDF_TRACE(qdf_module_id, qdf_debug_level, "%s", logBuffer);
 
 	/* The caller must check loglevel */
 	QDF_ASSERT((debugLevel <=

core/sap/dfs/inc/dfs.h

@@ -51,7 +51,7 @@
 #include <qdf_net_types.h>      /* QDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */
 #include <qdf_nbuf.h>           /* qdf_nbuf_t, etc. */
 #include <qdf_util.h>           /* qdf_assert */
-#include <qdf_lock.h>           /* cdf_spinlock */
+#include <qdf_lock.h>           /* qdf_spinlock */
 #include <cds_queue.h>          /* TAILQ */
 #include <qdf_time.h>
 #include <qdf_timer.h>

core/sap/inc/sap_api.h

@@ -69,7 +69,7 @@ extern "C" {
 #define       MAX_TEXT_SIZE                32
 
 #define       MAX_CHANNEL_LIST_LEN         256
-#define       CDF_MAX_NO_OF_SAP_MODE       2    /* max # of SAP */
+#define       QDF_MAX_NO_OF_SAP_MODE       2    /* max # of SAP */
 #define       SAP_MAX_NUM_SESSION          5
 #define       SAP_MAX_OBSS_STA_CNT         1    /* max # of OBSS STA */
 #define       SAP_ACS_WEIGHT_MAX           (4444)

core/sap/src/sap_api_link_cntl.c

@@ -806,7 +806,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 	/* State machine event */
 	tWLAN_SAPEvent sap_event;
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
 	tHalHandle hal = CDS_GET_HAL_CB(sap_ctx->p_cds_gctx);
 	tpAniSirGlobal mac_ctx = NULL;
 	uint8_t intf;
@@ -814,8 +814,8 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 	if (NULL == hal) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("Invalid hal"));
-		cdf_ret_status = QDF_STATUS_E_NOMEM;
-		return cdf_ret_status;
+		qdf_ret_status = QDF_STATUS_E_NOMEM;
+		return qdf_ret_status;
 	}
 
 	mac_ctx = PMAC_STRUCT(hal);
@@ -826,7 +826,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("Calling sme_roam_connect with eCSR_BSS_TYPE_INFRA_AP"));
 		sap_ctx->isSapSessionOpen = eSAP_TRUE;
-		cdf_ret_status = sme_roam_connect(hal, sap_ctx->sessionId,
+		qdf_ret_status = sme_roam_connect(hal, sap_ctx->sessionId,
 						  &sap_ctx->csr_roamProfile,
 						  &sap_ctx->csr_roamId);
 		break;
@@ -843,7 +843,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 			/* Handle event */
 			qdf_status = sap_fsm(sap_ctx, &sap_event);
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-				cdf_ret_status = QDF_STATUS_E_FAILURE;
+				qdf_ret_status = QDF_STATUS_E_FAILURE;
 		}
 		break;
 	case eCSR_ROAM_LOSTLINK:
@@ -987,7 +987,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 	switch (roam_result) {
 	case eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND:
 		wlansap_roam_process_infra_assoc_ind(sap_ctx, roam_result,
-						csr_roam_info, &cdf_ret_status);
+						csr_roam_info, &qdf_ret_status);
 		break;
 	case eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF:
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
@@ -1012,7 +1012,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 					eSAP_STA_ASSOC_EVENT,
 					(void *) eSAP_STATUS_SUCCESS);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_DISASSOC_IND:
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
@@ -1023,7 +1023,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 					eSAP_STA_DISASSOC_EVENT,
 					(void *) eSAP_STATUS_SUCCESS);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_DEAUTH_IND:
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
@@ -1038,7 +1038,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 					eSAP_STA_DISASSOC_EVENT,
 					(void *) eSAP_STATUS_SUCCESS);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_MIC_ERROR_GROUP:
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
@@ -1052,7 +1052,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 						eSAP_STA_MIC_FAILURE_EVENT,
 						(void *) NULL);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_MIC_ERROR_UNICAST:
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
@@ -1067,7 +1067,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 					  eSAP_STA_MIC_FAILURE_EVENT,
 					  (void *) NULL);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		}
 		break;
 	case eCSR_ROAM_RESULT_AUTHENTICATED:
@@ -1079,7 +1079,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 				  eSAP_STA_SET_KEY_EVENT,
 				  (void *) eSAP_STATUS_SUCCESS);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_ASSOCIATED:
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
@@ -1106,7 +1106,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 		sap_event.u2 = roam_result;
 		qdf_status = sap_fsm(sap_ctx, &sap_event);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_INFRA_STOPPED:
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
@@ -1120,7 +1120,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 		/* Handle event */
 		qdf_status = sap_fsm(sap_ctx, &sap_event);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND:
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
@@ -1134,7 +1134,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 						eSAP_WPS_PBC_PROBE_REQ_EVENT,
 						(void *) NULL);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_FORCED:
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
@@ -1172,21 +1172,21 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 						  eSAP_MAX_ASSOC_EXCEEDED,
 						  NULL);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 
 		break;
 	case eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND:
 		wlansap_roam_process_dfs_radar_found(mac_ctx, sap_ctx,
-						&cdf_ret_status);
+						&qdf_ret_status);
 		break;
 	case eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS:
 	case eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_FAILURE:
 		wlansap_roam_process_dfs_chansw_update_fail(hal, sap_ctx,
-						&cdf_ret_status);
+						&qdf_ret_status);
 		break;
 	case eCSR_ROAM_RESULT_CHANNEL_CHANGE_SUCCESS:
 		wlansap_roam_process_ch_change_success(mac_ctx, sap_ctx,
-						csr_roam_info, &cdf_ret_status);
+						csr_roam_info, &qdf_ret_status);
 		break;
 	case eCSR_ROAM_RESULT_CHANNEL_CHANGE_FAILURE:
 		/*
@@ -1201,7 +1201,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 		qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info,
 				   eSAP_ECSA_CHANGE_CHAN_IND, NULL);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-			cdf_ret_status = QDF_STATUS_E_FAILURE;
+			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	default:
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
@@ -1210,5 +1210,5 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 			  roam_result);
 		break;
 	}
-	return cdf_ret_status;
+	return qdf_ret_status;
 }

core/sap/src/sap_ch_select.c

@@ -612,7 +612,7 @@ bool sap_chan_sel_init(tHalHandle halHandle,
 
 	if (pSpectCh == NULL) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			  "In %s, CDF_MALLOC_ERR", __func__);
+			  "In %s, QDF_MALLOC_ERR", __func__);
 		return eSAP_FALSE;
 	}
 

core/sap/src/sap_fsm.c

@@ -1962,7 +1962,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 {
 
 	/* Initiate a SCAN request */
-	QDF_STATUS cdf_ret_status;
+	QDF_STATUS qdf_ret_status;
 	/* To be initialised if scan is required */
 	tCsrScanRequest scan_request;
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
@@ -1997,7 +1997,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 #endif
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 		if (sap_context->cc_switch_mode !=
-						CDF_MCC_TO_SCC_SWITCH_DISABLE) {
+						QDF_MCC_TO_SCC_SWITCH_DISABLE) {
 			con_ch = sme_check_concurrent_channel_overlap(h_hal,
 					sap_context->channel,
 					sap_context->csr_roamProfile.phyMode,
@@ -2025,7 +2025,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 #endif
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 		if (sap_context->cc_switch_mode !=
-						CDF_MCC_TO_SCC_SWITCH_DISABLE) {
+						QDF_MCC_TO_SCC_SWITCH_DISABLE) {
 			con_ch = sme_check_concurrent_channel_overlap(h_hal,
 					sap_context->channel,
 					sap_context->csr_roamProfile.phyMode,
@@ -2109,7 +2109,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 			 * csrScanCompleteCallback callback
 			 * pContext scan_request_id filled up
 			 */
-			cdf_ret_status = sme_scan_request(h_hal,
+			qdf_ret_status = sme_scan_request(h_hal,
 				sap_context->sessionId,
 				&scan_request,
 				&wlansap_pre_start_bss_acs_scan_callback,
@@ -2121,16 +2121,16 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 			 * csrScanCompleteCallback callback,
 			 * pContext scan_request_id filled up
 			 */
-			cdf_ret_status = sme_scan_request(h_hal,
+			qdf_ret_status = sme_scan_request(h_hal,
 				sap_context->sessionId,
 				&scan_request,
 				&wlansap_scan_callback,
 				sap_context);
 		}
-		if (QDF_STATUS_SUCCESS != cdf_ret_status) {
+		if (QDF_STATUS_SUCCESS != qdf_ret_status) {
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  FL("sme_scan_request  fail %d!!!"),
-				  cdf_ret_status);
+				  qdf_ret_status);
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 				  FL("SAP Configuring default channel, Ch=%d"),
 				  sap_context->channel);
@@ -2241,7 +2241,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext)
 {
 	uint32_t type, subType;
-	QDF_STATUS cdf_ret_status;
+	QDF_STATUS qdf_ret_status;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
@@ -2256,16 +2256,16 @@ QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext)
 		return QDF_STATUS_E_FAILURE;
 	}
 	/* Open SME Session for Softap */
-	cdf_ret_status = sme_open_session(hHal,
+	qdf_ret_status = sme_open_session(hHal,
 					  &wlansap_roam_callback,
 					  sapContext,
 					  sapContext->self_mac_addr,
 					  &sapContext->sessionId, type, subType);
 
-	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
+	if (QDF_STATUS_SUCCESS != qdf_ret_status) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "Error: In %s calling sme_roam_connect status = %d",
-			  __func__, cdf_ret_status);
+			  __func__, qdf_ret_status);
 
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -2308,7 +2308,7 @@ sap_goto_starting
 	ptWLAN_SAPEvent sapEvent, eCsrRoamBssType bssType) {
 	/* tHalHandle */
 	tHalHandle hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx);
-	QDF_STATUS cdf_ret_status;
+	QDF_STATUS qdf_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,
@@ -2327,12 +2327,12 @@ sap_goto_starting
 		return QDF_STATUS_E_FAULT;
 	}
 
-	cdf_ret_status = sap_open_session(hHal, sapContext);
+	qdf_ret_status = sap_open_session(hHal, sapContext);
 
-	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
+	if (QDF_STATUS_SUCCESS != qdf_ret_status) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "Error: In %s calling sap_open_session status = %d",
-			  __func__, cdf_ret_status);
+			  __func__, qdf_ret_status);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -2363,7 +2363,7 @@ sap_goto_starting
    ============================================================================*/
 QDF_STATUS sap_goto_disconnecting(ptSapContext sapContext)
 {
-	QDF_STATUS cdf_ret_status;
+	QDF_STATUS qdf_ret_status;
 	tHalHandle hHal;
 
 	hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx);
@@ -2375,11 +2375,11 @@ QDF_STATUS sap_goto_disconnecting(ptSapContext sapContext)
 	}
 
 	sap_free_roam_profile(&sapContext->csr_roamProfile);
-	cdf_ret_status = sme_roam_stop_bss(hHal, sapContext->sessionId);
-	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
+	qdf_ret_status = sme_roam_stop_bss(hHal, sapContext->sessionId);
+	if (QDF_STATUS_SUCCESS != qdf_ret_status) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "Error: In %s calling sme_roam_stop_bss status = %d",
-			  __func__, cdf_ret_status);
+			  __func__, qdf_ret_status);
 		return QDF_STATUS_E_FAILURE;
 	}
 

core/sap/src/sap_module.c

@@ -339,7 +339,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag      /* 0 /
 
     IN
     callbackContext:  The user passed in a context to identify
-    status:           The cdf_ret_status
+    status : The qdf_ret_status
 
    RETURN VALUE
     None
@@ -1299,7 +1299,7 @@ QDF_STATUS wlansap_disassoc_sta(void *pCtx, const uint8_t *pPeerStaMac)
 QDF_STATUS wlansap_deauth_sta(void *pCtx,
 			      struct tagCsrDelStaParams *pDelStaParams)
 {
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAULT;
 	ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx);
 
@@ -1313,11 +1313,11 @@ QDF_STATUS wlansap_deauth_sta(void *pCtx,
 		return qdf_status;
 	}
 
-	cdf_ret_status =
+	qdf_ret_status =
 		sme_roam_deauth_sta(CDS_GET_HAL_CB(pSapCtx->p_cds_gctx),
 				    pSapCtx->sessionId, pDelStaParams);
 
-	if (cdf_ret_status == QDF_STATUS_SUCCESS) {
+	if (qdf_ret_status == QDF_STATUS_SUCCESS) {
 		qdf_status = QDF_STATUS_SUCCESS;
 	}
 	return qdf_status;
@@ -1652,7 +1652,7 @@ QDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo)
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 	ptSapContext pSapCtx = NULL;
 	void *hHal = NULL;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	uint32_t roamId = 0xFF;
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
@@ -1669,11 +1669,11 @@ QDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo)
 			  __func__);
 		return QDF_STATUS_E_FAULT;
 	}
-	cdf_ret_status =
+	qdf_ret_status =
 		sme_roam_set_key(hHal, pSapCtx->sessionId, pSetKeyInfo,
 				 &roamId);
 
-	if (cdf_ret_status == QDF_STATUS_SUCCESS)
+	if (qdf_ret_status == QDF_STATUS_SUCCESS)
 		qdf_status = QDF_STATUS_SUCCESS;
 	else
 		qdf_status = QDF_STATUS_E_FAULT;
@@ -1800,7 +1800,7 @@ QDF_STATUS wlansap_update_wps_ie(void *pCtx)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAULT;
 	ptSapContext pSapCtx = NULL;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	void *hHal = NULL;
 
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
@@ -1822,11 +1822,11 @@ QDF_STATUS wlansap_update_wps_ie(void *pCtx)
 		return QDF_STATUS_E_FAULT;
 	}
 
-	cdf_ret_status =
+	qdf_ret_status =
 		sme_roam_update_apwpsie(hHal, pSapCtx->sessionId,
 					&pSapCtx->APWPSIEs);
 
-	if (cdf_ret_status == QDF_STATUS_SUCCESS)
+	if (qdf_ret_status == QDF_STATUS_SUCCESS)
 		qdf_status = QDF_STATUS_SUCCESS;
 	else
 		qdf_status = QDF_STATUS_E_FAULT;
@@ -1926,7 +1926,7 @@ QDF_STATUS sap_release_global_lock(ptSapContext pSapCtx)
 QDF_STATUS wlansap_set_wparsn_ies
 	(void *pCtx, uint8_t *pWPARSNIEs, uint32_t WPARSNIEsLen) {
 	ptSapContext pSapCtx = NULL;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	void *hHal = NULL;
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
@@ -1949,11 +1949,11 @@ QDF_STATUS wlansap_set_wparsn_ies
 	qdf_mem_copy(pSapCtx->APWPARSNIEs.rsnIEdata, pWPARSNIEs,
 		     WPARSNIEsLen);
 
-	cdf_ret_status =
+	qdf_ret_status =
 		sme_roam_update_apwparsni_es(hHal, pSapCtx->sessionId,
 					     &pSapCtx->APWPARSNIEs);
 
-	if (cdf_ret_status == QDF_STATUS_SUCCESS)
+	if (qdf_ret_status == QDF_STATUS_SUCCESS)
 		return QDF_STATUS_SUCCESS;
 	else
 		return QDF_STATUS_E_FAULT;
@@ -1979,7 +1979,7 @@ QDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf,
 {
 	ptSapContext pSapCtx = NULL;
 	void *hHal = NULL;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
@@ -1996,11 +1996,11 @@ QDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf,
 		return QDF_STATUS_E_FAULT;
 	}
 
-	cdf_ret_status =
+	qdf_ret_status =
 		sme_send_action(hHal, pSapCtx->sessionId, pBuf, len, 0,
 		0, channel_freq);
 
-	if (QDF_STATUS_SUCCESS == cdf_ret_status) {
+	if (QDF_STATUS_SUCCESS == qdf_ret_status) {
 		return QDF_STATUS_SUCCESS;
 	}
 
@@ -2033,7 +2033,7 @@ QDF_STATUS wlansap_remain_on_channel(void *pCtx,
 {
 	ptSapContext pSapCtx = NULL;
 	void *hHal = NULL;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
@@ -2050,11 +2050,11 @@ QDF_STATUS wlansap_remain_on_channel(void *pCtx,
 		return QDF_STATUS_E_FAULT;
 	}
 
-	cdf_ret_status = sme_remain_on_channel(hHal, pSapCtx->sessionId,
+	qdf_ret_status = sme_remain_on_channel(hHal, pSapCtx->sessionId,
 				channel, duration, callback, pContext,
 				true, scan_id);
 
-	if (QDF_STATUS_SUCCESS == cdf_ret_status) {
+	if (QDF_STATUS_SUCCESS == qdf_ret_status) {
 		return QDF_STATUS_SUCCESS;
 	}
 
@@ -2080,7 +2080,7 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx,
 {
 	ptSapContext pSapCtx = NULL;
 	void *hHal = NULL;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
@@ -2098,11 +2098,11 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx,
 		return QDF_STATUS_E_FAULT;
 	}
 
-	cdf_ret_status =
+	qdf_ret_status =
 		sme_cancel_remain_on_channel(hHal, pSapCtx->sessionId,
 		scan_id);
 
-	if (QDF_STATUS_SUCCESS == cdf_ret_status) {
+	if (QDF_STATUS_SUCCESS == qdf_ret_status) {
 		return QDF_STATUS_SUCCESS;
 	}
 
@@ -2131,7 +2131,7 @@ QDF_STATUS wlansap_register_mgmt_frame
 	uint16_t frameType, uint8_t *matchData, uint16_t matchLen) {
 	ptSapContext pSapCtx = NULL;
 	void *hHal = NULL;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
@@ -2148,11 +2148,11 @@ QDF_STATUS wlansap_register_mgmt_frame
 		return QDF_STATUS_E_FAULT;
 	}
 
-	cdf_ret_status = sme_register_mgmt_frame(hHal, pSapCtx->sessionId,
+	qdf_ret_status = sme_register_mgmt_frame(hHal, pSapCtx->sessionId,
 						 frameType, matchData,
 						 matchLen);
 
-	if (QDF_STATUS_SUCCESS == cdf_ret_status) {
+	if (QDF_STATUS_SUCCESS == qdf_ret_status) {
 		return QDF_STATUS_SUCCESS;
 	}
 
@@ -2181,7 +2181,7 @@ QDF_STATUS wlansap_de_register_mgmt_frame
 	uint16_t frameType, uint8_t *matchData, uint16_t matchLen) {
 	ptSapContext pSapCtx = NULL;
 	void *hHal = NULL;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
@@ -2198,11 +2198,11 @@ QDF_STATUS wlansap_de_register_mgmt_frame
 		return QDF_STATUS_E_FAULT;
 	}
 
-	cdf_ret_status =
+	qdf_ret_status =
 		sme_deregister_mgmt_frame(hHal, pSapCtx->sessionId, frameType,
 					  matchData, matchLen);
 
-	if (QDF_STATUS_SUCCESS == cdf_ret_status) {
+	if (QDF_STATUS_SUCCESS == qdf_ret_status) {
 		return QDF_STATUS_SUCCESS;
 	}
 
@@ -2243,7 +2243,7 @@ QDF_STATUS
 wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel)
 {
 	ptSapContext sapContext = NULL;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	void *hHal = NULL;
 	tpAniSirGlobal mac_ctx = NULL;
 	eCsrPhyMode phy_mode;
@@ -2278,10 +2278,10 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel)
 	 */
 	sapContext->channel = target_channel;
 	sapContext->csr_roamProfile.ch_params.ch_width = ch_params.ch_width;
-	cdf_ret_status = sme_roam_channel_change_req(hHal, sapContext->bssid,
+	qdf_ret_status = sme_roam_channel_change_req(hHal, sapContext->bssid,
 				&ch_params, &sapContext->csr_roamProfile);
 
-	if (cdf_ret_status == QDF_STATUS_SUCCESS) {
+	if (qdf_ret_status == QDF_STATUS_SUCCESS) {
 		sap_signal_hdd_event(sapContext, NULL,
 			eSAP_CHANNEL_CHANGE_EVENT,
 			(void *) eSAP_STATUS_SUCCESS);
@@ -2321,7 +2321,7 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel)
 QDF_STATUS wlansap_start_beacon_req(void *pSapCtx)
 {
 	ptSapContext sapContext = NULL;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	void *hHal = NULL;
 	uint8_t dfsCacWaitStatus = 0;
 	tpAniSirGlobal pMac = NULL;
@@ -2345,10 +2345,10 @@ QDF_STATUS wlansap_start_beacon_req(void *pSapCtx)
 	if (pMac->sap.SapDfsInfo.sap_radar_found_status == false) {
 		/* CAC Wait done without any Radar Detection */
 		dfsCacWaitStatus = true;
-		cdf_ret_status = sme_roam_start_beacon_req(hHal,
+		qdf_ret_status = sme_roam_start_beacon_req(hHal,
 							   sapContext->bssid,
 							   dfsCacWaitStatus);
-		if (cdf_ret_status == QDF_STATUS_SUCCESS) {
+		if (qdf_ret_status == QDF_STATUS_SUCCESS) {
 			return QDF_STATUS_SUCCESS;
 		}
 		return QDF_STATUS_E_FAULT;
@@ -2379,7 +2379,7 @@ QDF_STATUS wlansap_start_beacon_req(void *pSapCtx)
 QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx)
 {
 	ptSapContext sapContext = NULL;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	void *hHal = NULL;
 	tpAniSirGlobal pMac = NULL;
 	sapContext = (ptSapContext) pSapCtx;
@@ -2398,13 +2398,13 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx)
 	}
 	pMac = PMAC_STRUCT(hHal);
 
-	cdf_ret_status = sme_roam_csa_ie_request(hHal,
+	qdf_ret_status = sme_roam_csa_ie_request(hHal,
 				sapContext->bssid,
 				pMac->sap.SapDfsInfo.target_channel,
 				pMac->sap.SapDfsInfo.csaIERequired,
 				&pMac->sap.SapDfsInfo.new_ch_params);
 
-	if (cdf_ret_status == QDF_STATUS_SUCCESS) {
+	if (qdf_ret_status == QDF_STATUS_SUCCESS) {
 		return QDF_STATUS_SUCCESS;
 	}
 

core/sme/src/common/sme_api.c

@@ -8461,16 +8461,16 @@ QDF_STATUS sme_update_is_ese_feature_enabled
 QDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal,
 						bool fEnableFwRssiMonitoring)
 {
-	QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
 
 	if (sme_cfg_set_int (hHal, WNI_CFG_PS_ENABLE_RSSI_MONITOR,
 						fEnableFwRssiMonitoring) == QDF_STATUS_E_FAILURE) {
-		cdf_ret_status = QDF_STATUS_E_FAILURE;
+		qdf_ret_status = QDF_STATUS_E_FAILURE;
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "Could not pass on WNI_CFG_PS_RSSI_MONITOR to CFG");
 	}
 
-	return cdf_ret_status;
+	return qdf_ret_status;
 }
 
 /* ---------------------------------------------------------------------------
@@ -9581,7 +9581,7 @@ uint8_t sme_is_feature_supported_by_fw(uint8_t featEnumValue)
 
     \param  peerMac - peer's Mac Adress.
     \param  tdlsLinkEstablishParams - TDLS Peer Link Establishment Parameters
-   \- return CDF_STATUS_SUCCES
+   \- return QDF_STATUS_SUCCES
     -------------------------------------------------------------------------*/
 QDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal,
 					       uint8_t sessionId,
@@ -9618,7 +9618,7 @@ QDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal,
     \param buf - additional IEs to be included
     \param len - lenght of additional Ies
     \param responder - Tdls request type
-   \- return CDF_STATUS_SUCCES
+   \- return QDF_STATUS_SUCCES
     -------------------------------------------------------------------------*/
 QDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId,
 				    const tSirMacAddr peerMac,
@@ -9660,7 +9660,7 @@ QDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId,
 
     \param  peerMac - peer's Mac Adress.
     \param  staParams - Peer Station Parameters
-   \- return CDF_STATUS_SUCCES
+   \- return QDF_STATUS_SUCCES
     -------------------------------------------------------------------------*/
 QDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId,
 				    const tSirMacAddr peerMac,
@@ -9694,7 +9694,7 @@ QDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId,
     \brief  API to Add TDLS peer sta entry.
 
     \param  peerMac - peer's Mac Adress.
-   \- return CDF_STATUS_SUCCES
+   \- return QDF_STATUS_SUCCES
     -------------------------------------------------------------------------*/
 QDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId,
 				 const tSirMacAddr peerMac)
@@ -9721,7 +9721,7 @@ QDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId,
     \brief  API to Delete TDLS peer sta entry.
 
     \param  peerMac - peer's Mac Adress.
-   \- return CDF_STATUS_SUCCES
+   \- return QDF_STATUS_SUCCES
     -------------------------------------------------------------------------*/
 QDF_STATUS sme_delete_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId,
 				    const tSirMacAddr peerMac)
@@ -9947,7 +9947,7 @@ QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal,
  *
  * API to set tdls channel switch parameters.
  *
- * Return: QDF_STATUS_SUCCESS on success; another CDF_STATUS_* code otherwise
+ * Return: QDF_STATUS_SUCCESS on success; another QDF_STATUS_** code otherwise
  */
 QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal,
 	sme_tdls_chan_switch_params *ch_switch_params)
@@ -13849,7 +13849,7 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id,
 	if (NULL == iwcmd) {
 		QDF_TRACE(QDF_MODULE_ID_SME,
 			  QDF_TRACE_LEVEL_FATAL,
-			  "%s: cdf_mem_alloc failed", __func__);
+			  "%s: qdf_mem_malloc failed", __func__);
 		return QDF_STATUS_E_NOMEM;
 	}
 
@@ -14010,7 +14010,7 @@ QDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal mac)
  * @sessionId: session id
  * @delay_interval: delay interval
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id,
 				   sme_ac_enum_type ac, uint8_t tid,
@@ -14077,7 +14077,7 @@ QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id,
  * @ac: access catagory
  * @sessionId: session id
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id,
 				       sme_ac_enum_type ac,
@@ -14598,7 +14598,7 @@ QDF_STATUS sme_gateway_param_update(tHalHandle Hal,
  * @auth_cb: auth callback
  * @vdev_id: vdev id
  *
- * Return: CDF Status
+ * Return: QDF Status
  */
 QDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr,
 				   sme_peer_authorized_fp auth_cb,

core/sme/src/csr/csr_api_roam.c

@@ -3134,7 +3134,7 @@ QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac,
  *
  * CSR function that HDD calls to delete a associated station
  *
- * Return: QDF_STATUS_SUCCESS on success or another CDF_STATUS_* on error
+ * Return: QDF_STATUS_SUCCESS on success or another QDF_STATUS_** on error
  */
 QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac,
 		uint32_t sessionId,
@@ -6080,7 +6080,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx,
 		dst_profile = &session->connectedProfile.HTProfile;
 		src_profile = &start_bss_rsp->HTProfile;
 		if (mac_ctx->roam.configParam.cc_switch_mode
-				!= CDF_MCC_TO_SCC_SWITCH_DISABLE)
+				!= QDF_MCC_TO_SCC_SWITCH_DISABLE)
 			csr_roam_copy_ht_profile(dst_profile, src_profile);
 #endif
 		csr_roam_call_callback(mac_ctx, session_id, &roam_info,
@@ -6389,7 +6389,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx,
 			src_profile = &join_rsp->HTProfile;
 			dst_profile = &conn_profile->HTProfile;
 			if (mac_ctx->roam.configParam.cc_switch_mode
-				!= CDF_MCC_TO_SCC_SWITCH_DISABLE)
+				!= QDF_MCC_TO_SCC_SWITCH_DISABLE)
 				csr_roam_copy_ht_profile(dst_profile,
 						src_profile);
 #endif
@@ -15929,7 +15929,7 @@ csr_deregister_client_request(tpAniSirGlobal mac_ctx,
 		mac_ctx->roam.tlStatsReqInfo.timerRunning = false;
 	}
 	qdf_mc_timer_stop(&ptr_sta_entry->timer);
-	/* Destroy the cdf timer... */
+	/* Destroy the qdf timer... */
 	status = qdf_mc_timer_destroy(&ptr_sta_entry->timer);
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		sms_log(mac_ctx, LOGE,
@@ -17457,7 +17457,7 @@ QDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac)
 			/* So Stop and Destroy timer only when periodicity is set. */
 
 			qdf_mc_timer_stop(&pTempStaEntry->timer);
-			/* Destroy the cdf timer... */
+			/* Destroy the qdf timer... */
 			qdf_status =
 				qdf_mc_timer_destroy(&pTempStaEntry->timer);
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -19109,7 +19109,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx,
 	src_profile = &roam_synch_data->join_rsp->HTProfile;
 	dst_profile = &conn_profile->HTProfile;
 	if (mac_ctx->roam.configParam.cc_switch_mode
-			!= CDF_MCC_TO_SCC_SWITCH_DISABLE)
+			!= QDF_MCC_TO_SCC_SWITCH_DISABLE)
 		csr_roam_copy_ht_profile(dst_profile,
 				src_profile);
 #endif

core/sme/src/csr/csr_api_scan.c

@@ -2947,7 +2947,7 @@ static tCsrScanResult *csr_scan_save_bss_description(tpAniSirGlobal pMac,
 				       bssId));
 		qdf_mem_copy(&pCsrBssDescription->Result.BssDescriptor,
 			     pBSSDescription, cbBSSDesc);
-#if defined(CDF_ENSBALED)
+#if defined(QDF_ENSBALED)
 		if (NULL != pCsrBssDescription->Result.pvIes) {
 			QDF_ASSERT(pCsrBssDescription->Result.pvIes == NULL);
 			return NULL;

core/sme/src/csr/csr_inside_api.h

@@ -928,7 +928,7 @@ QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac,
  *
  * CSR function that HDD calls to issue a deauthenticate station command
  *
- * Return: QDF_STATUS_SUCCESS on success or another CDF_STATUS_* on error
+ * Return: QDF_STATUS_SUCCESS on success or another QDF_STATUS_** on error
  */
 QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac,
 		uint32_t sessionId,

core/sme/src/csr/csr_neighbor_roam.c

@@ -2370,7 +2370,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac,
  * This initializes all the necessary data structures related to the
  * associated AP.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static void csr_neighbor_roam_info_ctx_init(
 		tpAniSirGlobal pMac,
@@ -2481,13 +2481,13 @@ static void csr_neighbor_roam_info_ctx_init(
  * csr_neighbor_roam_indicate_connect()
  * @pMac: mac context
  * @session_id: Session Id
- * @qdf_status: CDF status
+ * @qdf_status: QDF 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
  * associated AP and transitions the state to CONNECTED state
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS csr_neighbor_roam_indicate_connect(
 		tpAniSirGlobal pMac, uint8_t session_id,

core/sme/src/csr/csr_util.c

@@ -706,7 +706,7 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx,
 	uint16_t sap_lfreq, sap_hfreq, intf_lfreq, intf_hfreq, sap_cch;
 
 	if (mac_ctx->roam.configParam.cc_switch_mode ==
-			CDF_MCC_TO_SCC_SWITCH_DISABLE)
+			QDF_MCC_TO_SCC_SWITCH_DISABLE)
 		return 0;
 
 	if (sap_ch != 0) {
@@ -756,7 +756,7 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx,
 	}
 
 	if (intf_ch && sap_ch != intf_ch &&
-			cc_switch_mode != CDF_MCC_TO_SCC_SWITCH_FORCE) {
+			cc_switch_mode != QDF_MCC_TO_SCC_SWITCH_FORCE) {
 		sap_lfreq = sap_cfreq - sap_hbw;
 		sap_hfreq = sap_cfreq + sap_hbw;
 		intf_lfreq = intf_cfreq - intf_hbw;
@@ -777,7 +777,7 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx,
 			(intf_hfreq > sap_lfreq && intf_hfreq < sap_hfreq))))
 			intf_ch = 0;
 	} else if (intf_ch && sap_ch != intf_ch &&
-				cc_switch_mode == CDF_MCC_TO_SCC_SWITCH_FORCE) {
+				cc_switch_mode == QDF_MCC_TO_SCC_SWITCH_FORCE) {
 		if (!((intf_ch < 14 && sap_ch < 14) ||
 			(intf_ch > 14 && sap_ch > 14)))
 			intf_ch = 0;
@@ -5670,7 +5670,7 @@ bool csr_wait_for_connection_update(tpAniSirGlobal mac,
 		}
 	}
 
-	status = cdf_wait_for_connection_update();
+	status = qdf_wait_for_connection_update();
 
 	if (do_release_reacquire_lock == true) {
 		ret = sme_acquire_global_lock(&mac->sme);

core/sme/src/qos/sme_qos.c

@@ -6366,7 +6366,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id)
 	sme_QosCmdInfoEntry *pcmd = NULL;
 	tListElem *list_elt = NULL;
 	sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_FAILURE_RSP;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
 	sme_QosCmdInfo *qos_cmd = NULL;
 
 	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
@@ -6399,7 +6399,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id)
 					  QDF_TRACE_LEVEL_ERROR,
 					  FL("sme_qos_internal_setup_req failed on session %d"),
 					  session_id);
-				cdf_ret_status = QDF_STATUS_E_FAILURE;
+				qdf_ret_status = QDF_STATUS_E_FAILURE;
 			}
 			break;
 		case SME_QOS_RELEASE_REQ:
@@ -6411,7 +6411,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id)
 					  QDF_TRACE_LEVEL_ERROR,
 					  FL("sme_qos_internal_release_req failed on session %d"),
 					  session_id);
-				cdf_ret_status = QDF_STATUS_E_FAILURE;
+				qdf_ret_status = QDF_STATUS_E_FAILURE;
 			}
 			break;
 		case SME_QOS_MODIFY_REQ:
@@ -6425,7 +6425,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id)
 					  QDF_TRACE_LEVEL_ERROR,
 					  FL("sme_qos_internal_modify_req failed on session %d"),
 					  session_id);
-				cdf_ret_status = QDF_STATUS_E_FAILURE;
+				qdf_ret_status = QDF_STATUS_E_FAILURE;
 			}
 			break;
 		case SME_QOS_RESEND_REQ:
@@ -6440,7 +6440,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id)
 					  QDF_TRACE_LEVEL_ERROR,
 					  FL("sme_qos_re_request_add_ts failed on session %d"),
 					  session_id);
-				cdf_ret_status = QDF_STATUS_E_FAILURE;
+				qdf_ret_status = QDF_STATUS_E_FAILURE;
 			}
 			break;
 		default:
@@ -6457,7 +6457,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id)
 			  FL("cmd buffer empty"));
 		qos_session->readyForPowerSave = true;
 	}
-	return cdf_ret_status;
+	return qdf_ret_status;
 }
 
 /*--------------------------------------------------------------------------

core/sme/src/rrm/sme_rrm.c

@@ -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.
- * @qdf_status - QDF_STATUS_SUCCESS/CDF_STATUS_FAILURE based on whether a valid
+ * @qdf_status - QDF_STATUS_SUCCESS/QDF_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
@@ -1355,7 +1355,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac)
 
 	QDF_STATUS qdf_status;
 	tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext;
-	QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS;
+	QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
 
 	pSmeRrmContext->rrmConfig.max_randn_interval = 50;        /* ms */
 
@@ -1386,9 +1386,9 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac)
 
 	pSmeRrmContext->neighborReqControlInfo.isNeighborRspPending = false;
 
-	cdf_ret_status =
+	qdf_ret_status =
 		csr_ll_open(pMac->hHdd, &pSmeRrmContext->neighborReportCache);
-	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
+	if (QDF_STATUS_SUCCESS != qdf_ret_status) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "rrm_open: Fail to open neighbor cache result");
 		return QDF_STATUS_E_FAILURE;

core/utils/epping/inc/epping_internal.h

@@ -158,7 +158,7 @@ void epping_free_cookie(epping_context_t *pEpping_ctx,
 struct epping_cookie *epping_alloc_cookie(epping_context_t *pEpping_ctx);
 void epping_get_dummy_mac_addr(tSirMacAddr macAddr);
 void epping_hex_dump(void *data, int buf_len, const char *str);
-void *epping_get_cdf_ctx(void);
+void *epping_get_qdf_ctx(void);
 void epping_log_packet(epping_adapter_t *pAdapter,
 		       EPPING_HEADER *eppingHdr, int ret, const char *str);
 void epping_log_stats(epping_adapter_t *pAdapter, const char *str);

core/utils/epping/src/epping_helper.c

@@ -163,12 +163,12 @@ void epping_hex_dump(void *data, int buf_len, const char *str)
 	printk("\n%s: X %s\n", __func__, str);
 }
 
-void *epping_get_cdf_ctx(void)
+void *epping_get_qdf_ctx(void)
 {
-	qdf_device_t *p_cdf_ctx;
+	qdf_device_t *qdf_ctx;
 
-	p_cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
-	return p_cdf_ctx;
+	qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
+	return qdf_ctx;
 }
 
 void epping_log_packet(epping_adapter_t *pAdapter,

core/utils/epping/src/epping_txrx.c

@@ -370,7 +370,7 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx,
 	qdf_spinlock_create(&pAdapter->data_lock);
 	qdf_nbuf_queue_init(&pAdapter->nodrop_queue);
 	pAdapter->epping_timer_state = EPPING_TX_TIMER_STOPPED;
-	qdf_timer_init(epping_get_cdf_ctx(), &pAdapter->epping_timer,
+	qdf_timer_init(epping_get_qdf_ctx(), &pAdapter->epping_timer,
 		epping_timer_expire, dev, QDF_TIMER_TYPE_SW);
 	dev->type = ARPHRD_IEEE80211;
 	dev->netdev_ops = &epping_drv_ops;

core/utils/logging/src/wlan_logging_sock_svc.c

@@ -635,7 +635,7 @@ static int wlan_logging_proc_sock_rx_msg(struct sk_buff *skb)
 		wake_up_interruptible(&gwlan_logging.wait_queue);
 	} else {
 		/* This is to set the default levels (WLAN logging
-		 * default values not the CDF trace default) when
+		 * default values not the QDF trace default) when
 		 * logger app is registered for the first time.
 		 */
 		gapp_pid = wnl->nlh.nlmsg_pid;

core/wma/inc/wma.h

@@ -1067,7 +1067,7 @@ struct wma_ini_config {
  * @egap_support: Enhanced Green AP support flag
  * @wmi_ready: wmi status flag
  * @wlan_init_status: wlan init status
- * @cdf_dev: cdf device
+ * @qdf_dev: qdf device
  * @phy_capability: PHY Capability from Target
  * @max_frag_entry: Max number of Fragment entry
  * @wmi_service_bitmap: wmi services bitmap received from Target

core/wma/inc/wma_if.h

@@ -191,7 +191,7 @@ typedef struct sAniProbeRspStruct {
  * @fShortGI40Mhz: short GI support for 40Mhz packets
  * @fShortGI20Mhz: short GI support for 20Mhz packets
  * @supportedRates: legacy supported rates
- * @status: CDF status
+ * @status: QDF status
  * @staIdx: station index
  * @bssIdx: BSSID of BSS to which the station is associated
  * @updateSta: pdate the existing STA entry, if this flag is set
@@ -517,7 +517,7 @@ typedef struct {
 /**
  * struct tDeleteBssParams - params required for del bss request
  * @bssIdx: BSSID
- * @status: CDF status
+ * @status: QDF status
  * @respReqd: response message to LIM only when this flag is set
  * @sessionId: PE session id
  * @bssid: BSSID mac address
@@ -886,7 +886,7 @@ typedef struct {
  * @maxTxPower: max tx power
  * @selfStaMacAddr: self mac address
  * @bssId: bssid
- * @status: CDF status
+ * @status: QDF status
  * @chainMask: chanin mask
  * @smpsMode: SMPS mode
  * @isDfsChannel: is DFS channel
@@ -982,7 +982,7 @@ typedef struct sLinkStateParams {
  * @staIdx: station index
  * @tspecIdx: TSPEC handler uniquely identifying a TSPEC for a STA in a BSS
  * @tspec: tspec value
- * @status: CDF status
+ * @status: QDF status
  * @sessionId: session id
  * @tsm_interval: TSM interval period passed from lim to WMA
  * @setRICparams: RIC parameters
@@ -1035,7 +1035,7 @@ typedef struct {
  * @staIdx: station index
  * @tspecIdx: TSPEC handler uniquely identifying a TSPEC for a STA in a BSS
  * @tspec: tspec value
- * @status: CDF status
+ * @status: QDF status
  * @sessionId: session id
  */
 typedef struct {

core/wma/src/wma_data.c

@@ -283,7 +283,7 @@ static void wma_bin_search_rate(wma_search_rate_t *tbl, int32_t tbl_size,
  * @nss: nss
  * @rate: rate
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_fill_ofdm_cck_mcast_rate(int32_t mbpsx10_rate,
 					       uint8_t nss, uint8_t *rate)
@@ -337,7 +337,7 @@ static void wma_set_ht_vht_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate,
  * @rate: rate
  * @streaming_rate: streaming rate
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_fill_ht20_mcast_rate(uint32_t shortgi,
 					   int32_t mbpsx10_rate, uint8_t nss,
@@ -375,7 +375,7 @@ static QDF_STATUS wma_fill_ht20_mcast_rate(uint32_t shortgi,
  * @rate: rate
  * @streaming_rate: streaming rate
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_fill_ht40_mcast_rate(uint32_t shortgi,
 					   int32_t mbpsx10_rate, uint8_t nss,
@@ -414,7 +414,7 @@ static QDF_STATUS wma_fill_ht40_mcast_rate(uint32_t shortgi,
  * @rate: rate
  * @streaming_rate: streaming rate
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_fill_vht20_mcast_rate(uint32_t shortgi,
 					    int32_t mbpsx10_rate, uint8_t nss,
@@ -454,7 +454,7 @@ static QDF_STATUS wma_fill_vht20_mcast_rate(uint32_t shortgi,
  * @rate: rate
  * @streaming_rate: streaming rate
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_fill_vht40_mcast_rate(uint32_t shortgi,
 					    int32_t mbpsx10_rate, uint8_t nss,
@@ -495,7 +495,7 @@ static QDF_STATUS wma_fill_vht40_mcast_rate(uint32_t shortgi,
  * @rate: rate
  * @streaming_rate: streaming rate
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_fill_vht80_mcast_rate(uint32_t shortgi,
 					    int32_t mbpsx10_rate, uint8_t nss,
@@ -538,7 +538,7 @@ static QDF_STATUS wma_fill_vht80_mcast_rate(uint32_t shortgi,
  * @rate: rate
  * @streaming_rate: streaming rate
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_fill_ht_mcast_rate(uint32_t shortgi,
 					 uint32_t chwidth, int32_t mbpsx10_rate,
@@ -572,7 +572,7 @@ static QDF_STATUS wma_fill_ht_mcast_rate(uint32_t shortgi,
  * @rate: rate
  * @streaming_rate: streaming rate
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_fill_vht_mcast_rate(uint32_t shortgi,
 					  uint32_t chwidth,
@@ -610,7 +610,7 @@ static QDF_STATUS wma_fill_vht_mcast_rate(uint32_t shortgi,
  * @nss: nss
  * @rate: rate
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_encode_mc_rate(uint32_t shortgi, uint32_t chwidth,
 				     WLAN_PHY_MODE chanmode, A_UINT32 mhz,
@@ -1041,7 +1041,7 @@ QDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t
  * channel of it and channel number. The info is provided run time using
  * iwpriv command: iwpriv <wlan0 | p2p0> setMccLatency <latency in ms>.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_set_mcc_channel_time_latency
 	(tp_wma_handle wma,
@@ -1155,7 +1155,7 @@ QDF_STATUS wma_set_mcc_channel_time_latency
  * checks if MCC mode is active, gets the second mode and its operating chan.
  * Quota for the 2nd role is calculated as 100 - quota of first mode.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_set_mcc_channel_time_quota
 	(tp_wma_handle wma,
@@ -1389,7 +1389,7 @@ void wma_unpause_vdev(tp_wma_handle wma)
  * This function update rate & short GI interval to fw based on params
  * send by SME.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma,
 					    tSirRateUpdateInd *
@@ -1616,7 +1616,7 @@ wma_mgmt_tx_dload_comp_hldr(void *wma_context, qdf_nbuf_t netbuf,
  *
  * attaches tx fn with underlying layer.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_tx_attach(tp_wma_handle wma_handle)
 {
@@ -1651,7 +1651,7 @@ QDF_STATUS wma_tx_attach(tp_wma_handle wma_handle)
  *
  * Deregister with TxRx for Tx Mgmt Download and Ack completion.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_tx_detach(tp_wma_handle wma_handle)
 {
@@ -2433,7 +2433,7 @@ err2:
  * given vdev id.
  * This is blocking call till the downloading of frame is complete.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen,
 			 eFrameType frmType, eFrameTxDir txDir, uint8_t tid,
@@ -2859,7 +2859,7 @@ error:
  *
  * Function fills the rx packet meta info from the the cds packet
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_ds_peek_rx_packet_info(cds_pkt_t *pkt, void **pkt_meta,
 				      bool bSwap)

core/wma/src/wma_dev_if.c

@@ -678,7 +678,7 @@ out:
  * @pdel_sta_self_req_param: del sta params
  * @generateRsp: generate Response flag
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle,
 			struct del_sta_self_params *pdel_sta_self_req_param,
@@ -1284,7 +1284,7 @@ static int wmi_unified_peer_create_send(wmi_unified_t wmi,
  * @vdev_id: vdev id
  * @roam_synch_in_progress: roam in progress
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev,
 			  ol_txrx_vdev_handle vdev,
@@ -2075,7 +2075,7 @@ end:
  * @req: vdev start params
  * @isRestart: isRestart flag
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_vdev_start(tp_wma_handle wma,
 			  struct wma_vdev_start_req *req, bool isRestart)

core/wma/src/wma_features.c

@@ -143,7 +143,7 @@ static int wma_post_auto_shutdown_msg(void)
  * @wma_handle: wma handle
  * @pGetRssiReq: get RSSI request
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle,
 				void *pGetRssiReq)
@@ -206,7 +206,7 @@ QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle,
  * wma_get_snr() - get RSSI from fw
  * @psnr_req: request params
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req)
 {
@@ -327,7 +327,7 @@ end:
  * @lphb_conf_req: configuration info
  * @by_user: whether this call is from user or cached resent
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle,
 				  tSirLPHBReq *lphb_conf_req, bool by_user)
@@ -419,7 +419,7 @@ error:
  * @wma_handle: wma handle
  * @lphb_conf_req: lphb config request
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle,
 				    tSirLPHBReq *lphb_conf_req)
@@ -493,7 +493,7 @@ error:
  * @wma_handle: wma handle
  * @lphb_conf_req: lphb config request
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle,
 					tSirLPHBReq *lphb_conf_req)
@@ -562,7 +562,7 @@ error:
  * @wma_handle: wma handle
  * @lphb_conf_req: lphb config request
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle,
 				    tSirLPHBReq *lphb_conf_req)
@@ -634,7 +634,7 @@ error:
  * @wma_handle: wma handle
  * @lphb_conf_req: lphb config request
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle,
 					tSirLPHBReq *lphb_conf_req)
@@ -703,7 +703,7 @@ error:
  * @wma_handle: wma handle
  * @lphb_conf_req: lphb config request
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle,
 				     tSirLPHBReq *lphb_conf_req)
@@ -758,7 +758,7 @@ QDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle,
  * @wma_handle: wma handle
  * @ta_dhcp_ind: DHCP indication
  *
- * Return: CDF Status
+ * Return: QDF Status
  */
 QDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle,
 				tAniDHCPInd *ta_dhcp_ind)
@@ -922,7 +922,7 @@ WLAN_PHY_MODE wma_chan_to_mode(u8 chan, phy_ch_width chan_width,
  * @handle: wma handle
  * @pLinkSpeed: link speed info
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed)
 {
@@ -1325,7 +1325,7 @@ static int wma_lphb_handler(tp_wma_handle wma, uint8_t *event)
  * @wma: wma handle
  * @vdev_id: vdev id
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_wow_sta_ra_filter(tp_wma_handle wma, uint8_t vdev_id)
 {
@@ -1594,7 +1594,7 @@ int wma_csa_offload_handler(void *handle, uint8_t *event, uint32_t len)
 
 	csa_offload_event = qdf_mem_malloc(sizeof(*csa_offload_event));
 	if (!csa_offload_event) {
-		WMA_LOGE("CDF MEM Alloc Failed for csa_offload_event");
+		WMA_LOGE("QDF MEM Alloc Failed for csa_offload_event");
 		return -EINVAL;
 	}
 
@@ -2498,7 +2498,7 @@ wma_unified_dfs_phyerr_filter_offload_enable(tp_wma_handle wma_handle)
  * @handle: wma handle
  * @params: pktlog params
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle,
 				   struct ath_pktlog_wmi_params *params)
@@ -3114,7 +3114,7 @@ static inline void wma_set_wow_bus_suspend(tp_wma_handle wma, int val)
  * @bitmap: Event bitmap
  * @enable: enable/disable
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_add_wow_wakeup_event(tp_wma_handle wma,
 					uint32_t vdev_id,
@@ -3167,7 +3167,7 @@ static QDF_STATUS wma_add_wow_wakeup_event(tp_wma_handle wma,
  * @mask_len: mask length
  * @user: true for user configured pattern and false for default pattern
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma,
 				uint8_t vdev_id, uint8_t ptrn_id,
@@ -3305,7 +3305,7 @@ static QDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma,
  *
  * Configures default WOW pattern for the given vdev_id which is in AP mode.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_wow_ap(tp_wma_handle wma, uint8_t vdev_id)
 {
@@ -3345,7 +3345,7 @@ static QDF_STATUS wma_wow_ap(tp_wma_handle wma, uint8_t vdev_id)
  *
  * Configures default WOW pattern for the given vdev_id which is in sta mode.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_wow_sta(tp_wma_handle wma, uint8_t vdev_id)
 {
@@ -3532,7 +3532,7 @@ void wma_enable_disable_wakeup_event(WMA_HANDLE handle,
  * wma_enable_wow_in_fw() - wnable wow in fw
  * @wma: wma handle
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle)
 {
@@ -3676,7 +3676,7 @@ error:
  * @wma: wma handle
  * @type: type of suspend
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_resume_req(tp_wma_handle wma, enum qdf_suspend_type type)
 {
@@ -3708,7 +3708,7 @@ QDF_STATUS wma_resume_req(tp_wma_handle wma, enum qdf_suspend_type type)
  * @vdev_id: vdev id
  * @user: true for user pattern and false for default pattern
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_wow_delete_pattern(tp_wma_handle wma, uint8_t ptrn_id,
 					uint8_t vdev_id, bool user)
@@ -3768,7 +3768,7 @@ static QDF_STATUS wma_wow_delete_pattern(tp_wma_handle wma, uint8_t ptrn_id,
  * Target is responsible for caching wow patterns accross multiple
  * suspend/resumes until the pattern is deleted by user
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn)
 {
@@ -3840,7 +3840,7 @@ QDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn)
  * 2) After deleting all user wow patterns add default wow patterns
  *    specific to that vdev.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma,
 					struct wow_delete_pattern *pattern)
@@ -3880,7 +3880,7 @@ QDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma,
  * Records pattern enable/disable status locally. This choice will
  * take effect when the driver enter into suspend state.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info)
 {
@@ -3912,7 +3912,7 @@ QDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info)
  * @wma: wma handle
  * @info: wow params
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info)
 {
@@ -4212,7 +4212,7 @@ static void wma_notify_suspend_req_procesed(tp_wma_handle wma,
  * The type controlls how we notify the indicator that the indication has
  * been processed
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum qdf_suspend_type type)
 {
@@ -4249,7 +4249,7 @@ QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum qdf_suspend_type type)
  * Sends host wakeup indication to FW. On receiving this indication,
  * FW will come out of WOW.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma)
 {
@@ -4801,7 +4801,7 @@ int wma_process_receive_filter_clear_filter_req(tp_wma_handle wma,
  * function fetches stats from data path APIs and post
  * WMA_TSM_STATS_RSP msg back to LIM.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler,
 				     void *pTsmStatsMsg)
@@ -4841,7 +4841,7 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler,
 		(tpAniGetTsmStatsRsp) qdf_mem_malloc(sizeof(tAniGetTsmStatsRsp));
 	if (NULL == pTsmRspParams) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
-			  "%s: CDF MEM Alloc Failure", __func__);
+			  "%s: QDF MEM Alloc Failure", __func__);
 		QDF_ASSERT(0);
 		qdf_mem_free(pTsmStatsMsg);
 		return QDF_STATUS_E_NOMEM;
@@ -4929,7 +4929,7 @@ static int wma_add_clear_mcbc_filter(tp_wma_handle wma_handle, uint8_t vdev_id,
  * @wma_handle: wma handle
  * @mcbc_param: mcbc params
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle,
 					   tSirRcvFltMcAddrList *mcbc_param)
@@ -5060,7 +5060,7 @@ int wma_gtk_offload_status_event(void *handle, uint8_t *event,
  * @vdev_id: vdev id
  * @params: GTK offload parameters
  *
- * Return: CDF status
+ * Return: QDF status
  */
 static QDF_STATUS wma_send_gtk_offload_req(tp_wma_handle wma, uint8_t vdev_id,
 					   tpSirGtkOffloadParams params)
@@ -5124,7 +5124,7 @@ out:
  * @handle: wma handle
  * @params: GTK offload params
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_process_gtk_offload_req(tp_wma_handle wma,
 				       tpSirGtkOffloadParams params)
@@ -5175,7 +5175,7 @@ out:
  * @wma: wma handle
  * @params: GTK offload params
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma,
 				tpSirGtkOffloadGetInfoRspParams params)
@@ -5238,7 +5238,7 @@ out:
  * To configure ARP NS off load data to firmware
  * when target goes to wow mode.
  *
- * Return: CDF Status
+ * Return: QDF Status
  */
 QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma,
 					    tpSirHostOffloadReq
@@ -5451,7 +5451,7 @@ QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma,
  * @handle: wma handle
  * @pAddPeriodicTxPtrnParams: tx ptrn params
  *
- * Retrun: CDF status
+ * Retrun: QDF status
  */
 QDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle,
 						tSirAddPeriodicTxPtrn *
@@ -5529,7 +5529,7 @@ QDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle,
  * @handle: wma handle
  * @pDelPeriodicTxPtrnParams: tx ptrn params
  *
- * Retrun: CDF status
+ * Retrun: QDF status
  */
 QDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle,
 						tSirDelPeriodicTxPtrn *
@@ -5588,7 +5588,7 @@ QDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle,
  * @wma_ptr: wma handle
  * @preq: stats ext params
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq)
 {
@@ -5733,7 +5733,7 @@ int wma_enable_ext_wow(tp_wma_handle wma, tpSirExtWoWParams params)
  * @wma: wma handle
  * @appType1Params: app type1 params
  *
- * Return: CDF status
+ * Return: QDF status
  */
 int wma_set_app_type1_params_in_fw(tp_wma_handle wma,
 				   tpSirAppType1Params appType1Params)
@@ -5788,7 +5788,7 @@ int wma_set_app_type1_params_in_fw(tp_wma_handle wma,
  * @wma: wma handle
  * @appType2Params: app type2 params
  *
- * Return: CDF status
+ * Return: QDF status
  */
 int wma_set_app_type2_params_in_fw(tp_wma_handle wma,
 					  tpSirAppType2Params appType2Params)
@@ -5907,7 +5907,7 @@ int wma_auto_shutdown_event_handler(void *handle, uint8_t *event,
  * @wma: wma handle
  * @auto_sh_cmd: auto shutdown timer value
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle,
 						  tSirAutoShutdownCmdParams *
@@ -5962,7 +5962,7 @@ QDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle,
  * @wma: wma_handle
  * @nan_req: request data which will be non-null
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req)
 {
@@ -6072,7 +6072,7 @@ int wma_process_dhcpserver_offload(tp_wma_handle wma_handle,
  * @wma_handle: wma handle
  * @flashing: flashing request
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle,
 				tSirLedFlashingReq *flashing)
@@ -6206,7 +6206,7 @@ int wma_channel_avoid_evt_handler(void *handle, uint8_t *event,
  * @wma_handle: wma handle
  * @ch_avoid_update_req: channel avoid update params
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle,
 					   tSirChAvoidUpdateReq *
@@ -6259,7 +6259,7 @@ QDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle,
  * @clientCtxt: client context
  * @regId: reg id
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_set_reg_domain(void *clientCtxt, v_REGDOMAIN_t regId)
 {
@@ -6341,7 +6341,7 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G,
  *
  * request the MC thread unpaus the vdev and set resume dtim
  *
- * Return: cdf status of the mq post
+ * Return: qdf status of the mq post
  */
 static QDF_STATUS wma_post_runtime_resume_msg(WMA_HANDLE handle)
 {

core/wma/src/wma_main.c

@@ -2618,7 +2618,7 @@ fail:
  *               Intialize event handlers and timers.
  * @cds_ctx: cds context
  *
- * Return: 0 on success, CDF Error on failure
+ * Return: 0 on success, QDF Error on failure
  */
 QDF_STATUS wma_start(void *cds_ctx)
 {
@@ -2834,7 +2834,7 @@ end:
  * @cds_ctx: cds context
  * @reason: reason for wma_stop.
  *
- * Return: 0 on success, CDF Error on failure
+ * Return: 0 on success, QDF Error on failure
  */
 QDF_STATUS wma_stop(void *cds_ctx, uint8_t reason)
 {
@@ -2979,7 +2979,7 @@ static void wma_cleanup_vdev_resp(tp_wma_handle wma)
  * wma_wmi_service_close() - close wma wmi service interface.
  * @cds_ctx: cds context
  *
- * Return: 0 on success, CDF Error on failure
+ * Return: 0 on success, QDF Error on failure
  */
 QDF_STATUS wma_wmi_service_close(void *cds_ctx)
 {
@@ -3090,7 +3090,7 @@ QDF_STATUS wma_wmi_work_close(void *cds_ctx)
  *               cleanup resources attached with wma.
  * @cds_ctx: cds context
  *
- * Return: 0 on success, CDF Error on failure
+ * Return: 0 on success, QDF Error on failure
  */
 QDF_STATUS wma_close(void *cds_ctx)
 {
@@ -3147,7 +3147,7 @@ QDF_STATUS wma_close(void *cds_ctx)
 	if (qdf_status != QDF_STATUS_SUCCESS)
 		WMA_LOGP("%s: dbglog_deinit failed", __func__);
 
-	/* close the cdf events */
+	/* close the qdf events */
 	qdf_event_destroy(&wma_handle->wma_ready_event);
 	qdf_status = qdf_mc_timer_destroy(&wma_handle->service_ready_ext_timer);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status))
@@ -3164,6 +3164,7 @@ QDF_STATUS wma_close(void *cds_ctx)
 	qdf_runtime_lock_deinit(wma_handle->wmi_cmd_rsp_runtime_lock);
 	for (idx = 0; idx < wma_handle->num_mem_chunks; ++idx) {
 		qdf_mem_free_consistent(wma_handle->qdf_dev,
+					wma_handle->qdf_dev->dev,
 					   wma_handle->mem_chunks[idx].len,
 					   wma_handle->mem_chunks[idx].vaddr,
 					   wma_handle->mem_chunks[idx].paddr,
@@ -4259,7 +4260,7 @@ bool wma_needshutdown(void *cds_ctx)
  * wma_wait_for_ready_event() - wait for wma ready event
  * @handle: wma handle
  *
- * Return: 0 for success or CDF error
+ * Return: 0 for success or QDF error
  */
 QDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle)
 {
@@ -4284,7 +4285,7 @@ QDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle)
  * @pps_param: pps params
  * @val : param value
  *
- * Return: 0 for success or CDF error
+ * Return: 0 for success or QDF error
  */
 QDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param,
 				    int val)
@@ -4362,7 +4363,7 @@ pkt_pwr_save_config:
  *
  * This function enables/disables the MAS value
  *
- * Return: CDF_SUCCESS for success otherwise failure
+ * Return: QDF_SUCCESS for success otherwise failure
  */
 QDF_STATUS wma_process_set_mas(tp_wma_handle wma,
 		uint32_t *mas_val)
@@ -4394,7 +4395,7 @@ QDF_STATUS wma_process_set_mas(tp_wma_handle wma,
  *
  * This function stores the miracast value in WMA
  *
- * Return: CDF_SUCCESS for success otherwise failure
+ * Return: QDF_SUCCESS for success otherwise failure
  *
  */
 QDF_STATUS wma_process_set_miracast(tp_wma_handle wma, uint32_t *miracast_val)
@@ -4690,7 +4691,7 @@ void wma_send_flush_logs_to_fw(tp_wma_handle wma_handle)
  * @cds_context: cds context
  * @msg: message
  *
- * Return: CDF_SUCCESS for success otherwise failure
+ * Return: QDF_SUCCESS for success otherwise failure
  */
 QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg)
 {

core/wma/src/wma_mgmt.c

@@ -336,7 +336,7 @@ int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len)
 		p_inactivity = (tpSirIbssPeerInactivityInd)
 			       qdf_mem_malloc(sizeof(tSirIbssPeerInactivityInd));
 		if (!p_inactivity) {
-			WMA_LOGE("CDF MEM Alloc Failed for tSirIbssPeerInactivity");
+			WMA_LOGE("QDF MEM Alloc Failed for tSirIbssPeerInactivity");
 			return -ENOMEM;
 		}
 
@@ -431,7 +431,7 @@ int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len)
 	del_sta_ctx =
 		(tpDeleteStaContext) qdf_mem_malloc(sizeof(tDeleteStaContext));
 	if (!del_sta_ctx) {
-		WMA_LOGE("CDF MEM Alloc Failed for tDeleteStaContext");
+		WMA_LOGE("QDF MEM Alloc Failed for tDeleteStaContext");
 		return -ENOMEM;
 	}
 
@@ -2022,7 +2022,7 @@ out:
  *
  * This function updates EDCA parameters to the target
  *
- * Return: CDF Status
+ * Return: QDF Status
  */
 QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle,
 					     tEdcaParams *edca_params)
@@ -2295,7 +2295,7 @@ static int wmi_unified_bcn_tmpl_send(tp_wma_handle wma,
  * This will send to target on the reception of
  * SWBA event.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id,
 			      tpSendbeaconParams bcn_info)
@@ -2808,7 +2808,7 @@ void wma_process_update_userpos(tp_wma_handle wma_handle,
  * @ht_capab: ht capablity
  * @value: value of ht param
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value)
 {
@@ -3304,7 +3304,7 @@ static int wma_mgmt_rx_process(void *handle, uint8_t *data,
  * wma_de_register_mgmt_frm_client() - deregister management frame
  * @cds_ctx: cds context
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_de_register_mgmt_frm_client(void *cds_ctx)
 {
@@ -3366,7 +3366,7 @@ QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx,
  * @cds_ctx: cds context
  * @mgmt_frm_rx: management frame
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_register_mgmt_frm_client(
 	void *cds_ctx, wma_mgmt_frame_rx_callback mgmt_frm_rx)

core/wma/src/wma_scan_roam.c

@@ -171,7 +171,7 @@ static bool wma_is_mcc_24G(WMA_HANDLE handle)
  * Fill individual elements of wmi_start_scan_req and TLV for
  * channel list, bssid, ssid etc.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle,
 				      tSirScanOffloadReq *scan_req,
@@ -536,7 +536,7 @@ error:
  *
  * Fill wmi_stop_scan_cmd buffer.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle,
 				     wmi_buf_t *buf,
@@ -582,7 +582,7 @@ error:
  *
  * Send start scan command to fw.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_start_scan(tp_wma_handle wma_handle,
 			  tSirScanOffloadReq *scan_req, uint16_t msg_type)
@@ -683,7 +683,7 @@ error:
  *
  * Send stop scan command to fw.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_stop_scan(tp_wma_handle wma_handle,
 			 tAbortScanParams *abort_scan_req)
@@ -736,7 +736,7 @@ error1:
  *
  * Function is used to update the support channel list in fw.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_update_channel_list(WMA_HANDLE handle,
 				   tSirUpdateChanList *chan_list)
@@ -839,7 +839,7 @@ end:
  * send WMI_ROAM_SCAN_MODE TLV to firmware. It has a piggyback
  * of WMI_ROAM_SCAN_MODE.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle,
 				      wmi_start_scan_cmd_fixed_param *
@@ -1105,7 +1105,7 @@ error:
  *
  * Send WMI_ROAM_SCAN_RSSI_THRESHOLD TLV to firmware
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle,
 	tSirRoamOffloadScanReq *roam_req)
@@ -1258,7 +1258,7 @@ error:
  *
  * Send WMI_ROAM_SCAN_PERIOD parameters to fw.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle,
 					     uint32_t scan_period,
@@ -1318,7 +1318,7 @@ error:
  *
  * Send WMI_ROAM_SCAN_RSSI_CHANGE_THRESHOLD parameters to fw.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle,
 	uint32_t vdev_id,
@@ -1383,7 +1383,7 @@ error:
  *
  * Set roam offload channel list.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle,
 					   uint8_t chan_count,
@@ -1798,7 +1798,7 @@ void wma_roam_scan_fill_scan_params(tp_wma_handle wma_handle,
  *
  * Send WMI_ROAM_AP_PROFILE to firmware
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle,
 					    wmi_ap_profile *ap_profile_p,
@@ -2015,7 +2015,7 @@ error:
  *
  * set first & final biss count to fw.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle,
 				   A_INT32 first_bcnt,
@@ -2057,7 +2057,7 @@ QDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle,
  *
  * This function set roam offload command to fw.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle,
 					 uint32_t command, uint32_t vdev_id)
@@ -2110,7 +2110,7 @@ error:
  *
  * Main routine to handle ROAM commands coming from CSR module.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle,
 				     tSirRoamOffloadScanReq *roam_req)
@@ -2817,7 +2817,7 @@ int wma_rssi_breached_event_handler(void *handle,
  *
  * This function fills roam self capablities.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 					wmi_roam_offload_tlv_param *
@@ -3367,7 +3367,7 @@ void wma_set_pno_channel_prediction(uint8_t *buf_ptr,
  * @pno: PNO request
  *
  * This function request FW to start PNO request.
- * Request: CDF status
+ * Request: QDF status
  */
 QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno)
 {
@@ -3515,7 +3515,7 @@ QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno)
  *
  * This function request FW to stop ongoing PNO operation.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id)
 {
@@ -3616,7 +3616,7 @@ void wma_config_pno(tp_wma_handle wma, tpSirPNOScanReq pno)
  *
  * This function request FW to start PLM.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm)
 {
@@ -3712,7 +3712,7 @@ QDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm)
  *
  * This function request FW to stop PLM.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm)
 {
@@ -5143,7 +5143,7 @@ wma_extscan_hotlist_ssid_match_event_handler(void *handle,
  * This function fills individual elements of extscan request and
  * TLV for buckets, channel list.
  *
- * Return: CDF Status.
+ * Return: QDF Status.
  */
 QDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle,
 					 tSirWifiScanCmdReqParams *pstart,
@@ -5371,7 +5371,7 @@ QDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle,
  *
  * This function sends start extscan request to fw.
  *
- * Return: CDF Status.
+ * Return: QDF Status.
  */
 QDF_STATUS wma_start_extscan(tp_wma_handle wma,
 			     tSirWifiScanCmdReqParams *pstart)
@@ -5422,7 +5422,7 @@ QDF_STATUS wma_start_extscan(tp_wma_handle wma,
  *
  * This function sends stop extscan request to fw.
  *
- * Return: CDF Status.
+ * Return: QDF Status.
  */
 QDF_STATUS wma_stop_extscan(tp_wma_handle wma,
 			    tSirExtScanStopReqParams *pstopcmd)
@@ -5505,7 +5505,7 @@ static inline int wma_get_hotlist_entries_per_page(wmi_unified_t wmi_handle,
  * This function fills individual elements for  hotlist request and
  * TLV for bssid entries
  *
- * Return: CDF Status.
+ * Return: QDF Status.
  */
 QDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle,
 					   tSirExtScanSetBssidHotListReqParams *
@@ -5626,7 +5626,7 @@ QDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle,
  *
  * This function configures hotlist monitor in fw.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_extscan_start_hotlist_monitor(tp_wma_handle wma,
 					     tSirExtScanSetBssidHotListReqParams
@@ -5659,7 +5659,7 @@ QDF_STATUS wma_extscan_start_hotlist_monitor(tp_wma_handle wma,
  *
  * This function configures hotlist monitor to stop in fw.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma,
 					    tSirExtScanResetBssidHotlistReqParams
@@ -5733,7 +5733,7 @@ QDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma,
  *
  * This function fills elements of change monitor request buffer.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle,
 						  tSirExtScanSetSigChangeReqParams
@@ -5816,7 +5816,7 @@ QDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle,
  *
  * This function sends start change monitor request to fw.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma,
 					    tSirExtScanSetSigChangeReqParams *
@@ -5862,7 +5862,7 @@ QDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma,
  *
  * This function sends stop change monitor request to fw.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma,
 					   tSirExtScanResetSignificantChangeReqParams
@@ -5931,7 +5931,7 @@ QDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma,
  *
  * This function send request to fw to get cached results.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma,
 					  tSirExtScanGetCachedResultsReqParams *
@@ -5985,7 +5985,7 @@ QDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma,
  *
  * This function send request to fw to get extscan capabilities.
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma,
 					tSirGetExtScanCapabilitiesReqParams *
@@ -6494,7 +6494,7 @@ wma_set_ssid_hotlist(tp_wma_handle wma,
  *
  * set scan probe OUI parameters in firmware
  *
- * Return: CDF status
+ * Return: QDF status
  */
 QDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui)
 {