qcacld-3.0: Refactor five WNI cfg and one INI cfg

Based on new cfg framework, refactors below five WNI cfg items and one
INI cfg:
 - WNI_CFG_APSD_ENABLED
 - WNI_CFG_OBSS_DETECTION_OFFLOAD
 - WNI_CFG_OBSS_COLOR_COLLISION_OFFLOAD
 - WNI_CFG_CURRENT_TX_POWER_LEVEL
 - WNI_CFG_LOCAL_POWER_CONSTRAINT
 - gTxPowerCap

Change-Id: I5307fe73ad931eaec2e9471ddd36cd6d00061c76
CRs-Fixed: 2375860

core/hdd/src/wlan_hdd_main.c

@@ -2046,14 +2046,13 @@ void hdd_update_tgt_cfg(hdd_handle_t hdd_handle, struct wma_tgt_cfg *cfg)
 	hdd_ctx->dfs_cac_offload = cfg->dfs_cac_offload;
 	hdd_ctx->lte_coex_ant_share = cfg->services.lte_coex_ant_share;
 	hdd_ctx->obss_scan_offload = cfg->services.obss_scan_offload;
-	status = sme_cfg_set_int(mac_handle, WNI_CFG_OBSS_DETECTION_OFFLOAD,
-				 cfg->obss_detection_offloaded);
+	status = ucfg_mlme_set_obss_detection_offload_enabled(
+			hdd_ctx->psoc, cfg->obss_detection_offloaded);
 	if (QDF_IS_STATUS_ERROR(status))
 		hdd_err("Couldn't pass WNI_CFG_OBSS_DETECTION_OFFLOAD to CFG");
 
-	status = sme_cfg_set_int(mac_handle,
-				 WNI_CFG_OBSS_COLOR_COLLISION_OFFLOAD,
-				 cfg->obss_color_collision_offloaded);
+	status = ucfg_mlme_set_obss_color_collision_offload_enabled(
+			hdd_ctx->psoc, cfg->obss_color_collision_offloaded);
 	if (QDF_IS_STATUS_ERROR(status))
 		hdd_err("Failed to set WNI_CFG_OBSS_COLOR_COLLISION_OFFLOAD");
 }

core/hdd/src/wlan_hdd_power.c

@@ -2048,8 +2048,7 @@ static int __wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy,
 	if (!dbm)
 		dbm = mbm;
 
-	status = sme_cfg_set_int(mac_handle, WNI_CFG_CURRENT_TX_POWER_LEVEL,
-				 dbm);
+	status = ucfg_mlme_set_current_tx_power_level(hdd_ctx->psoc, dbm);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		hdd_err("sme_cfg_set_int failed for tx power %hu, %d",
 			dbm, status);

core/hdd/src/wlan_hdd_wext.c

@@ -5941,34 +5941,26 @@ static int __iw_setnone_getint(struct net_device *dev,
 
 	case WE_GET_TXPOW_2G:
 	{
-		uint32_t txpow2g = 0;
+		uint8_t txpow2g = 0;
 
 		hdd_debug("GET WMI_PDEV_PARAM_TXPOWER_LIMIT2G");
 		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_PDEV_PARAM_TXPOWER_LIMIT2G,
 					     PDEV_CMD);
-		if (QDF_STATUS_SUCCESS !=
-		    sme_cfg_get_int(mac_handle, WNI_CFG_CURRENT_TX_POWER_LEVEL,
-				    &txpow2g)) {
-			return -EIO;
-		}
+		ucfg_mlme_get_current_tx_power_level(hdd_ctx->psoc, &txpow2g);
 		hdd_debug("2G tx_power %d", txpow2g);
 		break;
 	}
 
 	case WE_GET_TXPOW_5G:
 	{
-		uint32_t txpow5g = 0;
+		uint8_t txpow5g = 0;
 
 		hdd_debug("GET WMI_PDEV_PARAM_TXPOWER_LIMIT5G");
 		*value = wma_cli_get_command(adapter->session_id,
 					     WMI_PDEV_PARAM_TXPOWER_LIMIT5G,
 					     PDEV_CMD);
-		if (QDF_STATUS_SUCCESS !=
-		    sme_cfg_get_int(mac_handle, WNI_CFG_CURRENT_TX_POWER_LEVEL,
-				    &txpow5g)) {
-			return -EIO;
-		}
+		ucfg_mlme_get_current_tx_power_level(hdd_ctx->psoc, &txpow5g);
 		hdd_debug("5G tx_power %d", txpow5g);
 		break;
 	}

