Parcourir la source

qcacld-3.0: Replace wlan_reg_is_passive_or_disable_for_freq

As part upgrading legacy APIs with 6 GHz power APIs
Replace all occurrences of
wlan_reg_is_passive_or_disable_for_freq API with new API
wlan_reg_is_passive_or_disable_for_pwrmode.

Change-Id: If8429146e3e4e4cb25505de9855671dca2eb6474
CRs-Fixed: 3306631
Divyajyothi Goparaju il y a 2 ans
Parent
commit
4ed23d7914

+ 6 - 4
components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -2475,8 +2475,8 @@ static bool policy_mgr_valid_sta_channel_check(struct wlan_objmgr_psoc *psoc,
 
 	if ((wlan_reg_is_dfs_for_freq(pm_ctx->pdev, sta_ch_freq) &&
 	     !sta_sap_scc_on_dfs_chan) ||
-	    wlan_reg_is_passive_or_disable_for_freq(
-	    pm_ctx->pdev, sta_ch_freq) ||
+	    wlan_reg_is_passive_or_disable_for_pwrmode(
+	    pm_ctx->pdev, sta_ch_freq, REG_CURRENT_PWR_MODE) ||
 	    (wlan_reg_is_freq_indoor(pm_ctx->pdev, sta_ch_freq) &&
 	    !sta_sap_scc_on_indoor_channel) ||
 	    !policy_mgr_is_safe_channel(psoc, sta_ch_freq)) {
@@ -2606,8 +2606,10 @@ policy_mgr_valid_sap_conc_channel_check(struct wlan_objmgr_psoc *psoc,
 		policymgr_nofl_debug("sap not capable on disabled con ch_freq %d",
 				     ch_freq);
 	} else if (con_mode == PM_P2P_GO_MODE &&
-		   wlan_reg_is_passive_or_disable_for_freq(pm_ctx->pdev,
-							   ch_freq) &&
+		   wlan_reg_is_passive_or_disable_for_pwrmode(
+						pm_ctx->pdev,
+						ch_freq,
+						REG_CURRENT_PWR_MODE) &&
 		   !(policy_mgr_is_go_scc_strict(psoc) &&
 		     (!is_sta_sap_scc || sta_sap_scc_on_dfs_chan))) {
 		find_alternate = true;

+ 3 - 2
components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c

@@ -602,8 +602,9 @@ static QDF_STATUS policy_mgr_modify_pcl_based_on_enabled_channels(
 	uint32_t i, pcl_len = 0;
 
 	for (i = 0; i < *pcl_len_org; i++) {
-		if (!wlan_reg_is_passive_or_disable_for_freq(
-			pm_ctx->pdev, pcl_list_org[i])) {
+		if (!wlan_reg_is_passive_or_disable_for_pwrmode(
+			pm_ctx->pdev, pcl_list_org[i],
+			REG_CURRENT_PWR_MODE)) {
 			pcl_list_org[pcl_len] = pcl_list_org[i];
 			weight_list_org[pcl_len++] = weight_list_org[i];
 		}

+ 2 - 2
core/hdd/src/wlan_hdd_main.c

@@ -2666,8 +2666,8 @@ bool hdd_dfs_indicate_radar(struct hdd_context *hdd_ctx)
 
 		if ((QDF_SAP_MODE == adapter->device_mode ||
 		    QDF_P2P_GO_MODE == adapter->device_mode) &&
-		    (wlan_reg_is_passive_or_disable_for_freq(hdd_ctx->pdev,
-		     ap_ctx->operating_chan_freq))) {
+		    (wlan_reg_is_passive_or_disable_for_pwrmode(hdd_ctx->pdev,
+		     ap_ctx->operating_chan_freq, REG_CURRENT_PWR_MODE))) {
 			WLAN_HDD_GET_AP_CTX_PTR(adapter)->dfs_cac_block_tx =
 				true;
 			hdd_info("tx blocked for vdev: %d",

+ 3 - 2
core/sap/src/sap_api_link_cntl.c

@@ -1183,9 +1183,10 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 			    NULL) {
 				sap_context =
 				    mac_ctx->sap.sapCtxList[intf].sap_context;
-				if (!wlan_reg_is_passive_or_disable_for_freq(
+				if (!wlan_reg_is_passive_or_disable_for_pwrmode(
 						mac_ctx->pdev,
-						sap_context->chan_freq))
+						sap_context->chan_freq,
+						REG_CURRENT_PWR_MODE))
 					continue;
 				sap_debug("Vdev %d no channel available , stop bss",
 					  sap_context->sessionId);