qcacld-3.0: wma: Replace tSirRetStatus with QDF_STATUS

The tSirRetStatus definitions are obsolete, so replace them with
QDF_STATUS definitions in the wma folder.

Change-Id: I3ba728e378697fb02f02322e7a467cd4f8a62c10
CRs-Fixed: 2262962

core/wma/inc/wma.h

@@ -2429,16 +2429,13 @@ static inline
 QDF_STATUS wma_vdev_get_cfg_int(int cfg_id, int *value)
 {
 	struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE);
-	/* set value to zero */
+
 	*value = 0;
 
 	if (!mac)
 		return QDF_STATUS_E_FAILURE;
 
-	if (wlan_cfg_get_int(mac, cfg_id, value) != eSIR_SUCCESS)
-		return QDF_STATUS_E_FAILURE;
-
-	return QDF_STATUS_SUCCESS;
+	return wlan_cfg_get_int(mac, cfg_id, value);
 }
 
 /**

core/wma/inc/wma_api.h

@@ -161,8 +161,8 @@ void *wma_get_beacon_buffer_by_vdev_id(uint8_t vdev_id, uint32_t *buffer_size);
 
 bool wma_get_fw_wlan_feat_caps(enum cap_bitmap feature);
 void wma_set_fw_wlan_feat_caps(enum cap_bitmap feature);
-tSirRetStatus wma_post_ctrl_msg(tpAniSirGlobal pMac,
-				struct scheduler_msg *pMsg);
+
+QDF_STATUS wma_post_ctrl_msg(tpAniSirGlobal pMac, struct scheduler_msg *pMsg);
 
 void wma_register_wow_wakeup_events(WMA_HANDLE handle, uint8_t vdev_id,
 					uint8_t vdev_type, uint8_t sub_type);

core/wma/inc/wma_if.h

@@ -1017,8 +1017,8 @@ typedef struct {
 } tAggrAddTsParams, *tpAggrAddTsParams;
 
 
-typedef tSirRetStatus (*tHalMsgCallback)(tpAniSirGlobal pMac, uint32_t mesgId,
-					 void *mesgParam);
+typedef QDF_STATUS (*tHalMsgCallback)(tpAniSirGlobal pMac, uint32_t mesgId,
+				      void *mesgParam);
 
 /**
  * struct tEdcaParams - EDCA parameters

core/wma/inc/wma_types.h

@@ -672,10 +672,9 @@ enum rateid {
 	RATEID_DEFAULT
 };
 
-tSirRetStatus wma_post_ctrl_msg(tpAniSirGlobal pMac,
-				struct scheduler_msg *pMsg);
+QDF_STATUS wma_post_ctrl_msg(tpAniSirGlobal pMac, struct scheduler_msg *pMsg);
 
-tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, tSirMbMsg *pMb);
+QDF_STATUS u_mac_post_ctrl_msg(void *pSirGlobal, tSirMbMsg *pMb);
 
 QDF_STATUS wma_set_idle_ps_config(void *wma_ptr, uint32_t idle_ps);
 QDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req);

core/wma/src/wlan_qct_wma_legacy.c

@@ -45,13 +45,13 @@
  * Return: Success or Failure
  */
 
-tSirRetStatus wma_post_ctrl_msg(tpAniSirGlobal pMac, struct scheduler_msg *pMsg)
+QDF_STATUS wma_post_ctrl_msg(tpAniSirGlobal pMac, struct scheduler_msg *pMsg)
 {
 	if (QDF_STATUS_SUCCESS !=
 	    scheduler_post_msg(QDF_MODULE_ID_WMA,  pMsg))
-		return eSIR_FAILURE;
+		return QDF_STATUS_E_FAILURE;
 	else
-		return eSIR_SUCCESS;
+		return QDF_STATUS_SUCCESS;
 }
 
 /**
@@ -62,10 +62,10 @@ tSirRetStatus wma_post_ctrl_msg(tpAniSirGlobal pMac, struct scheduler_msg *pMsg)
  * Return: Success or Failure
  */
 