core/mac/src/cfg/cfg_api.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -718,12 +718,7 @@ QDF_STATUS cfg_get_capability_info(struct mac_context *mac, uint16_t *pCap,
 		pCapInfo->qos = 1;
 
 	/* APSD bit */
-	if (wlan_cfg_get_int(mac, WNI_CFG_APSD_ENABLED, &val) !=
-							QDF_STATUS_SUCCESS) {
-		pe_err("cfg get WNI_CFG_APSD_ENABLED failed");
-		return QDF_STATUS_E_FAILURE;
-	}
-	if (val)
+	if (mac->mlme_cfg->scoring.apsd_enabled)
 		pCapInfo->apsd = 1;
 
 	pCapInfo->rrm = mac->rrm.rrmSmeContext.rrmConfig.rrm_enabled;

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

@@ -320,22 +320,6 @@ static QDF_STATUS __lim_init_config(struct mac_context *mac)
 	mac->lim.gLimTDLSWmmMode = (uint8_t)valb;
 #endif
 
-	if (QDF_STATUS_SUCCESS != wlan_cfg_get_int(mac,
-					     WNI_CFG_OBSS_DETECTION_OFFLOAD,
-					     (uint32_t *)&mac->lim.
-					     global_obss_offload_enabled)) {
-		pe_err("cfg get obss_detection_offloaded failed");
-		return QDF_STATUS_E_FAILURE;
-	}
-
-	if (QDF_STATUS_SUCCESS !=
-	    wlan_cfg_get_int(mac, WNI_CFG_OBSS_COLOR_COLLISION_OFFLOAD,
-			     (uint32_t *) &mac->lim.
-			     global_obss_color_collision_det_offload)) {
-		pe_err("cfg get obss_color_collision_offload failed");
-		return QDF_STATUS_E_FAILURE;
-	}
-
 	return QDF_STATUS_SUCCESS;
 }
 

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

@@ -4687,19 +4687,14 @@ QDF_STATUS lim_is_dot11h_power_capabilities_in_range(struct mac_context *mac,
 							struct pe_session *pe_session)
 {
 	int8_t localMaxTxPower;
-	uint32_t localPwrConstraint;
+	uint8_t local_pwr_constraint;
 
 	localMaxTxPower =
 		cfg_get_regulatory_max_transmit_power(mac,
 						      pe_session->currentOperChannel);
 
-	if (wlan_cfg_get_int
-		    (mac, WNI_CFG_LOCAL_POWER_CONSTRAINT,
-		    &localPwrConstraint) != QDF_STATUS_SUCCESS) {
-		pe_err("Unable to get Local Power Constraint from cfg");
-		return QDF_STATUS_E_FAILURE;
-	}
-	localMaxTxPower -= (int8_t) localPwrConstraint;
+	local_pwr_constraint = mac->mlme_cfg->power.local_power_constraint;
+	localMaxTxPower -= (int8_t)local_pwr_constraint;
 
 	/**
 	 *  The min Tx Power of the associating station should not be greater than (regulatory

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

@@ -686,14 +686,14 @@ void lim_fill_ft_session(struct mac_context *mac,
 #ifdef FEATURE_WLAN_ESE
 	ft_session->maxTxPower =
 		lim_get_max_tx_power(regMax, localPowerConstraint,
-				     mac->roam.configParam.nTxPowerCap);
+				     mac->mlme_cfg->power.max_tx_power);
 #else
 	ft_session->maxTxPower = QDF_MIN(regMax, (localPowerConstraint));
 #endif
 
 	pe_debug("Reg max: %d local pwr: %d, ini tx pwr: %d max tx pwr: %d",
 		regMax, localPowerConstraint,
-		mac->roam.configParam.nTxPowerCap,
+		mac->mlme_cfg->power.max_tx_power,
 		ft_session->maxTxPower);
 	if (!lim_is_roam_synch_in_progress(pe_session)) {
 		ft_session->limPrevSmeState = ft_session->limSmeState;

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

@@ -1010,16 +1010,8 @@ __lim_handle_sme_start_bss_request(struct mac_context *mac_ctx, uint32_t *msg_bu
 			}
 		}
 
-		if (!session->lim11hEnable) {
-			if (cfg_set_int(mac_ctx,
-				WNI_CFG_LOCAL_POWER_CONSTRAINT, 0) !=
-				QDF_STATUS_SUCCESS)
-				/*
-				 * Failed to set the CFG param
-				 * WNI_CFG_LOCAL_POWER_CONSTRAINT
-				 */
-				pe_err("Set LOCAL_POWER_CONSTRAINT failed");
-		}
+		if (!session->lim11hEnable)
+			mac_ctx->mlme_cfg->power.local_power_constraint = 0;
 
 		mlm_start_req->beacon_tx_rate = session->beacon_tx_rate;
 
