qcacld-3.0: Remove WLAN_REG_IS_5GHZ_CH (18082a52) · Commits · e / devices / android_kernel_fairphone_FP5

components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1482,7 +1482,7 @@ static enum policy_mgr_two_connection_mode
		/* SBS */
		if ((WLAN_REG_IS_5GHZ_CH_FREQ(
		pm_conc_connection_list[0].freq)) &&
		(WLAN_REG_IS_5GHZ_CH(
		(WLAN_REG_IS_5GHZ_CH_FREQ(
		pm_conc_connection_list[1].freq))) {
		if (POLICY_MGR_ONE_ONE ==
		pm_conc_connection_list[0].chain_mask)

core/hdd/src/wlan_hdd_cfg80211.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2181,7 +2181,7 @@ hdd_update_reg_chan_info(struct hdd_adapter *adapter,
		if (chan == 0)
		continue;

		icv->freq = wlan_reg_get_channel_freq(hdd_ctx->pdev, chan);
		icv->freq = freq_list[i];
		icv->ieee_chan_number = chan;
		icv->max_reg_power = wlan_reg_get_channel_reg_power(
		hdd_ctx->pdev, chan);
		@@ -2196,7 +2196,7 @@ hdd_update_reg_chan_info(struct hdd_adapter *adapter,
		icv->reg_class_id =
		wlan_hdd_find_opclass(mac_handle, chan, bw_offset);

		if (WLAN_REG_IS_5GHZ_CH(chan)) {
		if (WLAN_REG_IS_5GHZ_CH_FREQ(freq_list[i])) {
		ch_params.ch_width = sap_config->acs_cfg.ch_width;
		wlan_reg_set_channel_params(hdd_ctx->pdev, chan,
		0, &ch_params);

core/hdd/src/wlan_hdd_hostapd.c

+18 −24

Original line number	Diff line number	Diff line
		@@ -6426,7 +6426,8 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
		enum hw_mode_bandwidth channel_width;
		int status;
		struct sme_sta_inactivity_timeout *sta_inactivity_timer;
		uint8_t channel, mandt_chnl_list = 0;
		uint8_t mandt_chnl_list = 0;
		qdf_freq_t freq;
		uint16_t sta_cnt, sap_cnt;
		bool val;
		struct wireless_dev *wdev = dev->ieee80211_ptr;
		@@ -6497,12 +6498,8 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
		}

		channel_width = wlan_hdd_get_channel_bw(params->chandef.width);
		channel = ieee80211_frequency_to_channel(
		params->chandef.chan->center_freq);
		if (!channel) {
		hdd_err("Invalid channel");
		return -EINVAL;
		}
		freq = (qdf_freq_t)params->chandef.chan->center_freq;

		chandef = &params->chandef;
		if ((adapter->device_mode == QDF_SAP_MODE \|\|
		adapter->device_mode == QDF_P2P_GO_MODE) &&
		@@ -6510,8 +6507,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
		chandef->chan->center_freq,
		&new_chandef)) {
		chandef = &new_chandef;
		channel = ieee80211_frequency_to_channel(
		chandef->chan->center_freq);
		freq = (qdf_freq_t)chandef->chan->center_freq;
		channel_width = wlan_hdd_get_channel_bw(chandef->width);
		}

		@@ -6543,7 +6539,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
		&srd_channel_allowed);

		if (!srd_channel_allowed &&
		wlan_reg_is_etsi13_srd_chan(hdd_ctx->pdev, channel)) {
		wlan_reg_is_etsi13_srd_chan_for_freq(hdd_ctx->pdev, freq)) {
		hdd_err("vdev opmode %d not allowed on SRD channel.",
		vdev_opmode);
		return -EINVAL;
		@@ -6553,10 +6549,10 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
		enum phy_ch_width sub_20_ch_width = CH_WIDTH_INVALID;
		struct sap_config *sap_cfg = &adapter->session.ap.sap_config;

		if (CHANNEL_STATE_DFS == wlan_reg_get_channel_state(
		hdd_ctx->pdev, channel)) {
		if (CHANNEL_STATE_DFS == wlan_reg_get_channel_state_for_freq(
		hdd_ctx->pdev, freq)) {
		hdd_err("Can't start SAP-DFS (channel=%d)with sub 20 MHz ch wd",
		channel);
		freq);
		return -EINVAL;
		}
		if (channel_width != HW_MODE_20_MHZ) {
		@@ -6567,13 +6563,11 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
		sub_20_ch_width = CH_WIDTH_5MHZ;
		if (cds_is_10_mhz_enabled())
		sub_20_ch_width = CH_WIDTH_10MHZ;
		if (WLAN_REG_IS_5GHZ_CH(channel))
		ch_state = wlan_reg_get_5g_bonded_channel_state(
		hdd_ctx->pdev, channel,
		if (WLAN_REG_IS_5GHZ_CH_FREQ(freq))
		ch_state = wlan_reg_get_5g_bonded_channel_state_for_freq(hdd_ctx->pdev, freq,
		sub_20_ch_width);
		else
		ch_state = wlan_reg_get_2g_bonded_channel_state(
		hdd_ctx->pdev, channel,
		ch_state = wlan_reg_get_2g_bonded_channel_state_for_freq(hdd_ctx->pdev, freq,
		sub_20_ch_width, 0);
		if (CHANNEL_STATE_DISABLE == ch_state) {
		hdd_err("Given ch width not supported by reg domain");
		@@ -6607,14 +6601,14 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
		if (policy_mgr_mode_specific_connection_count(hdd_ctx->psoc,
		PM_NAN_DISC_MODE, NULL) &&
		!policy_mgr_nan_sap_pre_enable_conc_check(hdd_ctx->psoc,
		PM_SAP_MODE, wlan_chan_to_freq(channel)))
		PM_SAP_MODE, freq))
		hdd_debug("NAN disabled due to concurrency constraints");

		/* check if concurrency is allowed */
		if (!policy_mgr_allow_concurrency(hdd_ctx->psoc,
		policy_mgr_convert_device_mode_to_qdf_type(
		adapter->device_mode),
		wlan_chan_to_freq(channel),
		freq,
		channel_width)) {
		hdd_err("Connection failed due to concurrency check failure");
		return -EINVAL;
		@@ -6638,7 +6632,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
		*/

		policy_mgr_checkn_update_hw_mode_single_mac_mode(
		hdd_ctx->psoc, wlan_chan_to_freq(channel));
		hdd_ctx->psoc, freq);
		if (status != QDF_STATUS_SUCCESS) {
		hdd_err("Failed to stop DBS opportunistic timer");
		return -EINVAL;
		@@ -6646,7 +6640,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,

		status = policy_mgr_current_connections_update(
		hdd_ctx->psoc, adapter->vdev_id,
		wlan_chan_to_freq(channel),
		freq,
		POLICY_MGR_UPDATE_REASON_START_AP,
		POLICY_MGR_DEF_REQ_ID);
		if (status == QDF_STATUS_E_FAILURE) {