wlan-ap-Telecominfraproject/feeds/qca/hostapd/patches/r03-031-wpa_s-fix-mesh-ru_punct_bitmap-and-channel-.patch

From 99209a788622116daec19ca8af19cc5bd57e4976 Mon Sep 17 00:00:00 2001
From: Amutha Ravikumar <quic_aravikum@quicinc.com>
Date: Tue, 21 Nov 2023 17:02:11 +0530
Subject: [PATCH] wpa_supplicant: fix mesh ru_punct_bitmap and channel
 bandwidth configuration issue

ibss_mesh_setup_freq API was split into multiple APIs
in upgraded hostapd code and also it missed ru_punct_bitmap
and other channel bandwidth configuration changes done internally

Reverted the changes and made ibss_mesh_setup_freq API to
single API like before hostapd upgrade

This reverts commit https://w1.fi/cgit/hostap/commit/wpa_supplicant/wpa_supplicant.c?id=64043e6156afdfe1e1a4d60b0205ee15acb5b49e

Signed-off-by: Rameshkumar Sundaram <quic_ramess@quicinc.com>
Signed-off-by: Muna Sinada <quic_msinada@quicinc.com>
Signed-off-by: Amutha Ravikumar <quic_aravikum@quicinc.com>
Signed-off-by: Manish Dharanenthiran <quic_mdharane@quicinc.com>
---
 wpa_supplicant/wpa_supplicant.c | 571 +++++++++++++++++---------------
 1 file changed, 306 insertions(+), 265 deletions(-)

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index ea6a6eb..0c05c2b 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -2761,143 +2761,157 @@ static bool ibss_mesh_is_80mhz_avail(int channel, struct hostapd_hw_modes *mode,
 	return true;
 }
 
+static int ibss_get_center_320mhz(int channel)
+{
+	int seg0;
+
+	if (channel >= 1 && channel <= 45)
+		seg0 = 31;
+	else if (channel >= 49 && channel <= 77)
+		seg0 = 63;
+	else if (channel >= 81 && channel <= 109)
+		seg0 = 95;
+	else if (channel >= 113 && channel <= 141)
+		seg0 = 127;
+	else if (channel >= 145 && channel <= 173)
+		seg0 = 159;
+	else
+		seg0 = 191;
+
+	return seg0;
+}
+
 
-static struct wpa_bss * ibss_find_existing_bss(struct wpa_supplicant *wpa_s,
-					       const struct wpa_ssid *ssid)
+void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
+			  const struct wpa_ssid *ssid,
+			  struct hostapd_freq_params *freq)
 {
-	unsigned int j;
+	int ieee80211_mode = wpas_mode_to_ieee80211_mode(ssid->mode);
+	enum hostapd_hw_mode hw_mode;
+	struct hostapd_hw_modes *mode = NULL;
+	int ht40plus[] = { 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157,
+			   165, 173, 184, 192 };
+	/* bw_80_160 array members are 80MHz start freq, 80MHz end freq and so on
+	 */
+	unsigned int bw_80_160[] = { 5180, 5240, 5260, 5320,
+				     5500, 5560, 5580, 5640,
+				     5660, 5720,    0,	  0,
+				     /* Adding dummy sec80 after channel #144 to keep remining 160MHz array intact */
+				     5745, 5805, 5825, 5885,
+				     5955, 6015, 6035, 6095,
+				     6115, 6175, 6195, 6255,
+				     6275, 6335, 6355, 6415,
+				     6435, 6495, 6515, 6575,
+				     6595, 6655, 6675, 6735,
+				     6755, 6815, 6835, 6895,
+				     6915, 6975, 6995, 7055 };
+	  unsigned int bw_320[] = { 5500, 5720, 5955, 6255, 6115,
+				    6415, 6275, 6575, 6435, 6735,
+				    6595, 6895, 6755, 7055};
+	struct hostapd_channel_data *pri_chan = NULL, *sec_chan = NULL;
+	u8 channel,  chan_80mhz;
+	int i, chan_idx, ht40 = -1, res, obss_scan = 1;
+	unsigned int j, k;
+	struct hostapd_freq_params vht_freq;
+	int chwidth, seg0, seg1;
+	u32 vht_caps = 0;
+	bool is_24ghz, is_6ghz;
+	bool dfs_enabled = wpa_s->conf->country[0] && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR);
+
+	freq->freq = ssid->frequency;
 
 	for (j = 0; j < wpa_s->last_scan_res_used; j++) {
 		struct wpa_bss *bss = wpa_s->last_scan_res[j];
 
+		if (ssid->mode != WPAS_MODE_IBSS)
+			break;
+
+		/* Don't adjust control freq in case of fixed_freq */
+		if (ssid->fixed_freq)
+			break;
+
 		if (!bss_is_ibss(bss))
 			continue;
 
 		if (ssid->ssid_len == bss->ssid_len &&
-		    os_memcmp(ssid->ssid, bss->ssid, bss->ssid_len) == 0)
-			return bss;
+		    os_memcmp(ssid->ssid, bss->ssid, bss->ssid_len) == 0) {
+			wpa_printf(MSG_DEBUG,
+				   "IBSS already found in scan results, adjust control freq: %d",
+				   bss->freq);
+			freq->freq = bss->freq;
+			obss_scan = 0;
+			break;
+		}
 	}