@@ -1646,7 +1638,7 @@ __lim_process_sme_join_req(struct mac_context *mac_ctx, uint32_t *msg_buf)
 
 		session->maxTxPower = lim_get_max_tx_power(reg_max,
 					local_power_constraint,
-					mac_ctx->roam.configParam.nTxPowerCap);
+					mac_ctx->mlme_cfg->power.max_tx_power);
 		session->def_max_tx_pwr = session->maxTxPower;
 
 		pe_debug("Reg max %d local power con %d max tx pwr %d",
@@ -6385,7 +6377,8 @@ void lim_send_obss_color_collision_cfg(struct mac_context *mac_ctx,
 		pe_debug("%d: obss color det not enabled, he_cap:%d, sup:%d:%d",
 			 session->smeSessionId, session->he_capable,
 			 session->is_session_obss_color_collision_det_enabled,
-			 mac_ctx->lim.global_obss_color_collision_det_offload);
+			 mac_ctx->mlme_cfg->obss_ht40.
+			 obss_color_collision_offload_enabled);
 		return;
 	}
 
@@ -6452,7 +6445,8 @@ void lim_process_obss_color_collision_info(struct mac_context *mac_ctx,
 		 obss_color_info->obss_color_bitmap_bit32to63,
 		 session->he_capable,
 		 session->is_session_obss_color_collision_det_enabled,
-		 mac_ctx->lim.global_obss_color_collision_det_offload);
+		 mac_ctx->mlme_cfg->obss_ht40.
+		 obss_color_collision_offload_enabled);
 
 	if (!session->he_capable ||
 	    !session->is_session_obss_color_collision_det_enabled) {
@@ -6464,7 +6458,8 @@ void lim_process_obss_color_collision_info(struct mac_context *mac_ctx,
 		pe_err("%d: FW disabled obss color det. he_cap:%d, sup:%d:%d",
 		       session->smeSessionId, session->he_capable,
 		       session->is_session_obss_color_collision_det_enabled,
-		       mac_ctx->lim.global_obss_color_collision_det_offload);
+		       mac_ctx->mlme_cfg->obss_ht40.
+		       obss_color_collision_offload_enabled);
 		session->is_session_obss_color_collision_det_enabled = false;
 		return;
 	case OBSS_COLOR_FREE_SLOT_AVAILABLE:

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -636,7 +636,7 @@ struct pe_session *pe_create_session(struct mac_context *mac,
 	session_ptr->fIgnoreCapsChange = 0;
 	session_ptr->ignore_assoc_disallowed = mac->ignore_assoc_disallowed;
 	session_ptr->is_session_obss_color_collision_det_enabled =
-		mac->lim.global_obss_color_collision_det_offload;
+		mac->mlme_cfg->obss_ht40.obss_color_collision_offload_enabled;
 
 	pe_debug("Create a new PE session: %d BSSID: "MAC_ADDRESS_STR" Max No of STA: %d",
 		*sessionId, MAC_ADDR_ARRAY(bssid), numSta);

core/mac/src/pe/rrm/rrm_api.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -237,10 +237,10 @@ rrm_process_link_measurement_request(struct mac_context *mac,
 	}
 	pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo);
 
-	LinkReport.txPower = lim_get_max_tx_power(pe_session->def_max_tx_pwr,
-						pLinkReq->MaxTxPower.maxTxPower,
-						  mac->roam.configParam.
-						  nTxPowerCap);
+	LinkReport.txPower = lim_get_max_tx_power(
+					pe_session->def_max_tx_pwr,
+					pLinkReq->MaxTxPower.maxTxPower,
+					mac->mlme_cfg->power.max_tx_power);
 
 	if ((LinkReport.txPower != (uint8_t) (pe_session->maxTxPower)) &&
 	    (QDF_STATUS_SUCCESS == rrm_send_set_max_tx_power_req(mac,

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -894,7 +894,7 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx,
 	}
 
 	maxTxPower = lim_get_max_tx_power(regMax, local_constraint,
-					mac_ctx->roam.configParam.nTxPowerCap);
+					mac_ctx->mlme_cfg->power.max_tx_power);
 
 	pe_debug("RegMax = %d, MaxTx pwr = %d",
 			regMax, maxTxPower);
@@ -1241,7 +1241,7 @@ void lim_enable_obss_detection_config(struct mac_context *mac_ctx,
 		return;
 	}
 
-	if (mac_ctx->lim.global_obss_offload_enabled) {
+	if (mac_ctx->mlme_cfg->obss_ht40.obss_detection_offload_enabled) {
 		status = lim_obss_send_detection_cfg(mac_ctx, session, true);
 		if (QDF_IS_STATUS_ERROR(status)) {
 			pe_err("vdev %d: offload enable failed, trying legacy",
@@ -1255,7 +1255,7 @@ void lim_enable_obss_detection_config(struct mac_context *mac_ctx,
 		}
 	}
 
-	if (!mac_ctx->lim.global_obss_offload_enabled ||
+	if (!mac_ctx->mlme_cfg->obss_ht40.obss_detection_offload_enabled ||
 	    QDF_IS_STATUS_ERROR(status)) {
 		status = qdf_mc_timer_start(&session->
 					    protection_fields_reset_timer,

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

@@ -1266,12 +1266,9 @@ QDF_STATUS
 populate_dot11f_power_constraints(struct mac_context *mac,
 				  tDot11fIEPowerConstraints *pDot11f)
 {
-	uint32_t cfg;
-	QDF_STATUS nSirStatus;
-
-	CFG_GET_INT(nSirStatus, mac, WNI_CFG_LOCAL_POWER_CONSTRAINT, cfg);
+	pDot11f->localPowerConstraints =
+			mac->mlme_cfg->power.local_power_constraint;
 
-	pDot11f->localPowerConstraints = (uint8_t) cfg;
 	pDot11f->present = 1;
 
 	return QDF_STATUS_SUCCESS;
@@ -5590,8 +5587,7 @@ populate_dot11f_timing_advert_frame(struct mac_context *mac_ctx,
 	if (mac_ctx->mlme_cfg->wmm_params.qos_enabled)
 		frame->Capabilities.qos = 1;
 
-	wlan_cfg_get_int(mac_ctx, WNI_CFG_APSD_ENABLED, &val);
-	if (val)
+	if (mac_ctx->mlme_cfg->scoring.apsd_enabled)
 		frame->Capabilities.apsd = 1;
 
 	val = mac_ctx->mlme_cfg->feature_flags.enable_block_ack;
@@ -5613,8 +5609,9 @@ populate_dot11f_timing_advert_frame(struct mac_context *mac_ctx,
 	frame->Country.present = 1;
 
 	/* PowerConstraints */
-	wlan_cfg_get_int(mac_ctx, WNI_CFG_LOCAL_POWER_CONSTRAINT, &val);
-	frame->PowerConstraints.localPowerConstraints = (uint8_t)val;
+	frame->PowerConstraints.localPowerConstraints =
+		mac_ctx->mlme_cfg->power.local_power_constraint;
+
 	frame->PowerConstraints.present = 1;
 
 	/* TimeAdvertisement */

core/sme/src/csr/csr_api_roam.c

@@ -1663,7 +1663,6 @@ static void init_config_param(struct mac_context *mac)
 		mac->roam.configParam.BssPreferValue[i] = i;
 	csr_assign_rssi_for_category(mac, CSR_BEST_RSSI_VALUE,
 			CSR_DEFAULT_RSSI_DB_GAP);
-	mac->roam.configParam.nTxPowerCap = CSR_MAX_TX_POWER;
 	mac->roam.configParam.statsReqPeriodicity =
 		CSR_MIN_GLOBAL_STAT_QUERY_PERIOD;
 	mac->roam.configParam.statsReqPeriodicityInPS =
@@ -2518,7 +2517,6 @@ QDF_STATUS csr_change_default_config_param(struct mac_context *mac,
 		mac->roam.configParam.statsReqPeriodicityInPS =
 			pParam->statsReqPeriodicityInPS;
 		/* Assign this before calling csr_init11d_info */
-		mac->roam.configParam.nTxPowerCap = pParam->nTxPowerCap;
 		if (wlan_reg_11d_enabled_on_host(mac->psoc))
 			status = csr_init11d_info(mac, &pParam->Csr11dinfo);
 		else
@@ -2693,7 +2691,6 @@ QDF_STATUS csr_get_config_param(struct mac_context *mac, tCsrConfigParam *pParam
 	pParam->AdHocChannel24 = cfg_params->AdHocChannel24;
 	pParam->AdHocChannel5G = cfg_params->AdHocChannel5G;
 	pParam->bCatRssiOffset = cfg_params->bCatRssiOffset;
-	pParam->nTxPowerCap = cfg_params->nTxPowerCap;
 	pParam->statsReqPeriodicity = cfg_params->statsReqPeriodicity;
 	pParam->statsReqPeriodicityInPS = cfg_params->statsReqPeriodicityInPS;
 	pParam->fEnableDFSChnlScan = mac->scan.fEnableDFSChnlScan;
@@ -2939,7 +2936,7 @@ static QDF_STATUS csr_init11d_info(struct mac_context *mac, tCsr11dinfo *ps11din
 				ps11dinfo->ChnPower[index].numChannels;
 			pChanInfo->maxTxPower =
 				QDF_MIN(ps11dinfo->ChnPower[index].maxtxPower,
-					mac->roam.configParam.nTxPowerCap);
+					mac->mlme_cfg->power.max_tx_power);
 			pChanInfo++;
 			count++;
 		}
@@ -3002,7 +2999,7 @@ QDF_STATUS csr_init_channel_power_list(struct mac_context *mac,
 				ps11dinfo->ChnPower[index].numChannels;
 			pChanInfo->maxTxPower =
 				QDF_MIN(ps11dinfo->ChnPower[index].maxtxPower,
-					mac->roam.configParam.nTxPowerCap);
+					mac->mlme_cfg->power.max_tx_power);
 			pChanInfo++;
 			count++;
 		}
@@ -4712,8 +4709,7 @@ QDF_STATUS csr_roam_set_bss_config_cfg(struct mac_context *mac, uint32_t session
 	else
 		mac->mlme_cfg->gen.enabled_11d = pProfile->ieee80211d;
 
-	cfg_set_int(mac, WNI_CFG_LOCAL_POWER_CONSTRAINT,
-			pBssConfig->uPowerLimit);
+	mac->mlme_cfg->power.local_power_constraint = pBssConfig->uPowerLimit;
 	/* CB */
 
 	if (CSR_IS_INFRA_AP(pProfile) || CSR_IS_IBSS(pProfile))

core/sme/src/csr/csr_api_scan.c

@@ -571,7 +571,7 @@ QDF_STATUS csr_save_to_channel_power2_g_5_g(struct mac_context *mac,
 			return QDF_STATUS_E_FAILURE;
 		}
 		pChannelSet->txPower = QDF_MIN(pChannelInfo->maxTxPower,
-					mac->roam.configParam.nTxPowerCap);
+					mac->mlme_cfg->power.max_tx_power);
 		if (f2GHzInfoFound) {
 			if (!f2GListPurged) {
 				/* purge previous results if found new */
@@ -679,7 +679,7 @@ static void csr_diag_reset_country_information(struct mac_context *mac)
 		     Index++) {
 			p11dLog->TxPwr[Index] = QDF_MIN(
 				mac->scan.defaultPowerTable[Index].tx_power,
-				mac->roam.configParam.nTxPowerCap);
+				mac->mlme_cfg->power.max_tx_power);
 		}
 	}
 	if (!mac->mlme_cfg->gen.enabled_11d)
@@ -870,7 +870,7 @@ void csr_save_channel_power_for_band(struct mac_context *mac, bool fill_5f)
 		chan_info->numChannels = 1;
 		chan_info->maxTxPower =
 			QDF_MIN(mac->scan.defaultPowerTable[idx].tx_power,
-				mac->roam.configParam.nTxPowerCap);
+				mac->mlme_cfg->power.max_tx_power);
 		chan_info++;
 		count++;
 	}
@@ -1579,7 +1579,7 @@ static void csr_save_tx_power_to_cfg(struct mac_context *pMac,
 				ch_pwr_set->numChannels = 1;
 				ch_pwr_set->maxTxPower =
 					QDF_MIN(ch_set->txPower,
-					pMac->roam.configParam.nTxPowerCap);
+					pMac->mlme_cfg->power.max_tx_power);
 				sme_debug(
 					"Setting Max Transmit Power %d",
 					ch_pwr_set->maxTxPower);
@@ -1601,11 +1601,11 @@ static void csr_save_tx_power_to_cfg(struct mac_context *pMac,
 				ch_pwr_set->firstChanNum);
 			ch_pwr_set->numChannels = ch_set->numChannels;
 			ch_pwr_set->maxTxPower = QDF_MIN(ch_set->txPower,
-					pMac->roam.configParam.nTxPowerCap);
+					pMac->mlme_cfg->power.max_tx_power);
 			sme_debug(
 				"Setting Max Tx Power %d, nTxPower %d",
 				ch_pwr_set->maxTxPower,
-				pMac->roam.configParam.nTxPowerCap);
+				pMac->mlme_cfg->power.max_tx_power);
 			cbLen += sizeof(tSirMacChanInfo);
 			ch_pwr_set++;
 		}

core/wma/src/wma_main.c

@@ -1521,32 +1521,22 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma,
 			if ((mac->mlme_cfg->gen.band_capability ==
 			     BAND_ALL) ||
 			    (mac->mlme_cfg->gen.band_capability ==
-			     BAND_2G)) {
-				if (cfg_set_int(mac,
-						WNI_CFG_CURRENT_TX_POWER_LEVEL,
-						privcmd->param_value) !=
-				    QDF_STATUS_SUCCESS)
-					WMA_LOGE("could not set WNI_CFG_CURRENT_TX_POWER_LEVEL");
-
-			} else {
+			     BAND_2G))
+				mac->mlme_cfg->power.current_tx_power_level =
+					(uint8_t)privcmd->param_value;
+			else
 				WMA_LOGE("Current band is not 2G");
-			}
 			break;
 		case WMI_PDEV_PARAM_TXPOWER_LIMIT5G:
 			wma->pdevconfig.txpow5g = privcmd->param_value;
 			if ((mac->mlme_cfg->gen.band_capability ==
 			     BAND_ALL) ||
 			    (mac->mlme_cfg->gen.band_capability ==
-			     BAND_5G)) {
-				if (cfg_set_int(mac,
-						WNI_CFG_CURRENT_TX_POWER_LEVEL,
-						privcmd->param_value) !=
-				    QDF_STATUS_SUCCESS)
-					WMA_LOGE("could not set WNI_CFG_CURRENT_TX_POWER_LEVEL");
-
-			} else {
+			     BAND_5G))
+				mac->mlme_cfg->power.current_tx_power_level =
+					(uint8_t)privcmd->param_value;
+			else
 				WMA_LOGE("Current band is not 5G");
-			}
 			break;
 		default:
 			WMA_LOGD("Invalid wma_cli_set pdev command/Not yet implemented 0x%x",

core/wma/src/wma_scan_roam.c

@@ -2837,13 +2837,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	if (mac->mlme_cfg->wmm_params.qos_enabled)
 		selfCaps.qos = 1;
 
-	if (wlan_cfg_get_int(mac, WNI_CFG_APSD_ENABLED, &val) !=
-							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;
-	}
-	if (val)
+	if (mac->mlme_cfg->scoring.apsd_enabled)
 		selfCaps.apsd = 1;
 
 	selfCaps.rrm = mac->rrm.rrmSmeContext.rrmConfig.rrm_enabled;