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

Use freq_list to constrain supported operating class information

Browse source 
If a station is configured to allow only a subset of frequencies for an
association, the supported operating classes may need to be more limited
than what the hardware supports.

Signed-off-by: Ben Greear <greearb@candelatech.com>
This commit is contained in:
Ben Greear 2018-08-24 12:01:28 -07:00 committed by Jouni Malinen
parent cb828507f5
commit b06d60a902
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
wpa_supplicant/op_classes.c
View file

@ -215,11 +215,38 @@ static int wpas_op_class_supported(struct wpa_supplicant *wpa_s,
size_t i; size_t i;
struct hostapd_hw_modes *mode; struct hostapd_hw_modes *mode;
int found; int found;
int z;
int freq2 = 0;
int freq5 = 0;
mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, op_class->mode); mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, op_class->mode);
if (!mode) if (!mode)
return 0; return 0;
/* If we are configured to disable certain things, take that into
* account here. */
if (ssid->freq_list && ssid->freq_list[0]) {
for (z = 0; ; z++) {
int f = ssid->freq_list[z];
if (f == 0)
break; /* end of list */
if (f > 4000 && f < 6000)
freq5 = 1;
else if (f > 2400 && f < 2500)
freq2 = 1;
}
} else {
/* No frequencies specified, can use anything hardware supports.
*/
freq2 = freq5 = 1;
}
if (op_class->op_class >= 115 && op_class->op_class <= 130 && !freq5)
return 0;
if (op_class->op_class >= 81 && op_class->op_class <= 84 && !freq2)
return 0;
#ifdef CONFIG_HT_OVERRIDES #ifdef CONFIG_HT_OVERRIDES
if (ssid->disable_ht) { if (ssid->disable_ht) {
switch (op_class->op_class) { switch (op_class->op_class) {