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

nl80211: Explicitly differentiate between 5 GHz and 6 GHz modes

Browse source 
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 <ilan.peer@intel.com>
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
This commit is contained in:
Ilan Peer 2024-02-20 14:18:09 +01:00 committed by Jouni Malinen
parent b532201034
commit 408a399aa4
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ap/hw_features.c
View file

@ -107,9 +107,7 @@ int hostapd_get_hw_features(struct hostapd_iface *iface)
*/ */
orig_mode_valid = true; orig_mode_valid = true;
mode = iface->current_mode->mode; mode = iface->current_mode->mode;
is_6ghz = mode == HOSTAPD_MODE_IEEE80211A && is_6ghz = iface->current_mode->is_6ghz;
iface->current_mode->num_channels > 0 &&
is_6ghz_freq(iface->current_mode->channels[0].freq);
iface->current_mode = NULL; iface->current_mode = NULL;
} }
hostapd_free_hw_features(iface->hw_features, iface->num_hw_features); 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; return true;
if (is_6ghz_op_class(iface->conf->op_class) && iface->freq == 0 && if (is_6ghz_op_class(iface->conf->op_class) && iface->freq == 0 &&
(mode->mode != HOSTAPD_MODE_IEEE80211A || !mode->is_6ghz)
mode->num_channels == 0 ||
!is_6ghz_freq(mode->channels[0].freq)))
return true; return true;
return false; return false;

5
src/drivers/driver.h
View file

@ -246,6 +246,11 @@ struct hostapd_hw_modes {
*/ */
enum hostapd_hw_mode mode; 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 * num_channels - Number of entries in the channels array
*/ */

11
src/drivers/driver_nl80211_capa.c
View file

@ -2156,6 +2156,9 @@ wpa_driver_nl80211_postprocess_modes(struct hostapd_hw_modes *modes,
for (m = 0; m < *num_modes; m++) { for (m = 0; m < *num_modes; m++) {
if (!modes[m].num_channels) if (!modes[m].num_channels)
continue; continue;
modes[m].is_6ghz = false;
if (modes[m].channels[0].freq < 2000) { if (modes[m].channels[0].freq < 2000) {
modes[m].num_channels = 0; modes[m].num_channels = 0;
continue; continue;
@ -2167,10 +2170,14 @@ wpa_driver_nl80211_postprocess_modes(struct hostapd_hw_modes *modes,
break; break;
} }
} }
} else if (modes[m].channels[0].freq > 50000) } else if (modes[m].channels[0].freq > 50000) {
modes[m].mode = HOSTAPD_MODE_IEEE80211AD; 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].mode = HOSTAPD_MODE_IEEE80211A;
modes[m].is_6ghz = true;
} else {
modes[m].mode = HOSTAPD_MODE_IEEE80211A;
}
} }
/* Remove unsupported bands */ /* Remove unsupported bands */

3
wpa_supplicant/wpa_supplicant.c
View file

@ -9055,8 +9055,7 @@ struct hostapd_hw_modes * get_mode(struct hostapd_hw_modes *modes,
if (modes[i].mode != mode || if (modes[i].mode != mode ||
!modes[i].num_channels || !modes[i].channels) !modes[i].num_channels || !modes[i].channels)
continue; continue;
if ((!is_6ghz && !is_6ghz_freq(modes[i].channels[0].freq)) || if (is_6ghz == modes[i].is_6ghz)
(is_6ghz && is_6ghz_freq(modes[i].channels[0].freq)))
return &modes[i]; return &modes[i];
} }