-static tSirRetStatus wma_post_cfg_msg(tpAniSirGlobal pMac,
-				      struct scheduler_msg *pMsg)
+static QDF_STATUS wma_post_cfg_msg(tpAniSirGlobal pMac,
+				   struct scheduler_msg *pMsg)
 {
-	tSirRetStatus rc = eSIR_SUCCESS;
+	QDF_STATUS rc = QDF_STATUS_SUCCESS;
 
 	do {
 		/*
@@ -74,7 +74,7 @@ static tSirRetStatus wma_post_cfg_msg(tpAniSirGlobal pMac,
 		 */
 
 		cfg_process_mb_msg(pMac, (tSirMbMsg *) pMsg->bodyptr);
-		rc = eSIR_SUCCESS;
+		rc = QDF_STATUS_SUCCESS;
 	} while (0);
 
 	return rc;
@@ -97,10 +97,10 @@ static tSirRetStatus wma_post_cfg_msg(tpAniSirGlobal pMac,
  * Return: success/error code
  */
 
-tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, tSirMbMsg *pMb)
+QDF_STATUS u_mac_post_ctrl_msg(void *pSirGlobal, tSirMbMsg *pMb)
 {
 	struct scheduler_msg msg = {0};
-	tSirRetStatus status = eSIR_SUCCESS;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tpAniSirGlobal pMac = (tpAniSirGlobal) pSirGlobal;
 
 	msg.type = pMb->type;
@@ -127,38 +127,25 @@ tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, tSirMbMsg *pMb)
 	default:
 		WMA_LOGD("Unknown message type = 0x%X\n", msg.type);
 		qdf_mem_free(msg.bodyptr);
-		return eSIR_FAILURE;
+		return QDF_STATUS_E_FAILURE;
 	}
 
-	if (status != eSIR_SUCCESS)
+	if (status != QDF_STATUS_SUCCESS)
 		qdf_mem_free(msg.bodyptr);
 
 	return status;
 
 } /* u_mac_post_ctrl_msg() */
 
-/**
- * umac_send_mb_message_to_mac() - post a message to a message queue
- * @pBuf: Pointer to buffer allocated by caller
- *
- * Return: qdf status
- */
-QDF_STATUS umac_send_mb_message_to_mac(void *pBuf)
+QDF_STATUS umac_send_mb_message_to_mac(void *msg)
 {
-	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
-	tSirRetStatus sirStatus;
-	void *hHal;
-
-	hHal = cds_get_context(QDF_MODULE_ID_SME);
-	if (NULL == hHal) {
-		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
-			  "%s: invalid hHal", __func__);
-		qdf_mem_free(pBuf);
-	} else {
-		sirStatus = u_mac_post_ctrl_msg(hHal, pBuf);
-		if (eSIR_SUCCESS == sirStatus)
-			qdf_ret_status = QDF_STATUS_SUCCESS;
+	void *mac_handle = cds_get_context(QDF_MODULE_ID_SME);
+
+	if (!mac_handle) {
+		QDF_TRACE_ERROR(QDF_MODULE_ID_SYS, "Invalid MAC handle");
+		qdf_mem_free(msg);
+		return QDF_STATUS_E_FAILURE;
 	}
 
-	return qdf_ret_status;
+	return u_mac_post_ctrl_msg(mac_handle, msg);
 }

core/wma/src/wma_data.c

