From 408a399aa4e44dfc16f1c9ee92df7aa96b1a4b4d Mon Sep 17 00:00:00 2001 From: Ilan Peer Date: Tue, 20 Feb 2024 14:18:09 +0100 Subject: [PATCH] nl80211: Explicitly differentiate between 5 GHz and 6 GHz modes When a device supports both the 5 GHz band and the 6 GHz band, these are reported as two separate modes, both with mode set to HOSTAPD_MODE_IEEE80211A. However, as these are different modes, each with its own characteristics, e.g., rates, capabilities etc., specifically differentiate between them by adding a flag to indicate whether the mode describes a 6 GHz band capabilities or not. Signed-off-by: Ilan Peer Signed-off-by: Benjamin Berg --- src/ap/hw_features.c | 8 ++------ src/drivers/driver.h | 5 +++++ src/drivers/driver_nl80211_capa.c | 11 +++++++++-- wpa_supplicant/wpa_supplicant.c | 3 +-- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c index 596f2f020..fd401d78a 100644 --- a/src/ap/hw_features.c +++ b/src/ap/hw_features.c @@ -107,9 +107,7 @@ int hostapd_get_hw_features(struct hostapd_iface *iface) */ orig_mode_valid = true; mode = iface->current_mode->mode; - is_6ghz = mode == HOSTAPD_MODE_IEEE80211A && - iface->current_mode->num_channels > 0 && - is_6ghz_freq(iface->current_mode->channels[0].freq); + is_6ghz = iface->current_mode->is_6ghz; iface->current_mode = NULL; } hostapd_free_hw_features(iface->hw_features, iface->num_hw_features); @@ -1070,9 +1068,7 @@ static bool skip_mode(struct hostapd_iface *iface, return true; if (is_6ghz_op_class(iface->conf->op_class) && iface->freq == 0 && - (mode->mode != HOSTAPD_MODE_IEEE80211A || - mode->num_channels == 0 || - !is_6ghz_freq(mode->channels[0].freq))) + !mode->is_6ghz) return true; return false; diff --git a/src/drivers/driver.h b/src/drivers/driver.h index ed76037d2..bbaf8eafa 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -246,6 +246,11 @@ struct hostapd_hw_modes { */ enum hostapd_hw_mode mode; + /** + * is_6ghz - Whether the mode information is for the 6 GHz band + */ + bool is_6ghz; + /** * num_channels - Number of entries in the channels array */ diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c index 59f1414ac..cef23b183 100644 --- a/src/drivers/driver_nl80211_capa.c +++ b/src/drivers/driver_nl80211_capa.c @@ -2156,6 +2156,9 @@ wpa_driver_nl80211_postprocess_modes(struct hostapd_hw_modes *modes, for (m = 0; m < *num_modes; m++) { if (!modes[m].num_channels) continue; + + modes[m].is_6ghz = false; + if (modes[m].channels[0].freq < 2000) { modes[m].num_channels = 0; continue; @@ -2167,10 +2170,14 @@ wpa_driver_nl80211_postprocess_modes(struct hostapd_hw_modes *modes, break; } } - } else if (modes[m].channels[0].freq > 50000) + } else if (modes[m].channels[0].freq > 50000) { modes[m].mode = HOSTAPD_MODE_IEEE80211AD; - else + } else if (is_6ghz_freq(modes[m].channels[0].freq)) { modes[m].mode = HOSTAPD_MODE_IEEE80211A; + modes[m].is_6ghz = true; + } else { + modes[m].mode = HOSTAPD_MODE_IEEE80211A; + } } /* Remove unsupported bands */ diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 91a213dac..cd37a20eb 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -9055,8 +9055,7 @@ struct hostapd_hw_modes * get_mode(struct hostapd_hw_modes *modes, if (modes[i].mode != mode || !modes[i].num_channels || !modes[i].channels) continue; - if ((!is_6ghz && !is_6ghz_freq(modes[i].channels[0].freq)) || - (is_6ghz && is_6ghz_freq(modes[i].channels[0].freq))) + if (is_6ghz == modes[i].is_6ghz) return &modes[i]; }