DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix mesh 6 GHz incorrect channel bandwidth

Browse source 
When the wiphy supports multiple bands and reports different capability
values between 5 GHz and 6 GHz channels, the 6 GHz mesh interface is
unable to correctly map the channel width in function
ibss_mesh_setup_freq(). This issue arises because the modes of 5 GHz and
6 GHz interfaces are the same (HOSTAPD_MODE_IEEE80211A) in supported
modes.

To address this, use function get_mode() to determine the appropriate
mode during mesh setup. This will iterates through all the hw_features
sets and ensures compatibility with the band of the channel supported in
hw_features set.

Signed-off-by: Harshitha Prem <quic_hprem@quicinc.com>
This commit is contained in:
Harshitha Prem 2024-07-12 13:04:21 +05:30 committed by Jouni Malinen
parent 454a22daba
commit 99e82880e8
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
wpa_supplicant/wpa_supplicant.c
View file

@ -3189,7 +3189,7 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
int ieee80211_mode = wpas_mode_to_ieee80211_mode(ssid->mode); int ieee80211_mode = wpas_mode_to_ieee80211_mode(ssid->mode);
enum hostapd_hw_mode hw_mode; enum hostapd_hw_mode hw_mode;
struct hostapd_hw_modes *mode = NULL; struct hostapd_hw_modes *mode = NULL;
int i, obss_scan = 1; int obss_scan = 1;
u8 channel; u8 channel;
bool is_6ghz, is_24ghz; bool is_6ghz, is_24ghz;
@ -3208,14 +3208,8 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
} }
hw_mode = ieee80211_freq_to_chan(freq->freq, &channel); hw_mode = ieee80211_freq_to_chan(freq->freq, &channel);
for (i = 0; wpa_s->hw.modes && i < wpa_s->hw.num_modes; i++) { mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes,
if (wpa_s->hw.modes[i].mode == hw_mode && hw_mode, is_6ghz_freq(ssid->frequency));
hw_mode_get_channel(&wpa_s->hw.modes[i], freq->freq,
NULL) != NULL) {
mode = &wpa_s->hw.modes[i];
break;
}
}
if (!mode) if (!mode)
return; return;