-	return NULL;
-}
-
 
-static bool ibss_mesh_can_use_ht(struct wpa_supplicant *wpa_s,
-				 const struct wpa_ssid *ssid,
-				 struct hostapd_hw_modes *mode)
-{
 	/* For IBSS check HT_IBSS flag */
 	if (ssid->mode == WPAS_MODE_IBSS &&
 	    !(wpa_s->drv_flags & WPA_DRIVER_FLAGS_HT_IBSS))
-		return false;
+		return;
 
 	if (wpa_s->group_cipher == WPA_CIPHER_WEP40 ||
 	    wpa_s->group_cipher == WPA_CIPHER_WEP104 ||
 	    wpa_s->pairwise_cipher == WPA_CIPHER_TKIP) {
 		wpa_printf(MSG_DEBUG,
 			   "IBSS: WEP/TKIP detected, do not try to enable HT");
-		return false;
+		return;
 	}
 
-	if (!ht_supported(mode))
-		return false;
-
-#ifdef CONFIG_HT_OVERRIDES
-	if (ssid->disable_ht)
-		return false;
-#endif /* CONFIG_HT_OVERRIDES */
-
-	return true;
-}
-
-
-static bool ibss_mesh_can_use_vht(struct wpa_supplicant *wpa_s,
-				  const struct wpa_ssid *ssid,
-				  struct hostapd_hw_modes *mode)
-{
-	if (mode->mode != HOSTAPD_MODE_IEEE80211A && !(ssid->noscan))
-		return false;
+	hw_mode = ieee80211_freq_to_chan(freq->freq, &channel);
+	mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes,
+			hw_mode, is_6ghz_freq(ssid->frequency));
+	if (!mode)
+		return;
 
-	if (!drv_supports_vht(wpa_s, ssid))
-		return false;
+	freq->channel = channel;
 
-	/* For IBSS check VHT_IBSS flag */
-	if (ssid->mode == WPAS_MODE_IBSS &&
-	    !(wpa_s->drv_flags & WPA_DRIVER_FLAGS_VHT_IBSS))
-		return false;
+	is_24ghz = hw_mode == HOSTAPD_MODE_IEEE80211G ||
+		   hw_mode == HOSTAPD_MODE_IEEE80211B;
 
-	if (!vht_supported(mode))
-		return false;
+	/* HT/VHT and corresponding overrides are not applicable to 6 GHz.
+	 * However, HE is mandatory for 6 GHz.
+	 */
+	is_6ghz = is_6ghz_freq(freq->freq);
+	if (is_6ghz)
+		goto skip_to_6ghz;
 
-#ifdef CONFIG_VHT_OVERRIDES
-	if (ssid->disable_vht)
-		return false;
-#endif /* CONFIG_VHT_OVERRIDES */
+#ifdef CONFIG_HT_OVERRIDES
+	if (ssid->disable_ht) {
+		freq->ht_enabled = 0;
+		return;
+	}
+#endif /* CONFIG_HT_OVERRIDES */
 
-	return true;
-}
+	freq->ht_enabled = ht_supported(mode);
+	if (!freq->ht_enabled)
+		return;
 