@@ -1090,7 +1090,7 @@ QDF_STATUS wma_set_mcc_channel_time_latency(tp_wma_handle wma,
 	}
 	/* Confirm MCC adaptive scheduler feature is disabled */
 	if (wlan_cfg_get_int(pMac, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED,
-				 &cfg_val) == eSIR_SUCCESS) {
+			     &cfg_val) == QDF_STATUS_SUCCESS) {
 		if (cfg_val == WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STAMAX) {
 			WMA_LOGD("%s: Can't set channel latency while MCC ADAPTIVE SCHED is enabled. Exit",
 				__func__);
@@ -1154,7 +1154,7 @@ QDF_STATUS wma_set_mcc_channel_time_quota(tp_wma_handle wma,
 
 	/* Confirm MCC adaptive scheduler feature is disabled */
 	if (wlan_cfg_get_int(pMac, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED,
-				 &cfg_val) == eSIR_SUCCESS) {
+			     &cfg_val) == QDF_STATUS_SUCCESS) {
 		if (cfg_val == WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STAMAX) {
 			WMA_LOGD("%s: Can't set channel quota while MCC_ADAPTIVE_SCHED is enabled. Exit",
 				 __func__);

core/wma/src/wma_dev_if.c

@@ -2241,19 +2241,19 @@ struct cdp_vdev *wma_vdev_attach(tp_wma_handle wma_handle,
 		wma_handle->ptrn_match_enable_all_vdev ? true : false;
 
 	if (wlan_cfg_get_int(mac, WNI_CFG_WOWLAN_DEAUTH_ENABLE, &cfg_val)
-	    != eSIR_SUCCESS)
+	    != QDF_STATUS_SUCCESS)
 		wma_handle->wow.deauth_enable = true;
 	else
 		wma_handle->wow.deauth_enable = cfg_val ? true : false;
 
 	if (wlan_cfg_get_int(mac, WNI_CFG_WOWLAN_DISASSOC_ENABLE, &cfg_val)
-	    != eSIR_SUCCESS)
+	    != QDF_STATUS_SUCCESS)
 		wma_handle->wow.disassoc_enable = true;
 	else
 		wma_handle->wow.disassoc_enable = cfg_val ? true : false;
 
 	if (wlan_cfg_get_int(mac, WNI_CFG_WOWLAN_MAX_MISSED_BEACON, &cfg_val)
-	    != eSIR_SUCCESS)
+	    != QDF_STATUS_SUCCESS)
 		wma_handle->wow.bmiss_enable = true;
 	else
 		wma_handle->wow.bmiss_enable = cfg_val ? true : false;
@@ -2303,7 +2303,7 @@ struct cdp_vdev *wma_vdev_attach(tp_wma_handle wma_handle,
 				 status);
 
 		if (wlan_cfg_get_int(mac, WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD,
-				     &cfg_val) != eSIR_SUCCESS) {
+				     &cfg_val) != QDF_STATUS_SUCCESS) {
 			WMA_LOGE("Failed to get value for WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD");
 			cfg_val = DEFAULT_INFRA_STA_KEEP_ALIVE_PERIOD;
 		}
@@ -2384,7 +2384,7 @@ struct cdp_vdev *wma_vdev_attach(tp_wma_handle wma_handle,
 		WMA_LOGE("Failed to set WMI VDEV MCC_BROADCAST_PROBE_ENABLE");
 
 	if (wlan_cfg_get_int(mac, WNI_CFG_RTS_THRESHOLD,
-			     &cfg_val) == eSIR_SUCCESS) {
+			     &cfg_val) == QDF_STATUS_SUCCESS) {
 		ret = wma_vdev_set_param(wma_handle->wmi_handle,
 					self_sta_req->session_id,
 					WMI_VDEV_PARAM_RTS_THRESHOLD,
@@ -2396,7 +2396,7 @@ struct cdp_vdev *wma_vdev_attach(tp_wma_handle wma_handle,
 	}
 
 	if (wlan_cfg_get_int(mac, WNI_CFG_FRAGMENTATION_THRESHOLD,
-			     &cfg_val) == eSIR_SUCCESS) {
+			     &cfg_val) == QDF_STATUS_SUCCESS) {
 		ret = wma_vdev_set_param(wma_handle->wmi_handle,
 					self_sta_req->session_id,
 					WMI_VDEV_PARAM_FRAGMENTATION_THRESHOLD,
@@ -2408,7 +2408,7 @@ struct cdp_vdev *wma_vdev_attach(tp_wma_handle wma_handle,
 	}
 
 	if (wlan_cfg_get_int(mac, WNI_CFG_HT_CAP_INFO, &cfg_val) ==
-								 eSIR_SUCCESS) {
+	    QDF_STATUS_SUCCESS) {
 		val16 = (uint16_t) cfg_val;
 		phtCapInfo = (tSirMacHTCapabilityInfo *) &cfg_val;
 
@@ -2493,7 +2493,7 @@ struct cdp_vdev *wma_vdev_attach(tp_wma_handle wma_handle,
 		self_sta_req->session_id);
 
 	if (wlan_cfg_get_int(mac, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED,
-			     &cfg_val) == eSIR_SUCCESS) {
+			     &cfg_val) == QDF_STATUS_SUCCESS) {
 		WMA_LOGD("%s: setting ini value for WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED: %d",
 			__func__, cfg_val);
 		ret = wma_set_enable_disable_mcc_adaptive_scheduler(cfg_val);
@@ -2688,7 +2688,8 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma,
 		CFG_TGT_DEFAULT_GTX_VHT_MASK;
 
 	if (wlan_cfg_get_int(mac_ctx, WNI_CFG_TGT_GTX_USR_CFG,
-	    &intr[params.vdev_id].config.gtx_info.gtxUsrcfg) != eSIR_SUCCESS) {
+			     &intr[params.vdev_id].config.gtx_info.gtxUsrcfg)
+	    != QDF_STATUS_SUCCESS) {
 		intr[params.vdev_id].config.gtx_info.gtxUsrcfg =
 						WNI_CFG_TGT_GTX_USR_CFG_STADEF;
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_WARN,
@@ -4479,7 +4480,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta)
 #define CFG_DATA_MASK              0x00FF
 
 	if (wlan_cfg_get_int(wma->mac_context, WNI_CFG_SAP_MAX_MCS_DATA,
-				&mcs_limit) != eSIR_SUCCESS) {
+			     &mcs_limit) != QDF_STATUS_SUCCESS) {
 		mcs_limit = WNI_CFG_SAP_MAX_MCS_DATA_STADEF;
 	}
 

core/wma/src/wma_features.c

@@ -3244,7 +3244,7 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler,
 		return QDF_STATUS_E_NOMEM;
 	}
 	pTsmRspParams->staId = pStats->staId;
-	pTsmRspParams->rc = eSIR_FAILURE;
+	pTsmRspParams->rc = QDF_STATUS_E_FAILURE;
 	pTsmRspParams->tsmStatsReq = pStats;
 	pTsmMetric = &pTsmRspParams->tsmMetrics;
 	/* populate pTsmMetric */
@@ -3599,7 +3599,7 @@ QDF_STATUS wma_process_rmc_action_period_ind(tp_wma_handle wma)
 			       (wmi_rmc_set_action_period_cmd_fixed_param));
 
 	if (wlan_cfg_get_int(mac, WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY,
-			     &periodicity_msec) != eSIR_SUCCESS) {
+			     &periodicity_msec) != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("Failed to get value for RMC action period using default");
 		periodicity_msec = WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STADEF;
 	}

