qcacld-3.0: Replace channel number by channel frequency

To support 6Ghz channel, update channel number of struct
sap_StartBssCompleteEvent_s, hdd_ap_ctx and sap_ch_selected_s.

Change-Id: I19e6d7d03072135abed25e077e8573b5326ddba8
CRs-Fixed: 2519308

core/hdd/inc/wlan_hdd_main.h

@@ -896,7 +896,7 @@ struct hdd_fw_txrx_stats {
  * @wep_def_key_idx: WEP default key index
  * @sap_context: Pointer to context maintained by SAP (opaque to HDD)
  * @sap_config: SAP configuration
- * @operating_channel: channel upon which the SAP is operating
+ * @operating_chan_freq: channel upon which the SAP is operating
  * @beacon: Beacon information
  * @vendor_acs_timer: Timer for ACS
  * @vendor_acs_timer_initialized: Is @vendor_acs_timer initialized?
@@ -916,7 +916,7 @@ struct hdd_ap_ctx {
 	uint8_t wep_def_key_idx;
 	struct sap_context *sap_context;
 	struct sap_config sap_config;
-	uint8_t operating_channel;
+	uint32_t operating_chan_freq;
 	struct hdd_beacon_data *beacon;
 	qdf_mc_timer_t vendor_acs_timer;
 	bool vendor_acs_timer_initialized;

core/hdd/src/wlan_hdd_cfg80211.c

@@ -1708,8 +1708,10 @@ int wlan_hdd_sap_cfg_dfs_override(struct hdd_adapter *adapter)
 
 	sap_config = &adapter->session.ap.sap_config;
 	con_sap_config = &con_sap_adapter->session.ap.sap_config;
-	con_ch = con_sap_adapter->session.ap.operating_channel;
-	con_ch_freq = wlan_reg_chan_to_freq(hdd_ctx->pdev, con_ch);
+	con_ch_freq = con_sap_adapter->session.ap.operating_chan_freq;
+	con_ch = wlan_reg_freq_to_chan(
+			hdd_ctx->pdev,
+			con_sap_adapter->session.ap.operating_chan_freq);
 
 	if (!wlan_reg_is_dfs_ch(hdd_ctx->pdev, con_ch))
 		return 0;
@@ -5147,14 +5149,12 @@ static bool wlan_hdd_check_dfs_channel_for_adapter(struct hdd_context *hdd_ctx,
 	struct hdd_adapter *adapter;
 	struct hdd_ap_ctx *ap_ctx;
 	struct hdd_station_ctx *sta_ctx;
-	uint8_t conn_info_channel;
 
 	hdd_for_each_adapter(hdd_ctx, adapter) {
 		if ((device_mode == adapter->device_mode) &&
 		    (device_mode == QDF_SAP_MODE)) {
 			ap_ctx =
 				WLAN_HDD_GET_AP_CTX_PTR(adapter);
-
 			/*
 			 *  if there is SAP already running on DFS channel,
 			 *  do not disable scan on dfs channels. Note that
@@ -5162,9 +5162,10 @@ static bool wlan_hdd_check_dfs_channel_for_adapter(struct hdd_context *hdd_ctx,
 			 *  single radio. But then we can have multiple
 			 *  radios !!
 			 */
-			if (CHANNEL_STATE_DFS == wlan_reg_get_channel_state(
-						hdd_ctx->pdev,
-						ap_ctx->operating_channel)) {
+			if (CHANNEL_STATE_DFS ==
+			    wlan_reg_get_channel_state_for_freq(
+				hdd_ctx->pdev,
+				ap_ctx->operating_chan_freq)) {
 				hdd_err("SAP running on DFS channel");
 				return true;
 			}
@@ -5174,19 +5175,15 @@ static bool wlan_hdd_check_dfs_channel_for_adapter(struct hdd_context *hdd_ctx,
 		    (device_mode == QDF_STA_MODE)) {
 			sta_ctx =
 				WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-
-			conn_info_channel =
-				wlan_reg_freq_to_chan(
-					hdd_ctx->pdev,
-					sta_ctx->conn_info.chan_freq);
 			/*
 			 *  if STA is already connected on DFS channel,
 			 *  do not disable scan on dfs channels
 			 */
 			if (hdd_conn_is_connected(sta_ctx) &&
-				(CHANNEL_STATE_DFS ==
-				wlan_reg_get_channel_state(hdd_ctx->pdev,
-					conn_info_channel))) {
+			    (CHANNEL_STATE_DFS ==
+			     wlan_reg_get_channel_state_for_freq(
+				hdd_ctx->pdev,
+				sta_ctx->conn_info.chan_freq))) {
 				hdd_err("client connected on DFS channel");
 				return true;
 			}
@@ -9941,8 +9938,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 		}
 
 		nss = sta_info->nss;
-		freq = cds_chan_to_freq(
-			(WLAN_HDD_GET_AP_CTX_PTR(adapter))->operating_channel);
+		freq = (WLAN_HDD_GET_AP_CTX_PTR(adapter))->operating_chan_freq;
 		rate_flags = sta_info->rate_flags;
 	} else {
 		hdd_err("Not Associated! with mac "QDF_MAC_ADDR_STR,
@@ -10191,17 +10187,17 @@ static enum sta_roam_policy_dfs_mode wlan_hdd_get_sta_roam_dfs_mode(
 uint8_t hdd_get_sap_operating_band(struct hdd_context *hdd_ctx)
 {
 	struct hdd_adapter *adapter;
-	uint8_t  operating_channel = 0;
+	uint32_t  operating_chan_freq;
 	uint8_t sap_operating_band = 0;
 
 	hdd_for_each_adapter(hdd_ctx, adapter) {
 		if (adapter->device_mode != QDF_SAP_MODE)
 			continue;
 
-		operating_channel = adapter->session.ap.operating_channel;
-		if (IS_24G_CH(operating_channel))
+		operating_chan_freq = adapter->session.ap.operating_chan_freq;
+		if (WLAN_REG_IS_24GHZ_CH_FREQ(operating_chan_freq))
 			sap_operating_band = BAND_2G;
-		else if (IS_5G_CH(operating_channel))
+		else if (WLAN_REG_IS_5GHZ_CH_FREQ(operating_chan_freq))
 			sap_operating_band = BAND_5G;
 		else
 			sap_operating_band = BAND_ALL;
@@ -17633,8 +17629,8 @@ bool wlan_hdd_handle_sap_sta_dfs_conc(struct hdd_adapter *adapter,
 	}
 
 	/* sap is on non-dfs channel, nothing to handle */
-	if (!wlan_reg_is_dfs_ch(hdd_ctx->pdev,
-				hdd_ap_ctx->operating_channel)) {
+	if (!wlan_reg_is_dfs_for_freq(hdd_ctx->pdev,
+				      hdd_ap_ctx->operating_chan_freq)) {
 		hdd_info("sap is on non-dfs channel, sta is allowed");
 		return true;
 	}

core/hdd/src/wlan_hdd_hostapd.c

@@ -1797,7 +1797,8 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 	}
 
 	mac_handle = hdd_ctx->mac_handle;
-	dfs_info.channel = ap_ctx->operating_channel;
+	dfs_info.channel = wlan_reg_freq_to_chan(
+			hdd_ctx->pdev, ap_ctx->operating_chan_freq);
 	sme_get_country_code(mac_handle, dfs_info.country_code, &cc_len);
 	sta_id = sap_event->sapevt.sapStartBssCompleteEvent.staId;
 	sap_config = &adapter->session.ap.sap_config;
@@ -1808,18 +1809,18 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		       sap_event->sapevt.sapStartBssCompleteEvent.
 		       status ? "eSAP_STATUS_FAILURE" : "eSAP_STATUS_SUCCESS",
 		       sap_event->sapevt.sapStartBssCompleteEvent.
-		       operatingChannel,
+		       operating_chan_freq,
 		       sap_event->sapevt.sapStartBssCompleteEvent.staId);
-		ap_ctx->operating_channel =
+		ap_ctx->operating_chan_freq =
 			sap_event->sapevt.sapStartBssCompleteEvent
-			.operatingChannel;
+			.operating_chan_freq;
 
 		adapter->vdev_id =
 			sap_event->sapevt.sapStartBssCompleteEvent.sessionId;
 
-		sap_config->chan_freq = wlan_reg_chan_to_freq(hdd_ctx->pdev,
+		sap_config->chan_freq =
 			sap_event->sapevt.sapStartBssCompleteEvent.
-			operatingChannel);
+			operating_chan_freq;
 		sap_config->ch_params.ch_width =
 			sap_event->sapevt.sapStartBssCompleteEvent.ch_width;
 
@@ -1837,8 +1838,8 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 
 		/* DFS requirement: DO NOT transmit during CAC. */
 		if (CHANNEL_STATE_DFS !=
-			wlan_reg_get_channel_state(hdd_ctx->pdev,
-						   ap_ctx->operating_channel)
+		    wlan_reg_get_channel_state_for_freq(
+			hdd_ctx->pdev, ap_ctx->operating_chan_freq)
 			|| ignoreCAC
 			|| hdd_ctx->dev_dfs_cac_status == DFS_CAC_ALREADY_DONE)
 			ap_ctx->dfs_cac_block_tx = false;
@@ -1872,7 +1873,8 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 			cdp_hl_fc_set_td_limit(
 				cds_get_context(QDF_MODULE_ID_SOC),
 				adapter->vdev_id,
-				ap_ctx->operating_channel);
+				wlan_reg_freq_to_chan(hdd_ctx->pdev,
+				ap_ctx->operating_chan_freq));
 
 			hdd_register_tx_flow_control(adapter,
 				hdd_softap_tx_resume_timer_expired_handler,
@@ -1909,7 +1911,9 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		wlan_hdd_auto_shutdown_enable(hdd_ctx, true);
 #endif
 		hdd_hostapd_channel_prevent_suspend(adapter,
-						    ap_ctx->operating_channel);
+						    wlan_reg_freq_to_chan(
+						    hdd_ctx->pdev,
+						    ap_ctx->operating_chan_freq));
 
 		hostapd_state->bss_state = BSS_START;
 		hdd_start_tsf_sync(adapter);
@@ -1974,10 +1978,12 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		       status ? "eSAP_STATUS_FAILURE" : "eSAP_STATUS_SUCCESS");
 
 		hdd_hostapd_channel_allow_suspend(adapter,
-						  ap_ctx->operating_channel);
+						  wlan_reg_freq_to_chan(
+						  hdd_ctx->pdev,
+						  ap_ctx->operating_chan_freq));
 
 		/* Invalidate the channel info. */
-		ap_ctx->operating_channel = 0;
+		ap_ctx->operating_chan_freq = 0;
 
 		/* reset the dfs_cac_status and dfs_cac_block_tx flag only when
 		 * the last BSS is stopped
@@ -2493,10 +2499,12 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		if (hostapd_state->bss_state != BSS_STOP) {
 			/* Prevent suspend for new channel */
 			hdd_hostapd_channel_prevent_suspend(adapter,
-				sap_event->sapevt.sap_ch_selected.pri_ch);
+				wlan_reg_freq_to_chan(hdd_ctx->pdev,
+				sap_event->sapevt.sap_ch_selected.pri_ch_freq));
 			/* Allow suspend for old channel */
 			hdd_hostapd_channel_allow_suspend(adapter,
-				ap_ctx->operating_channel);
+				wlan_reg_freq_to_chan(hdd_ctx->pdev,
+				ap_ctx->operating_chan_freq));
 		}
 		/* SME/PE is already updated for new operation
 		 * channel. So update HDD layer also here. This
@@ -2506,12 +2514,14 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		 * this case if AP2 is started it needs current
 		 * operation channel for MCC DFS restriction
 		 */
-		ap_ctx->operating_channel =
-			sap_event->sapevt.sap_ch_selected.pri_ch;
+		ap_ctx->operating_chan_freq =
+			sap_event->sapevt.sap_ch_selected.pri_ch_freq;
 		ap_ctx->sap_config.acs_cfg.pri_ch =
-			sap_event->sapevt.sap_ch_selected.pri_ch;
+			wlan_reg_freq_to_chan(hdd_ctx->pdev,
+			sap_event->sapevt.sap_ch_selected.pri_ch_freq);
 		ap_ctx->sap_config.acs_cfg.ht_sec_ch =
-			sap_event->sapevt.sap_ch_selected.ht_sec_ch;
+			wlan_reg_freq_to_chan(hdd_ctx->pdev,
+			sap_event->sapevt.sap_ch_selected.ht_sec_ch_freq);
 		ap_ctx->sap_config.acs_cfg.vht_seg0_center_ch =
 			sap_event->sapevt.sap_ch_selected.vht_seg0_center_ch;
 		ap_ctx->sap_config.acs_cfg.vht_seg1_center_ch =
@@ -2526,13 +2536,16 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		sap_ch_param.center_freq_seg1 =
 			sap_event->sapevt.sap_ch_selected.vht_seg1_center_ch;
 		wlan_reg_set_channel_params(hdd_ctx->pdev,
-			sap_event->sapevt.sap_ch_selected.pri_ch,
-			sap_event->sapevt.sap_ch_selected.ht_sec_ch,
+			wlan_reg_freq_to_chan(hdd_ctx->pdev,
+			sap_event->sapevt.sap_ch_selected.pri_ch_freq),
+			wlan_reg_freq_to_chan(hdd_ctx->pdev,
+			sap_event->sapevt.sap_ch_selected.ht_sec_ch_freq),
 			&sap_ch_param);
 
 		cdp_hl_fc_set_td_limit(cds_get_context(QDF_MODULE_ID_SOC),
 				       adapter->vdev_id,
-				       ap_ctx->operating_channel);
+				       wlan_reg_freq_to_chan(hdd_ctx->pdev,
+				       ap_ctx->operating_chan_freq));
 
 		phy_mode = wlan_sap_get_phymode(
 				WLAN_HDD_GET_SAP_CTX_PTR(adapter));
@@ -2553,8 +2566,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		}
 
 		chan_change.chan_freq =
-			wlan_reg_chan_to_freq(hdd_ctx->pdev,
-				sap_event->sapevt.sap_ch_selected.pri_ch);
+			sap_event->sapevt.sap_ch_selected.pri_ch_freq;
 		chan_change.chan_params.ch_width =
 			sap_event->sapevt.sap_ch_selected.ch_width;
 		chan_change.chan_params.sec_ch_offset =
@@ -2575,9 +2587,11 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		clear_bit(ACS_PENDING, &adapter->event_flags);
 		clear_bit(ACS_IN_PROGRESS, &hdd_ctx->g_event_flags);
 		ap_ctx->sap_config.acs_cfg.pri_ch =
-			sap_event->sapevt.sap_ch_selected.pri_ch;
+			wlan_reg_freq_to_chan(hdd_ctx->pdev,
+			sap_event->sapevt.sap_ch_selected.pri_ch_freq);
 		ap_ctx->sap_config.acs_cfg.ht_sec_ch =
-			sap_event->sapevt.sap_ch_selected.ht_sec_ch;
+			wlan_reg_freq_to_chan(hdd_ctx->pdev,
+			sap_event->sapevt.sap_ch_selected.ht_sec_ch_freq);
 		ap_ctx->sap_config.acs_cfg.vht_seg0_center_ch =
 			sap_event->sapevt.sap_ch_selected.vht_seg0_center_ch;
 		ap_ctx->sap_config.acs_cfg.vht_seg1_center_ch =

core/hdd/src/wlan_hdd_hostapd_wext.c

@@ -854,7 +854,6 @@ static __iw_softap_setparam(struct net_device *dev,
 	case QCASAP_SET_RADAR_CMD:
 	{
 		struct hdd_ap_ctx *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
-		uint8_t ch = ap_ctx->operating_channel;
 		struct wlan_objmgr_pdev *pdev;
 		struct radar_found_info radar;
 
@@ -867,10 +866,11 @@ static __iw_softap_setparam(struct net_device *dev,
 		}
 
 		qdf_mem_zero(&radar, sizeof(radar));
-		if (wlan_reg_is_dfs_ch(pdev, ch))
+		if (wlan_reg_is_dfs_for_freq(pdev, ap_ctx->operating_chan_freq))
 			tgt_dfs_process_radar_ind(pdev, &radar);
 		else
-			hdd_err("Ignore set radar, op ch(%d) is not dfs", ch);
+			hdd_err("Ignore set radar, op ch_freq(%d) is not dfs",
+				ap_ctx->operating_chan_freq);
 
 		break;
 	}
@@ -1462,6 +1462,7 @@ static __iw_softap_getchannel(struct net_device *dev,
 {
 	struct hdd_adapter *adapter = (netdev_priv(dev));
 	struct hdd_context *hdd_ctx;
+	struct hdd_ap_ctx *ap_ctx;
 	int *value = (int *)extra;
 	int ret;
 
@@ -1477,9 +1478,11 @@ static __iw_softap_getchannel(struct net_device *dev,
 		return ret;
 
 	*value = 0;
+	ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
 	if (test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags))
-		*value = (WLAN_HDD_GET_AP_CTX_PTR(
-					adapter))->operating_channel;
+		*value = wlan_reg_freq_to_chan(
+				hdd_ctx->pdev,
+				ap_ctx->operating_chan_freq);
 	hdd_exit();
 	return 0;
 }

core/hdd/src/wlan_hdd_ioctl.c

@@ -7244,6 +7244,7 @@ static void disconnect_sta_and_stop_sap(struct hdd_context *hdd_ctx)
 {
 	struct hdd_adapter *adapter, *next = NULL;
 	QDF_STATUS status;
+	uint8_t ap_ch;
 
 	if (!hdd_ctx)
 		return;
@@ -7253,10 +7254,13 @@ static void disconnect_sta_and_stop_sap(struct hdd_context *hdd_ctx)
 	status = hdd_get_front_adapter(hdd_ctx, &adapter);
 	while (adapter && (status == QDF_STATUS_SUCCESS)) {
 		if (!hdd_validate_adapter(adapter) &&
-		    (adapter->device_mode == QDF_SAP_MODE) &&
-		    (check_disable_channels(hdd_ctx,
-		     adapter->session.ap.operating_channel)))
-			wlan_hdd_stop_sap(adapter);
+		    adapter->device_mode == QDF_SAP_MODE) {
+			ap_ch = wlan_reg_freq_to_chan(
+				hdd_ctx->pdev,
+				adapter->session.ap.operating_chan_freq);
+			if (check_disable_channels(hdd_ctx, ap_ch))
+				wlan_hdd_stop_sap(adapter);
+		}
 
 		status = hdd_get_next_adapter(hdd_ctx, adapter, &next);
 		adapter = next;

core/hdd/src/wlan_hdd_ipa.c

@@ -107,7 +107,9 @@ void hdd_ipa_set_tx_flow_info(void)
 			if (hostapd_state->bss_state == BSS_START
 			    && hostapd_state->qdf_status ==
 			    QDF_STATUS_SUCCESS) {
-				p2pChannel = hdd_ap_ctx->operating_channel;
+				p2pChannel = wlan_reg_freq_to_chan(
+					hdd_ctx->pdev,
+					hdd_ap_ctx->operating_chan_freq);
 				qdf_copy_macaddr(&p2pBssid,
 						 &adapter->mac_addr);
 #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL
@@ -122,7 +124,9 @@ void hdd_ipa_set_tx_flow_info(void)
 			if (hostapd_state->bss_state == BSS_START
 			    && hostapd_state->qdf_status ==
 			    QDF_STATUS_SUCCESS) {
-				apChannel = hdd_ap_ctx->operating_channel;
+				apChannel = wlan_reg_freq_to_chan(
+					hdd_ctx->pdev,
+					hdd_ap_ctx->operating_chan_freq);
 				qdf_copy_macaddr(&apBssid,
 						&adapter->mac_addr);
 #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL

core/hdd/src/wlan_hdd_main.c

@@ -908,7 +908,9 @@ uint8_t hdd_get_adapter_home_channel(struct hdd_adapter *adapter)
 	if ((adapter->device_mode == QDF_SAP_MODE ||
 	     adapter->device_mode == QDF_P2P_GO_MODE) &&
 	    test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags)) {
-		home_channel = adapter->session.ap.operating_channel;
+		home_channel = wlan_reg_freq_to_chan(
+				hdd_ctx->pdev,
+				adapter->session.ap.operating_chan_freq);
 	} else if ((adapter->device_mode == QDF_STA_MODE ||
 		    adapter->device_mode == QDF_P2P_CLIENT_MODE) &&
 		   adapter->session.station.conn_info.conn_state ==
@@ -2340,8 +2342,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_ch(hdd_ctx->pdev,
-		     ap_ctx->operating_channel))) {
+		    (wlan_reg_is_passive_or_disable_for_freq(hdd_ctx->pdev,
+		     ap_ctx->operating_chan_freq))) {
 			WLAN_HDD_GET_AP_CTX_PTR(adapter)->dfs_cac_block_tx =
 				true;
 			hdd_info("tx blocked for vdev: %d",
@@ -9260,7 +9262,7 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 	uint32_t i;
 	bool found = false;
 	uint8_t restart_chan_store[SAP_MAX_NUM_SESSION] = {0};
-	uint8_t restart_chan;
+	uint8_t restart_chan, ap_chan;
 	uint8_t scc_on_lte_coex = 0;
 	bool value;
 	QDF_STATUS status;
@@ -9278,6 +9280,9 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 			continue;
 		}
 
+		ap_chan = wlan_reg_freq_to_chan(
+				hdd_ctxt->pdev,
+				adapter->session.ap.operating_chan_freq);
 		found = false;
 		status =
 		ucfg_policy_mgr_get_sta_sap_scc_lte_coex_chnl(hdd_ctxt->psoc,
@@ -9289,30 +9294,28 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 		 * is set, no need to move SAP.
 		 */
 		if ((policy_mgr_is_sta_sap_scc(
-		     hdd_ctxt->psoc,
-		     adapter->session.ap.operating_channel) &&
+		     hdd_ctxt->psoc, ap_chan) &&
 		     scc_on_lte_coex) ||
 		     policy_mgr_nan_sap_scc_on_unsafe_ch_chk(
-		     hdd_ctxt->psoc,
-		     adapter->session.ap.operating_channel)) {
+		     hdd_ctxt->psoc, ap_chan)) {
 			hdd_debug("SAP allowed in unsafe SCC channel");
 		} else {
 			for (i = 0; i < hdd_ctxt->unsafe_channel_count; i++) {
-				if (adapter->session.ap.operating_channel ==
-					hdd_ctxt->unsafe_channel_list[i]) {
+				if (ap_chan ==
+				    hdd_ctxt->unsafe_channel_list[i]) {
 					found = true;
 					hdd_debug("operating ch:%d is unsafe",
-					adapter->session.ap.operating_channel);
+						  ap_chan);
 					break;
 				}
 			}
 		}
 		if (!found) {
 			hdd_store_sap_restart_channel(
-				adapter->session.ap.operating_channel,
+				ap_chan,
 				restart_chan_store);
 			hdd_debug("ch:%d is safe. no need to change channel",
-				  adapter->session.ap.operating_channel);
+				  ap_chan);
 			continue;
 		}
 
@@ -9341,9 +9344,8 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 
 			if (policy_mgr_is_force_scc(hdd_ctxt->psoc) &&
 			    WLAN_REG_IS_SAME_BAND_CHANNELS(
-							restart_chan_store[i],
-							adapter->session.ap.
-							operating_channel)) {
+					restart_chan_store[i],
+					ap_chan)) {
 				restart_chan = restart_chan_store[i];
 				break;
 			}
@@ -15656,8 +15658,9 @@ void hdd_check_and_restart_sap_with_non_dfs_acs(void)
 	ap_adapter = hdd_get_adapter(hdd_ctx, QDF_SAP_MODE);
 	if (ap_adapter &&
 	    test_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags) &&
-	    wlan_reg_is_dfs_ch(hdd_ctx->pdev,
-			       ap_adapter->session.ap.operating_channel)) {
+	    wlan_reg_is_dfs_for_freq(
+			hdd_ctx->pdev,
+			ap_adapter->session.ap.operating_chan_freq)) {
 		if (policy_mgr_get_dfs_master_dynamic_enabled(
 				hdd_ctx->psoc, ap_adapter->vdev_id))
 			return;

core/hdd/src/wlan_hdd_sap_cond_chan_switch.c

@@ -203,16 +203,16 @@ static int __wlan_hdd_request_pre_cac(struct hdd_context *hdd_ctx,
 		return -EINVAL;
 	}
 
-	if (wlan_reg_is_dfs_ch(hdd_ctx->pdev,
-			       hdd_ap_ctx->operating_channel)) {
+	if (wlan_reg_is_dfs_for_freq(hdd_ctx->pdev,
+				     hdd_ap_ctx->operating_chan_freq)) {
 		hdd_err("SAP is already on DFS channel:%d",
-			hdd_ap_ctx->operating_channel);
+			hdd_ap_ctx->operating_chan_freq);
 		return -EINVAL;
 	}
 
-	if (!WLAN_REG_IS_24GHZ_CH(hdd_ap_ctx->operating_channel)) {
+	if (!WLAN_REG_IS_24GHZ_CH_FREQ(hdd_ap_ctx->operating_chan_freq)) {
 		hdd_err("pre CAC alllowed only when SAP is in 2.4GHz:%d",
-			hdd_ap_ctx->operating_channel);
+			hdd_ap_ctx->operating_chan_freq);
 		return -EINVAL;
 	}
 
@@ -364,8 +364,11 @@ static int __wlan_hdd_request_pre_cac(struct hdd_context *hdd_ctx,
 		goto stop_close_pre_cac_adapter;
 	}
 
-	ret = wlan_hdd_set_chan_before_pre_cac(ap_adapter,
-					       hdd_ap_ctx->operating_channel);
+	ret = wlan_hdd_set_chan_before_pre_cac(
+			ap_adapter,
+			wlan_reg_freq_to_chan(
+			hdd_ctx->pdev,
+			hdd_ap_ctx->operating_chan_freq));
 	if (ret != 0) {
 		hdd_err("failed to set channel before pre cac");
 		goto stop_close_pre_cac_adapter;

core/hdd/src/wlan_hdd_scan.c

@@ -454,7 +454,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 	int status;
 	struct hdd_scan_info *scan_info = NULL;
 	struct hdd_adapter *con_sap_adapter;
-	uint8_t con_dfs_ch;
+	uint32_t con_dfs_ch_freq;
 	uint8_t curr_vdev_id;
 	enum scan_reject_states curr_reason;
 	static uint32_t scan_ebusy_cnt;
@@ -534,15 +534,15 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 	/* Block All Scan during DFS operation and send null scan result */
 	con_sap_adapter = hdd_get_con_sap_adapter(adapter, true);
 	if (con_sap_adapter) {
-		con_dfs_ch = wlan_reg_freq_to_chan(hdd_ctx->pdev,
-			con_sap_adapter->session.ap.sap_config.chan_freq);
-		if (con_dfs_ch == AUTO_CHANNEL_SELECT)
-			con_dfs_ch =
-				con_sap_adapter->session.ap.operating_channel;
+		con_dfs_ch_freq =
+			con_sap_adapter->session.ap.sap_config.chan_freq;
+		if (con_dfs_ch_freq == AUTO_CHANNEL_SELECT)
+			con_dfs_ch_freq =
+				con_sap_adapter->session.ap.operating_chan_freq;
 
 		if (!policy_mgr_is_hw_dbs_capable(hdd_ctx->psoc) &&
-			wlan_reg_is_dfs_ch(hdd_ctx->pdev, con_dfs_ch) &&
-			!policy_mgr_is_sta_sap_scc_allowed_on_dfs_chan(
+		    wlan_reg_is_dfs_for_freq(hdd_ctx->pdev, con_dfs_ch_freq) &&
+		    !policy_mgr_is_sta_sap_scc_allowed_on_dfs_chan(
 			hdd_ctx->psoc)) {
 			/* Provide empty scan result during DFS operation since
 			 * scanning not supported during DFS. Reason is

core/sap/inc/sap_api.h

@@ -229,7 +229,7 @@ typedef enum {
  * -------------------------------------------------------------------------*/
 typedef struct sap_StartBssCompleteEvent_s {
 	uint8_t status;
-	uint8_t operatingChannel;
+	uint32_t operating_chan_freq;
 	enum phy_ch_width ch_width;
 	uint16_t staId;         /* self StaID */
 	uint8_t sessionId;      /* SoftAP SME session ID */
@@ -338,15 +338,18 @@ typedef struct sap_MaxAssocExceededEvent_s {
 
 /**
  * sap_acs_ch_selected_s - the structure to hold the selected channels
- * @pri_channel:	   Holds the ACS selected primary channel
- * @sec_channel:	   Holds the ACS selected secondary channel
+ * @pri_chan_freq: Holds the ACS selected primary channel frequency
+ * @ht_sec_ch_freq: Holds the ACS selected secondary ht channel frequency
+ * @vht_seg0_center_ch: Holds the ACS selected center channel of vht seg0
+ * @vht_seg1_center_ch: Holds the ACS selected center channel of vht seg1
+ * @ch_width: Holds the ACS selected channel bandwidth
  *
  * Holds the primary and secondary channel selected by ACS and is
  * used to send it to the HDD.
  */
 struct sap_ch_selected_s {
-	uint16_t pri_ch;
-	uint16_t ht_sec_ch;
+	uint32_t pri_ch_freq;
+	uint32_t ht_sec_ch_freq;
 	uint16_t vht_seg0_center_ch;
 	uint16_t vht_seg1_center_ch;
 	uint16_t ch_width;

core/sap/src/sap_fsm.c

@@ -1487,9 +1487,7 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx,
 			  FL("(eSAP_START_BSS_EVENT): staId = %d"),
 			  bss_complete->staId);
 
-		bss_complete->operatingChannel = wlan_reg_freq_to_chan(
-							mac_ctx->pdev,
-							sap_ctx->chan_freq);
+		bss_complete->operating_chan_freq = sap_ctx->chan_freq;
 		bss_complete->ch_width = sap_ctx->ch_params.ch_width;
 		break;
 	case eSAP_DFS_CAC_START:
@@ -1511,15 +1509,17 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx,
 		sap_ap_event.sapHddEventCode = sap_hddevent;
 		acs_selected = &sap_ap_event.sapevt.sap_ch_selected;
 		if (eSAP_STATUS_SUCCESS == (eSapStatus)context) {
-			acs_selected->pri_ch = sap_ctx->acs_cfg->pri_ch;
-			acs_selected->ht_sec_ch = sap_ctx->acs_cfg->ht_sec_ch;
+			acs_selected->pri_ch_freq = wlan_reg_chan_to_freq(
+				mac_ctx->pdev, sap_ctx->acs_cfg->pri_ch);
+			acs_selected->ht_sec_ch_freq = wlan_reg_chan_to_freq(
+				mac_ctx->pdev, sap_ctx->acs_cfg->ht_sec_ch);
 			acs_selected->ch_width = sap_ctx->acs_cfg->ch_width;
 			acs_selected->vht_seg0_center_ch =
 				sap_ctx->acs_cfg->vht_seg0_center_ch;
 			acs_selected->vht_seg1_center_ch =
 				sap_ctx->acs_cfg->vht_seg1_center_ch;
 		} else if (eSAP_STATUS_FAILURE == (eSapStatus)context) {
-			acs_selected->pri_ch = 0;
+			acs_selected->pri_ch_freq = 0;
 		}
 		break;
 
@@ -1757,10 +1757,8 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx,
 		sap_ap_event.sapHddEventCode = eSAP_CHANNEL_CHANGE_EVENT;
 
 		acs_selected = &sap_ap_event.sapevt.sap_ch_selected;
-		acs_selected->pri_ch = wlan_reg_freq_to_chan(mac_ctx->pdev,
-							sap_ctx->chan_freq);
-		acs_selected->ht_sec_ch = wlan_reg_freq_to_chan(mac_ctx->pdev,
-							sap_ctx->sec_ch_freq);
+		acs_selected->pri_ch_freq = sap_ctx->chan_freq;
+		acs_selected->ht_sec_ch_freq = sap_ctx->sec_ch_freq;
 		acs_selected->ch_width =
 			sap_ctx->csr_roamProfile.ch_params.ch_width;
 		acs_selected->vht_seg0_center_ch =