+	/* Allow HE on 2.4 GHz without VHT: see nl80211_put_freq_params() */
+	if (is_24ghz) {
+#ifdef CONFIG_EHT_OVERRIDES
+		if (is_24ghz && ssid->disable_eht)
+			freq->eht_enabled = 0;
+		else
+#endif /* CONFIG_EHT_OVERRIDES */
+			freq->eht_enabled = mode->eht_capab[ieee80211_mode].eht_supported;
 
-static bool ibss_mesh_can_use_he(struct wpa_supplicant *wpa_s,
-				 const struct wpa_ssid *ssid,
-				 const struct hostapd_hw_modes *mode,
-				 int ieee80211_mode)
-{
 #ifdef CONFIG_HE_OVERRIDES
-	if (ssid->disable_he)
-		return false;
+		if (ssid->disable_he) {
+			freq->he_enabled = 0;
+			freq->eht_enabled = 0;
+		} else
 #endif /* CONFIG_HE_OVERRIDES */
+			freq->he_enabled = mode->he_capab[ieee80211_mode].he_supported;
 
-	switch (mode->mode) {
-	case HOSTAPD_MODE_IEEE80211G:
-	case HOSTAPD_MODE_IEEE80211B:
-	case HOSTAPD_MODE_IEEE80211A:
-		return mode->he_capab[ieee80211_mode].he_supported;
-	default:
-		return false;
-	}
-}
-
-
-static bool ibss_mesh_can_use_eht(struct wpa_supplicant *wpa_s,
-				  const struct wpa_ssid *ssid,
-				  const struct hostapd_hw_modes *mode,
-				  int ieee80211_mode)
-{
-	if (ssid->disable_eht)
-		return false;
-
-	switch(mode->mode) {
-	case HOSTAPD_MODE_IEEE80211G:
-	case HOSTAPD_MODE_IEEE80211B:
-	case HOSTAPD_MODE_IEEE80211A:
-		return mode->eht_capab[ieee80211_mode].eht_supported;
-	default:
-		return false;
-	}
-}
-
-
-static void ibss_mesh_select_40mhz(struct wpa_supplicant *wpa_s,
-				   const struct wpa_ssid *ssid,
-				   struct hostapd_hw_modes *mode,
-				   struct hostapd_freq_params *freq,
-				   int obss_scan, bool dfs_enabled) {
-	int chan_idx;
-	struct hostapd_channel_data *pri_chan = NULL, *sec_chan = NULL;
-	int i, res;
-	unsigned int j;
-	static const int ht40plus[] = {
-		1, 2, 3, 4, 5, 6, 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157, 165, 173,
-		184, 192
-	};
-	int ht40 = -1;
-
-	if (!freq->ht_enabled)
+		if (freq->he_enabled)
+			ibss_mesh_setup_2G_he40(freq, mode, wpa_s,
+						ssid, ieee80211_mode);
 		return;
+	}
 
 	for (chan_idx = 0; chan_idx < mode->num_channels; chan_idx++) {
 		pri_chan = &mode->channels[chan_idx];
-		if (pri_chan->chan == freq->channel)
+		if (pri_chan->chan == channel)
 			break;
 		pri_chan = NULL;
 	}
@@ -2905,20 +2919,24 @@ static void ibss_mesh_select_40mhz(struct wpa_supplicant *wpa_s,
 		return;
 
 	/* Check primary channel flags */
-	if (pri_chan->flag & HOSTAPD_CHAN_DISABLED)
+	if (pri_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
 		return;
-	if (pri_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
-		if (!dfs_enabled)
-			return;
+
+	freq->channel = pri_chan->chan;
 
 #ifdef CONFIG_HT_OVERRIDES
-	if (ssid->disable_ht40)
-		return;
-#endif
+	if (ssid->disable_ht40) {
+#ifdef CONFIG_VHT_OVERRIDES
+		if (ssid->disable_vht)
+			return;
+#endif /* CONFIG_VHT_OVERRIDES */
+		goto skip_ht40;
+	}
+#endif /* CONFIG_HT_OVERRIDES */
 
 	/* Check/setup HT40+/HT40- */
 	for (j = 0; j < ARRAY_SIZE(ht40plus); j++) {
-		if (ht40plus[j] == freq->channel) {
+		if (ht40plus[j] == channel) {
 			ht40 = 1;
 			break;
 		}
@@ -2927,7 +2945,7 @@ static void ibss_mesh_select_40mhz(struct wpa_supplicant *wpa_s,
 	/* Find secondary channel */
 	for (i = 0; i < mode->num_channels; i++) {
 		sec_chan = &mode->channels[i];
-		if (sec_chan->chan == freq->channel + ht40 * 4)
+		if (sec_chan->chan == channel + ht40 * 4)
 			break;
 		sec_chan = NULL;
 	}
@@ -2935,11 +2953,8 @@ static void ibss_mesh_select_40mhz(struct wpa_supplicant *wpa_s,
 		return;
 
 	/* Check secondary channel flags */
-	if (sec_chan->flag & HOSTAPD_CHAN_DISABLED)
+	if (sec_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
 		return;
-	if (sec_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
-		if (!dfs_enabled)
-			return;
 
 	if (ht40 == -1) {
 		if (!(pri_chan->flag & HOSTAPD_CHAN_HT40MINUS))
@@ -2983,95 +2998,157 @@ static void ibss_mesh_select_40mhz(struct wpa_supplicant *wpa_s,
 		wpa_scan_results_free(scan_res);
 	}
 
+#ifdef CONFIG_HE_OVERRIDES
+skip_vht80:
+	if (ssid->disable_he)
+		vht_freq.he_enabled = 0;
+#endif /* CONFIG_HE_OVERRIDES */
+
+#ifdef CONFIG_EHT_OVERRIDES
+skip_vht80:
+	if (ssid->disable_eht)
+		vht_freq.eht_enabled = 0;
+#endif /* CONFIG_EHT_OVERRIDES */
+
+#ifdef CONFIG_HT_OVERRIDES
+skip_ht40:
+#endif /* CONFIG_HT_OVERRIDES */
 	wpa_printf(MSG_DEBUG,
 		   "IBSS/mesh: setup freq channel %d, sec_channel_offset %d",
 		   freq->channel, freq->sec_channel_offset);
-}
 
+	if (!drv_supports_vht(wpa_s, ssid))
+		return;
 
-static bool ibss_mesh_select_80_160mhz(struct wpa_supplicant *wpa_s,
-				       const struct wpa_ssid *ssid,
-				       struct hostapd_hw_modes *mode,
-				       struct hostapd_freq_params *freq,
-				       int ieee80211_mode, bool is_6ghz, bool dfs_enabled) {
-	static const int bw80[] = {
-		5180, 5260, 5500, 5580, 5660, 5745, 5825,
-		5955, 6035, 6115, 6195, 6275, 6355, 6435,
-		6515, 6595, 6675, 6755, 6835, 6915, 6995
-	};
-	static const int bw160[] = {
-		5955, 6115, 6275, 6435, 6595, 6755, 6915
-	};
-	struct hostapd_freq_params vht_freq;
-	int i;
-	unsigned int j, k;
-	int chwidth, seg0, seg1;
-	u32 vht_caps = 0;
-	u8 channel = freq->channel;
+	/* For IBSS check VHT_IBSS flag */
+	if (ssid->mode == WPAS_MODE_IBSS &&
+	    !(wpa_s->drv_flags & WPA_DRIVER_FLAGS_VHT_IBSS))
+		return;
 
-	if (!freq->vht_enabled && !freq->he_enabled)
-		return true;
+#ifdef CONFIG_VHT_OVERRIDES
+	if (ssid->disable_vht) {
+		freq->vht_enabled = 0;
+		return;
+	}
+#endif /* CONFIG_VHT_OVERRIDES */
 
+skip_to_6ghz:
 	vht_freq = *freq;
 
-	chwidth = CONF_OPER_CHWIDTH_USE_HT;
-	seg0 = freq->channel + 2 * freq->sec_channel_offset;
-	seg1 = 0;
-	if (freq->sec_channel_offset == 0) {
-		seg0 = 0;
-		/* Don't try 80 MHz if 40 MHz failed, except in 6 GHz */
-		if (freq->ht_enabled && !is_6ghz)
-			goto skip_80mhz;
-	}
-	if (ssid->max_oper_chwidth == CONF_OPER_CHWIDTH_USE_HT)
-		goto skip_80mhz;
-
-	/* setup center_freq1, bandwidth */
-	for (j = 0; j < ARRAY_SIZE(bw80); j++) {
-		if (freq->freq >= bw80[j] &&
-		    freq->freq < bw80[j] + 80)
+	/* 6 GHz does not have VHT enabled, so allow that exception here. */
+	vht_freq.vht_enabled = vht_supported(mode);
+	if (!vht_freq.vht_enabled && !is_6ghz)
+		return;
+
+	/* Enable HE, EHT with VHT for 5 GHz */
+	vht_freq.he_enabled = mode->he_capab[ieee80211_mode].he_supported;
+	vht_freq.eht_enabled = mode->eht_capab[ieee80211_mode].eht_supported;
+
+#ifdef CONFIG_HE_OVERRIDES
+	if (is_24ghz)
+		goto skip_vht80;
+#endif
+
+	for (j = 0; j < ARRAY_SIZE(bw_80_160); j+=2) {
+		/* If the config provided freq available between any of two indices
+		 * get the starting range of the channel to check chan availability
+		 */
+		if (freq->freq >= bw_80_160[j] && freq->freq <= bw_80_160[j+1]) {
+			ieee80211_freq_to_chan(bw_80_160[j], &chan_80mhz);
+			seg0 = chan_80mhz + 6;
 			break;
+		}
 	}
 
-	if (j == ARRAY_SIZE(bw80) ||
-	    ieee80211_freq_to_chan(bw80[j], &channel) == NUM_HOSTAPD_MODES)
-		goto skip_80mhz;
+	if (j == ARRAY_SIZE(bw_80_160))
+		return;
 
-	/* Use 40 MHz if channel not usable */
-	if (!ibss_mesh_is_80mhz_avail(channel, mode, dfs_enabled))
-		goto skip_80mhz;
+	/* Back to HT configuration if channel not usable */
+	if (!ibss_mesh_is_80mhz_avail(chan_80mhz, mode, dfs_enabled))
+		return;
 
 	chwidth = CONF_OPER_CHWIDTH_80MHZ;
-	seg0 = channel + 6;
 	seg1 = 0;
 
-	/* In 160 MHz, the initial four 20 MHz channels were validated
-	 * above. If 160 MHz is supported, check the remaining four 20 MHz
-	 * channels for the total of 160 MHz bandwidth for 6 GHz.
-	 */
 	if ((mode->he_capab[ieee80211_mode].phy_cap[
 		     HE_PHYCAP_CHANNEL_WIDTH_SET_IDX] &
-	     HE_PHYCAP_CHANNEL_WIDTH_SET_160MHZ_IN_5G) && is_6ghz &&
-	    ibss_mesh_is_80mhz_avail(channel + 16, mode, dfs_enabled)) {
-		for (j = 0; j < ARRAY_SIZE(bw160); j++) {
-			if (freq->freq == bw160[j]) {
-				chwidth = CONF_OPER_CHWIDTH_160MHZ;
-				seg0 = channel + 14;
+	     HE_PHYCAP_CHANNEL_WIDTH_SET_160MHZ_IN_5G) && (ssid->enable_160mhz_bw)) {
+		chan_80mhz = freq->channel + 16;
+		for (j = 0; j < ARRAY_SIZE(bw_80_160); j+=2) {
+			if (freq->freq >= bw_80_160[j] && freq->freq <= bw_80_160[j+1]) {
+				if (j % 4 == 0) {
+					ieee80211_freq_to_chan(bw_80_160[j],
+							       &chan_80mhz);
+					seg0 = chan_80mhz + 14;
+
+					/* Get secondary 80MHz channel using freq by
+					 * adding 16*5 ie., 80MHz.
+					 */
+					ieee80211_freq_to_chan((bw_80_160[j] + 16*5),
+								&chan_80mhz);
+				} else {
+					ieee80211_freq_to_chan(bw_80_160[j],
+							       &chan_80mhz);
+					seg0 = chan_80mhz - 2;
+					/* Get secondary 80MHz channel using freq by
+					 * subtracting 16*5 ie., 80MHz.
+					 */
+					ieee80211_freq_to_chan((bw_80_160[j] - 16*5),
+								&chan_80mhz);
+				}
+
+				if (!ibss_mesh_is_80mhz_avail(chan_80mhz, mode, dfs_enabled))
+					seg0 = freq->channel + 6;
+				else
+					chwidth = CONF_OPER_CHWIDTH_160MHZ;
 				break;
 			}
 		}
 	}
 
+	if ((ssid->enable_320mhz_bw) && (mode->eht_capab[ieee80211_mode].phy_cap[EHT_PHYCAP_320MHZ_IN_6GHZ_SUPPORT_IDX] &
+	     EHT_PHYCAP_320MHZ_IN_6GHZ_SUPPORT_MASK)) {
+		if (is_6ghz) {
+			for (i = 0; i < ARRAY_SIZE(bw_320); i+=2) {
+				if (freq->freq >= bw_320[i] &&
+				    freq->freq <= bw_320[i+1])
+					break;
+			}
+
+			if (ssid->ccfs)
+				seg0 = ssid->ccfs;
+			else
+				seg0 = ibss_get_center_320mhz(freq->channel);
+			chwidth = CONF_OPER_CHWIDTH_320MHZ;
+		} else {
+			/* There is only one 320MHz(240+80 Punctured) in 5 GHz Band */
+			u8 start_chan_idx = 100;
+			if (freq->channel >= 100 && freq->channel <= 144 && (ssid->ru_punct_bitmap & 0xF000) == 0xF000) {
+				for (i = start_chan_idx; i <= start_chan_idx + 44; i += 4) {
+					struct hostapd_channel_data *chan;
+					chan = hw_get_channel_chan(mode, i, NULL);
+					if (!chan)
+						return;
+					if (chan->flag & (HOSTAPD_CHAN_DISABLED|
+							HOSTAPD_CHAN_NO_IR))
+						return;
+				}
+					seg0 = 130;
+					chwidth = CONF_OPER_CHWIDTH_320MHZ;
+			}
+		}
+	}
+
 	if (ssid->max_oper_chwidth == CONF_OPER_CHWIDTH_80P80MHZ) {
 		/* setup center_freq2, bandwidth */
-		for (k = 0; k < ARRAY_SIZE(bw80); k++) {
+		for (k = 0; k < ARRAY_SIZE(bw_80_160); k++) {
 			/* Only accept 80 MHz segments separated by a gap */
-			if (j == k || abs(bw80[j] - bw80[k]) == 80)
+			if (j == k || abs(bw_80_160[j] - bw_80_160[k]) == 80)
 				continue;
 
-			if (ieee80211_freq_to_chan(bw80[k], &channel) ==
-			    NUM_HOSTAPD_MODES)
-				break;
+			if (ieee80211_freq_to_chan(bw_80_160[k],
+						   &channel) == NUM_HOSTAPD_MODES)
+				return;
 
 			for (i = channel; i < channel + 16; i += 4) {
 				struct hostapd_channel_data *chan;
@@ -3080,12 +3157,10 @@ static bool ibss_mesh_select_80_160mhz(struct wpa_supplicant *wpa_s,
 				if (!chan)
 					continue;
 
-				if (chan->flag & HOSTAPD_CHAN_DISABLED)
+				if (chan->flag & (HOSTAPD_CHAN_DISABLED |
+						  HOSTAPD_CHAN_NO_IR |
+						  HOSTAPD_CHAN_RADAR))
 					continue;
-				if (chan->flag & (HOSTAPD_CHAN_RADAR |
-						  HOSTAPD_CHAN_NO_IR))
-					if (!dfs_enabled)
-						continue;
 
 				/* Found a suitable second segment for 80+80 */
 				chwidth = CONF_OPER_CHWIDTH_80P80MHZ;
@@ -3108,99 +3183,65 @@ static bool ibss_mesh_select_80_160mhz(struct wpa_supplicant *wpa_s,
 			vht_caps |= VHT_CAP_SUPP_CHAN_WIDTH_160MHZ;
 			seg0 = 114;
 		}
+	} else if (ssid->max_oper_chwidth == CONF_OPER_CHWIDTH_USE_HT) {
+		chwidth = CONF_OPER_CHWIDTH_USE_HT;
+		seg0 = channel + 2;
+#ifdef CONFIG_HT_OVERRIDES
+		if (ssid->disable_ht40)
+			seg0 = 0;
+#endif /* CONFIG_HT_OVERRIDES */
+	}
+
+#ifdef CONFIG_HE_OVERRIDES
+	if (ssid->disable_he) {
+		vht_freq.he_enabled = 0;
+		freq->he_enabled = 0;
+	}
+#endif /* CONFIG_HE_OVERRIDES */
+#ifdef CONFIG_EHT_OVERRIDES
+	if (ssid->disable_eht) {
+		vht_freq.eht_enabled = 0;
+		freq->eht_enabled = 0;
+	}
+#endif /* CONFIG_EHT_OVERRIDES */
+	freq->ru_punct_bitmap = ssid->ru_punct_bitmap;
+	freq->ru_punct_ofdma = 0; /* Default to disabled for mesh. */
+
+	if (ssid->ru_punct_bitmap && wpa_s->drv_capa_known) {
+		switch (chwidth) {
+		case CONF_OPER_CHWIDTH_320MHZ:
+			 break;
+		case CONF_OPER_CHWIDTH_160MHZ:
+			if (wpa_s->ru_punct_supp_bw == CONF_OPER_CHWIDTH_320MHZ)
+				freq->ru_punct_bitmap = 0;
+			break;
+		case CONF_OPER_CHWIDTH_80MHZ:
+			if ((wpa_s->ru_punct_supp_bw == CONF_OPER_CHWIDTH_160MHZ) ||
+			    (wpa_s->ru_punct_supp_bw == CONF_OPER_CHWIDTH_320MHZ))
+				freq->ru_punct_bitmap = 0;
+			break;
+		default:
+			freq->ru_punct_bitmap = 0;
+		}
 	}
 
-skip_80mhz:
 	if (hostapd_set_freq_params(&vht_freq, mode->mode, freq->freq,
 				    freq->channel, ssid->enable_edmg,
 				    ssid->edmg_channel, freq->ht_enabled,
-				    freq->vht_enabled, freq->he_enabled,
-				    freq->eht_enabled,
+				    vht_freq.vht_enabled, vht_freq.he_enabled,
+				    vht_freq.eht_enabled,
 				    freq->sec_channel_offset,
 				    chwidth, seg0, seg1, vht_caps,
 				    &mode->he_capab[ieee80211_mode],
 				    &mode->eht_capab[ieee80211_mode], 0,
 				    freq->ru_punct_bitmap,
 				    freq->ru_punct_ofdma) != 0)
-		return false;
-
-	*freq = vht_freq;
-
-	wpa_printf(MSG_DEBUG, "IBSS: VHT setup freq cf1 %d, cf2 %d, bw %d",
-		   freq->center_freq1, freq->center_freq2, freq->bandwidth);
-	return true;
-}
-
-
-void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
-			  const struct wpa_ssid *ssid,
-			  struct hostapd_freq_params *freq)
-{
-	int ieee80211_mode = wpas_mode_to_ieee80211_mode(ssid->mode);
-	enum hostapd_hw_mode hw_mode;
-	struct hostapd_hw_modes *mode = NULL;
-	int obss_scan = !(ssid->noscan);
-	u8 channel;
-	bool is_6ghz, is_24ghz;
-	bool dfs_enabled = wpa_s->conf->country[0] && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR);
-
-	freq->freq = ssid->frequency;
-
-	if (ssid->fixed_freq) {
-		obss_scan = 0;
-	}
-
-	if (ssid->mode == WPAS_MODE_IBSS && !ssid->fixed_freq) {
-		struct wpa_bss *bss = ibss_find_existing_bss(wpa_s, ssid);
-
-		if (bss) {
-			wpa_printf(MSG_DEBUG,
-				   "IBSS already found in scan results, adjust control freq: %d",
-				   bss->freq);
-			freq->freq = bss->freq;
-			obss_scan = 0;
-		}
-	}
-
-	hw_mode = ieee80211_freq_to_chan(freq->freq, &channel);
-	mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes,
-			hw_mode, is_6ghz_freq(ssid->frequency));
-
-	if (!mode)
 		return;
 
-	 is_24ghz = hw_mode == HOSTAPD_MODE_IEEE80211G ||
-		  hw_mode == HOSTAPD_MODE_IEEE80211B;
-
-	is_6ghz = is_6ghz_freq(freq->freq);
-
-	freq->ht_enabled = 0;
-	freq->vht_enabled = 0;
-	freq->he_enabled = 0;
-	freq->eht_enabled = 0;
-
-	if (!is_6ghz)
-		freq->ht_enabled = ibss_mesh_can_use_ht(wpa_s, ssid, mode);
-	if (freq->ht_enabled)
-		freq->vht_enabled = ibss_mesh_can_use_vht(wpa_s, ssid, mode);
-	if (freq->vht_enabled || is_6ghz)
-		freq->he_enabled = ibss_mesh_can_use_he(wpa_s, ssid, mode,
-							ieee80211_mode);
-	 if(is_24ghz)
-		ibss_mesh_setup_2G_he40(freq, mode, wpa_s,
-					 ssid, ieee80211_mode);
-	freq->channel = channel;
-	/* Setup higher BW only for 5 GHz */
-	if (mode->mode == HOSTAPD_MODE_IEEE80211A) {
-		ibss_mesh_select_40mhz(wpa_s, ssid, mode, freq, obss_scan, dfs_enabled);
-		if (!ibss_mesh_select_80_160mhz(wpa_s, ssid, mode, freq,
-						ieee80211_mode, is_6ghz, dfs_enabled))
-			freq->he_enabled = freq->vht_enabled = false;
-	}
+	*freq = vht_freq;
 
-	if (freq->he_enabled)
-		freq->eht_enabled = ibss_mesh_can_use_eht(wpa_s, ssid, mode,
-							  ieee80211_mode);
+	wpa_printf(MSG_DEBUG, "IBSS: VHT setup freq cf1 %d, cf2 %d, bw %d ru_punct_bitmap 0x%x",
+		   freq->center_freq1, freq->center_freq2, freq->bandwidth, freq->ru_punct_bitmap);
 }
 
 
@@ -6450,13 +6491,13 @@ void fst_wpa_supplicant_fill_iface_obj(struct wpa_supplicant *wpa_s,
 				       struct fst_wpa_obj *iface_obj)
 {
 	os_memset(iface_obj, 0, sizeof(*iface_obj));
-	iface_obj->ctx              = wpa_s;
-	iface_obj->get_bssid        = wpas_fst_get_bssid_cb;
+	iface_obj->ctx		    = wpa_s;
+	iface_obj->get_bssid	    = wpas_fst_get_bssid_cb;
 	iface_obj->get_channel_info = wpas_fst_get_channel_info_cb;
 	iface_obj->get_hw_modes     = wpas_fst_get_hw_modes;
-	iface_obj->set_ies          = wpas_fst_set_ies_cb;
-	iface_obj->send_action      = wpas_fst_send_action_cb;
-	iface_obj->get_mb_ie        = wpas_fst_get_mb_ie_cb;
+	iface_obj->set_ies	    = wpas_fst_set_ies_cb;
+	iface_obj->send_action	    = wpas_fst_send_action_cb;
+	iface_obj->get_mb_ie	    = wpas_fst_get_mb_ie_cb;
 	iface_obj->update_mb_ie     = wpas_fst_update_mb_ie_cb;
 	iface_obj->get_peer_first   = wpas_fst_get_peer_first;
 	iface_obj->get_peer_next    = wpas_fst_get_peer_next;
@@ -7614,7 +7655,7 @@ extern void supplicant_event(void *ctx, enum wpa_event_type event,
 			     union wpa_event_data *data);
 
 extern void supplicant_event_global(void *ctx, enum wpa_event_type event,
- 				 union wpa_event_data *data);
+				 union wpa_event_data *data);
 
 /**
  * wpa_supplicant_add_iface - Add a new network interface
@@ -7778,8 +7819,8 @@ const char * wpa_supplicant_get_eap_mode(struct wpa_supplicant *wpa_s)
 {
 	const char *eapol_method;
 
-        if (wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt) == 0 &&
-            wpa_s->key_mgmt != WPA_KEY_MGMT_IEEE8021X_NO_WPA) {
+	if (wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt) == 0 &&
+	    wpa_s->key_mgmt != WPA_KEY_MGMT_IEEE8021X_NO_WPA) {
 		return "NO-EAP";
 	}
 
-- 
2.17.1