core/wma/src/wma_main.c

@@ -1033,8 +1033,9 @@ static void wma_override_listen_interval(tp_wma_handle wma,
 	} else if (!new_override_li &&
 		   (new_override_li != old_override_li)) {
 		/* Configure default LI as we do on resume */
-		if ((wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL,
-				      &listen_interval) != eSIR_SUCCESS)) {
+		ret = wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL,
+				       &listen_interval);
+		if (ret != QDF_STATUS_SUCCESS) {
 			QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 				  "Failed to get value for listen interval");
 			listen_interval = POWERSAVE_DEFAULT_LISTEN_INTERVAL;
@@ -1662,7 +1663,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma,
 				if (cfg_set_int(pMac,
 						WNI_CFG_CURRENT_TX_POWER_LEVEL,
 						privcmd->param_value) !=
-								eSIR_SUCCESS)
+				    QDF_STATUS_SUCCESS)
 					WMA_LOGE("could not set WNI_CFG_CURRENT_TX_POWER_LEVEL");
 
 			} else {
@@ -1678,7 +1679,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma,
 				if (cfg_set_int(pMac,
 						WNI_CFG_CURRENT_TX_POWER_LEVEL,
 						privcmd->param_value) !=
-							    eSIR_SUCCESS)
+				    QDF_STATUS_SUCCESS)
 					WMA_LOGE("could not set WNI_CFG_CURRENT_TX_POWER_LEVEL");
 
 			} else {

core/wma/src/wma_mgmt.c

@@ -566,6 +566,7 @@ static inline void wma_get_link_probe_timeout(struct sAniSirGlobal *mac,
 {
 	uint32_t keep_alive;
 	uint16_t lm_id, ka_id;
+	QDF_STATUS status;
 
 	switch (sub_type) {
 	case WMI_UNIFIED_VDEV_SUBTYPE_P2P_GO:
@@ -578,13 +579,15 @@ static inline void wma_get_link_probe_timeout(struct sAniSirGlobal *mac,
 		ka_id = WNI_CFG_AP_KEEP_ALIVE_TIMEOUT;
 	}
 
-	if (wlan_cfg_get_int(mac, lm_id, max_inactive_time) != eSIR_SUCCESS) {
+	status = wlan_cfg_get_int(mac, lm_id, max_inactive_time);
+	if (QDF_IS_STATUS_ERROR(status)) {
 		WMA_LOGE("Failed to read link monitor for subtype %d",
 			 sub_type);
 		*max_inactive_time = WMA_LINK_MONITOR_DEFAULT_TIME_SECS;
 	}
 
-	if (wlan_cfg_get_int(mac, ka_id, &keep_alive) != eSIR_SUCCESS) {
+	status = wlan_cfg_get_int(mac, ka_id, &keep_alive);
+	if (QDF_IS_STATUS_ERROR(status)) {
 		WMA_LOGE("Failed to read keep alive for subtype %d", sub_type);
 		keep_alive = WMA_KEEP_ALIVE_DEFAULT_TIME_SECS;
 	}
@@ -656,7 +659,7 @@ void wma_set_vdev_mgmt_rate(tp_wma_handle wma, uint8_t vdev_id)
 	}
 
 	if (wlan_cfg_get_int(mac, WNI_CFG_RATE_FOR_TX_MGMT,
-			     &cfg_val) == eSIR_SUCCESS) {
+			     &cfg_val) == QDF_STATUS_SUCCESS) {
 		band = CDS_BAND_ALL;
 		if ((cfg_val == WNI_CFG_RATE_FOR_TX_MGMT_STADEF) ||
 		    !wma_verify_rate_code(cfg_val, band)) {
@@ -677,7 +680,7 @@ void wma_set_vdev_mgmt_rate(tp_wma_handle wma, uint8_t vdev_id)
 	}
 
 	if (wlan_cfg_get_int(mac, WNI_CFG_RATE_FOR_TX_MGMT_2G,
-			     &cfg_val) == eSIR_SUCCESS) {
+			     &cfg_val) == QDF_STATUS_SUCCESS) {
 		band = CDS_BAND_2GHZ;
 		if ((cfg_val == WNI_CFG_RATE_FOR_TX_MGMT_2G_STADEF) ||
 		    !wma_verify_rate_code(cfg_val, band)) {
@@ -695,7 +698,7 @@ void wma_set_vdev_mgmt_rate(tp_wma_handle wma, uint8_t vdev_id)
 	}
 
 	if (wlan_cfg_get_int(mac, WNI_CFG_RATE_FOR_TX_MGMT_5G,
-			     &cfg_val) == eSIR_SUCCESS) {
+			     &cfg_val) == QDF_STATUS_SUCCESS) {
 		band = CDS_BAND_5GHZ;
 		if ((cfg_val == WNI_CFG_RATE_FOR_TX_MGMT_5G_STADEF) ||
 		    !wma_verify_rate_code(cfg_val, band)) {
@@ -792,13 +795,13 @@ void wma_set_sta_sa_query_param(tp_wma_handle wma,
 	}
 	if (wlan_cfg_get_int
 		    (mac, WNI_CFG_PMF_SA_QUERY_MAX_RETRIES,
-		    &max_retries) != eSIR_SUCCESS) {
+		    &max_retries) != QDF_STATUS_SUCCESS) {
 		max_retries = DEFAULT_STA_SA_QUERY_MAX_RETRIES_COUNT;
 		WMA_LOGE(FL("Failed to get value for WNI_CFG_PMF_SA_QUERY_MAX_RETRIES"));
 	}
 	if (wlan_cfg_get_int
 		    (mac, WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL,
-		    &retry_interval) != eSIR_SUCCESS) {
+		    &retry_interval) != QDF_STATUS_SUCCESS) {
 		retry_interval = DEFAULT_STA_SA_QUERY_RETRY_INTERVAL;
 		WMA_LOGE(FL("Failed to get value for WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL"));
 	}
@@ -988,7 +991,7 @@ static void wma_mask_tx_ht_rate(tp_wma_handle wma, uint8_t *mcs_set)
 	 * MCS value.
 	 */
 	if (wlan_cfg_get_int(wma->mac_context, WNI_CFG_MAX_HT_MCS_TX_DATA,
-			   &mcs_limit) != eSIR_SUCCESS) {
+			   &mcs_limit) != QDF_STATUS_SUCCESS) {
 		mcs_limit = WNI_CFG_MAX_HT_MCS_TX_DATA_STADEF;
 	}
 
@@ -1220,7 +1223,7 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
 
 	if (wlan_cfg_get_int(wma->mac_context,
 			     WNI_CFG_DISABLE_ABG_RATE_FOR_TX_DATA,
-			     &disable_abg_rate) != eSIR_SUCCESS)
+			     &disable_abg_rate) != QDF_STATUS_SUCCESS)
 		disable_abg_rate = WNI_CFG_DISABLE_ABG_RATE_FOR_TX_DATA_STADEF;
 
 	if (!disable_abg_rate) {
@@ -1678,7 +1681,7 @@ void wma_update_cfg_params(tp_wma_handle wma, struct scheduler_msg *cfgParam)
 	}
 
 	if (wlan_cfg_get_int(pmac, (uint16_t) cfgParam->bodyval,
-			     &cfg_val) != eSIR_SUCCESS) {
+			     &cfg_val) != QDF_STATUS_SUCCESS) {
 		WMA_LOGE("Failed to get value for CFG PARAMS %d. returning without updating",
 			cfgParam->bodyval);
 		return;
@@ -1712,7 +1715,7 @@ static void wma_read_cfg_wepkey(tp_wma_handle wma_handle,
 				tSirKeys *key_info, uint32_t *def_key_idx,
 				uint8_t *num_keys)
 {
-	tSirRetStatus status;
+	QDF_STATUS status;
 	uint32_t val = SIR_MAC_KEY_LENGTH;
 	uint8_t i, j;
 
@@ -1720,14 +1723,14 @@ static void wma_read_cfg_wepkey(tp_wma_handle wma_handle,
 	/* NOTE:def_key_idx is initialized to 0 by the caller */
 	status = wlan_cfg_get_int(wma_handle->mac_context,
 				  WNI_CFG_WEP_DEFAULT_KEYID, def_key_idx);
-	if (status != eSIR_SUCCESS)
+	if (status != QDF_STATUS_SUCCESS)
 		WMA_LOGE("Unable to read default id, defaulting to 0");
 
 	for (i = 0, j = 0; i < SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS; i++) {
 		status = wlan_cfg_get_str(wma_handle->mac_context,
 					  (uint16_t) WNI_CFG_WEP_DEFAULT_KEY_1 +
 					  i, key_info[j].key, &val);
-		if (status != eSIR_SUCCESS) {
+		if (status != QDF_STATUS_SUCCESS) {
 			WMA_LOGE("WEP key is not configured at :%d", i);
 		} else {
 			key_info[j].keyId = i;

core/wma/src/wma_power.c

@@ -571,7 +571,7 @@ static QDF_STATUS wma_set_force_sleep(tp_wma_handle wma,
 
 	/* Set Tx/Rx Data InActivity Timeout   */
 	if (wlan_cfg_get_int(mac, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT,
-			     &cfg_data_val) != eSIR_SUCCESS) {
+			     &cfg_data_val) != QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT");
 		cfg_data_val = POWERSAVE_DEFAULT_INACTIVITY_TIME;
@@ -584,7 +584,7 @@ static QDF_STATUS wma_set_force_sleep(tp_wma_handle wma,
 		tx_wake_threshold = WMI_STA_PS_TX_WAKE_THRESHOLD_NEVER;
 
 		if (wlan_cfg_get_int(mac, WNI_CFG_MAX_PS_POLL,
-				     &cfg_data_val) != eSIR_SUCCESS) {
+				     &cfg_data_val) != QDF_STATUS_SUCCESS) {
 			QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 				  "Failed to get value for WNI_CFG_MAX_PS_POLL");
 		}
@@ -597,7 +597,7 @@ static QDF_STATUS wma_set_force_sleep(tp_wma_handle wma,
 	} else {
 		/* Ps Poll Wake Policy */
 		if (wlan_cfg_get_int(mac, WNI_CFG_MAX_PS_POLL,
-				     &cfg_data_val) != eSIR_SUCCESS) {
+				     &cfg_data_val) != QDF_STATUS_SUCCESS) {
 			QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 				  "Failed to get value for WNI_CFG_MAX_PS_POLL");
 		}
@@ -694,7 +694,7 @@ static QDF_STATUS wma_set_force_sleep(tp_wma_handle wma,
 
 	/* Set Listen Interval */
 	if (wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL,
-			     &cfg_data_val) != eSIR_SUCCESS) {
+			     &cfg_data_val) != QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get value for WNI_CFG_LISTEN_INTERVAL");
 		cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL;
@@ -1718,7 +1718,7 @@ static void wma_configure_vdev_suspend_params(tp_wma_handle wma,
 
 	if (wlan_cfg_get_int(mac,
 			     WNI_CFG_PS_WOW_DATA_INACTIVITY_TIMEOUT,
-			     &cfg_data_val) != eSIR_SUCCESS) {
+			     &cfg_data_val) != QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			"Can't get WNI_CFG_PS_WOW_DATA_INACTIVITY_TO");
 		cfg_data_val = WOW_POWERSAVE_DEFAULT_INACTIVITY_TIME;
@@ -1733,7 +1733,7 @@ static void wma_configure_vdev_suspend_params(tp_wma_handle wma,
 			__func__);
 
 	if (wlan_cfg_get_int(mac, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT,
-		&inactivity_time) != eSIR_SUCCESS) {
+		&inactivity_time) != QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 		"Failed to get WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT");
 		inactivity_time = POWERSAVE_DEFAULT_INACTIVITY_TIME;
@@ -1822,7 +1822,7 @@ static void wma_set_vdev_suspend_dtim(tp_wma_handle wma, uint8_t vdev_id)
 		} else {
 			/* Set Listen Interval */
 			if ((wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL,
-				&cfg_data_val) != eSIR_SUCCESS)) {
+				&cfg_data_val) != QDF_STATUS_SUCCESS)) {
 				QDF_TRACE(QDF_MODULE_ID_WMA,
 					  QDF_TRACE_LEVEL_ERROR,
 					"Failed to listen interval");
@@ -1914,7 +1914,7 @@ static void wma_configure_vdev_resume_params(tp_wma_handle wma, uint8_t vdev_id)
 	}
 
 	if (wlan_cfg_get_int(mac, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT,
-				&cfg_data_val) != eSIR_SUCCESS) {
+				&cfg_data_val) != QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			"Failed to get WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT");
 		cfg_data_val = POWERSAVE_DEFAULT_INACTIVITY_TIME;
