浏览代码

qcacld-3.0: Rename ETSI13's api to ETSI

As ETSI18 and ETSI20 also added to check SRD channels.
Rename the api of ETSI13 with ETSI.

Change-Id: Ib04e809ba53a55101a6254e0c1ef9f9b37b93fb8
CRs-Fixed: 3616398
Jyoti Kumari 1 年之前
父节点
当前提交
f8a4637aa8

+ 2 - 2
components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c

@@ -2978,8 +2978,8 @@ policy_mgr_valid_sap_conc_channel_check(struct wlan_objmgr_psoc *psoc,
 		policymgr_nofl_debug("sap not capable on 6GHZ con ch_freq %d",
 				     ch_freq);
 		find_alternate = true;
-	} else if (wlan_reg_is_etsi13_srd_chan_for_freq(pm_ctx->pdev,
-							ch_freq) &&
+	} else if (wlan_reg_is_etsi_srd_chan_for_freq(pm_ctx->pdev,
+						      ch_freq) &&
 		   !policy_mgr_get_srd_enable_for_vdev(psoc, sap_vdev_id)) {
 		find_alternate = true;
 		policymgr_nofl_debug("sap not capable on SRD con ch_freq %d",

+ 1 - 1
components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c

@@ -969,7 +969,7 @@ policy_mgr_modify_pcl_based_on_srd(struct wlan_objmgr_psoc *psoc,
 		return QDF_STATUS_E_FAILURE;
 	}
 	for (i = 0; i < *pcl_len_org; i++) {
-		if (wlan_reg_is_etsi13_srd_chan_for_freq(
+		if (wlan_reg_is_etsi_srd_chan_for_freq(
 		    pm_ctx->pdev, pcl_list_org[i]))
 			continue;
 		pcl_list[pcl_len] = pcl_list_org[i];

+ 1 - 1
components/nan/core/src/nan_api.c

@@ -453,7 +453,7 @@ bool wlan_is_nan_allowed_on_freq(struct wlan_objmgr_pdev *pdev, uint32_t freq)
 	}
 
 	/* Check for SRD channels */
-	if (wlan_reg_is_etsi13_srd_chan_for_freq(pdev, freq))
+	if (wlan_reg_is_etsi_srd_chan_for_freq(pdev, freq))
 		wlan_mlme_get_srd_master_mode_for_vdev(wlan_pdev_get_psoc(pdev),
 						       QDF_NAN_DISC_MODE,
 						       &nan_allowed);

+ 1 - 1
core/hdd/src/wlan_hdd_hostapd.c

@@ -7935,7 +7935,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 					       &srd_channel_allowed);
 
 	if (!srd_channel_allowed &&
-	    wlan_reg_is_etsi13_srd_chan_for_freq(hdd_ctx->pdev, freq)) {
+	    wlan_reg_is_etsi_srd_chan_for_freq(hdd_ctx->pdev, freq)) {
 		hdd_err("vdev opmode %d not allowed on SRD channel.",
 			vdev_opmode);
 		return -EINVAL;

+ 2 - 1
core/sap/src/sap_fsm.c

@@ -4505,7 +4505,8 @@ static QDF_STATUS sap_get_freq_list(struct sap_context *sap_ctx,
 						       &srd_chan_enabled);
 
 		if (!srd_chan_enabled &&
-		    wlan_reg_is_etsi13_srd_chan_for_freq(mac_ctx->pdev,
+		    wlan_reg_is_etsi_srd_chan_for_freq(
+					mac_ctx->pdev,
 					WLAN_REG_CH_TO_FREQ(loop_count))) {
 			sap_debug("vdev opmode %d not allowed on SRD freq %d",
 				  vdev_opmode, WLAN_REG_CH_TO_FREQ(loop_count));