@@ -1954,7 +1954,7 @@ static void wma_set_vdev_resume_dtim(tp_wma_handle wma, uint8_t vdev_id)
 		}
 		/* Set Listen Interval */
 		if ((wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL,
-				      &cfg_data_val) != eSIR_SUCCESS)) {
+				      &cfg_data_val) != QDF_STATUS_SUCCESS)) {
 			QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 				  "Failed to get value for listen interval");
 			cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL;

core/wma/src/wma_scan_roam.c

@@ -991,7 +991,7 @@ void wma_roam_scan_fill_scan_params(tp_wma_handle wma_handle,
 
 		if (wlan_cfg_get_int
 			    (pMac, WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME,
-			    &val) != eSIR_SUCCESS) {
+			    &val) != QDF_STATUS_SUCCESS) {
 			/*
 			 * Could not get max channel value from CFG. Log error.
 			 */
@@ -2631,7 +2631,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	}
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_PRIVACY_ENABLED, &val) !=
-							 eSIR_SUCCESS) {
+							 QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_PRIVACY_ENABLED");
 		return QDF_STATUS_E_FAILURE;
@@ -2641,7 +2641,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	if (val)
 		selfCaps.privacy = 1;
 	if (wlan_cfg_get_int(pMac, WNI_CFG_SHORT_PREAMBLE, &val) !=
-							 eSIR_SUCCESS) {
+							 QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_SHORT_PREAMBLE");
 		return QDF_STATUS_E_FAILURE;
@@ -2652,21 +2652,23 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	selfCaps.pbcc = 0;
 	selfCaps.channelAgility = 0;
 	if (wlan_cfg_get_int(pMac, WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED,
-			     &val) != eSIR_SUCCESS) {
+			     &val) != QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED");
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (val)
 		selfCaps.shortSlotTime = 1;
-	if (wlan_cfg_get_int(pMac, WNI_CFG_11H_ENABLED, &val) != eSIR_SUCCESS) {
+	if (wlan_cfg_get_int(pMac, WNI_CFG_11H_ENABLED, &val) !=
+							QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_11H_ENABLED");
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (val)
 		selfCaps.spectrumMgt = 1;
-	if (wlan_cfg_get_int(pMac, WNI_CFG_QOS_ENABLED, &val) != eSIR_SUCCESS) {
+	if (wlan_cfg_get_int(pMac, WNI_CFG_QOS_ENABLED, &val) !=
+							QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_QOS_ENABLED");
 		return QDF_STATUS_E_FAILURE;
@@ -2674,7 +2676,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	if (val)
 		selfCaps.qos = 1;
 	if (wlan_cfg_get_int(pMac, WNI_CFG_APSD_ENABLED, &val) !=
-								eSIR_SUCCESS) {
+							QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_APSD_ENABLED");
 		return QDF_STATUS_E_FAILURE;
@@ -2685,7 +2687,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	selfCaps.rrm = pMac->rrm.rrmSmeContext.rrmConfig.rrm_enabled;
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_BLOCK_ACK_ENABLED, &val) !=
-	    eSIR_SUCCESS) {
+	    QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_BLOCK_ACK_ENABLED");
 		return QDF_STATUS_E_FAILURE;
@@ -2710,7 +2712,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	roam_offload_params->capability |= ((*pCfgValue16) & 0xFFFF);
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_HT_CAP_INFO, &nCfgValue) !=
-	    eSIR_SUCCESS) {
+	    QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_HT_CAP_INFO");
 		return QDF_STATUS_E_FAILURE;
@@ -2719,7 +2721,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	roam_offload_params->ht_caps_info =
 		uHTCapabilityInfo.nCfgValue16 & 0xFFFF;
 	if (wlan_cfg_get_int(pMac, WNI_CFG_HT_AMPDU_PARAMS, &nCfgValue) !=
-	    eSIR_SUCCESS) {
+	    QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_HT_AMPDU_PARAMS");
 		return QDF_STATUS_E_FAILURE;
@@ -2731,13 +2733,13 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	val = ROAM_OFFLOAD_NUM_MCS_SET;
 	if (wlan_cfg_get_str(pMac, WNI_CFG_SUPPORTED_MCS_SET,
 			     (uint8_t *) roam_offload_params->mcsset,
-			     &val) != eSIR_SUCCESS) {
+			     &val) != QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_SUPPORTED_MCS_SET");
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (wlan_cfg_get_int(pMac, WNI_CFG_EXT_HT_CAP_INFO, &nCfgValue) !=
-	    eSIR_SUCCESS) {
+	    QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_EXT_HT_CAP_INFO");
 		return QDF_STATUS_E_FAILURE;
@@ -2748,7 +2750,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 		uHTCapabilityInfo.nCfgValue16 & 0xFFFF;
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_TX_BF_CAP, &nCfgValue) !=
-								eSIR_SUCCESS) {
+							QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_TX_BF_CAP");
 		return QDF_STATUS_E_FAILURE;
@@ -2757,7 +2759,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	nCfgValue8 = (uint8_t) nCfgValue;
 	roam_offload_params->ht_txbf = nCfgValue8 & 0xFF;
 	if (wlan_cfg_get_int(pMac, WNI_CFG_AS_CAP, &nCfgValue) !=
-								eSIR_SUCCESS) {
+							QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_AS_CAP");
 		return QDF_STATUS_E_FAILURE;
@@ -2768,7 +2770,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 
 	/* QOS Info */
 	if (wlan_cfg_get_int(pMac, WNI_CFG_MAX_SP_LENGTH, &nCfgValue) !=
-	    eSIR_SUCCESS) {
+	    QDF_STATUS_SUCCESS) {
 		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_MAX_SP_LENGTH");
 		return QDF_STATUS_E_FAILURE;