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

Handle 6 GHz channels in Supported Operating Classes with freq_list

Browse source 
Only the 2.4 and 5 GHz channels were handled previously when removing
operating classes from the Supported Operating Classes element based on
the freq_list parameter. Extend this to include the 6 GHz band as well.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2024-03-05 17:01:30 +02:00 • committed by Jouni Malinen
parent 9e90486bce
commit c00abc69f2
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wpa_supplicant/op_classes.c
View file

@ -320,6 +320,7 @@ static int wpas_op_class_supported(struct wpa_supplicant *wpa_s,
int z; int z;
int freq2 = 0; int freq2 = 0;
int freq5 = 0; int freq5 = 0;
bool freq6 = false;
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,
is_6ghz_op_class(op_class->op_class)); is_6ghz_op_class(op_class->op_class));
@ -334,7 +335,9 @@ static int wpas_op_class_supported(struct wpa_supplicant *wpa_s,
if (f == 0) if (f == 0)
break; /* end of list */ break; /* end of list */
if (f > 4000 && f < 6000) if (is_6ghz_freq(f))
freq6 = true;
else if (f > 4000 && f < 6000)
freq5 = 1; freq5 = 1;
else if (f > 2400 && f < 2500) else if (f > 2400 && f < 2500)
freq2 = 1; freq2 = 1;
@ -343,8 +346,11 @@ static int wpas_op_class_supported(struct wpa_supplicant *wpa_s,
/* No frequencies specified, can use anything hardware supports. /* No frequencies specified, can use anything hardware supports.
*/ */
freq2 = freq5 = 1; freq2 = freq5 = 1;
freq6 = true;
} }
if (is_6ghz_op_class(op_class->op_class) && !freq6)
return 0;
if (op_class->op_class >= 115 && op_class->op_class <= 130 && !freq5) if (op_class->op_class >= 115 && op_class->op_class <= 130 && !freq5)
return 0; return 0;
if (op_class->op_class >= 81 && op_class->op_class <= 84 && !freq2) if (op_class->op_class >= 81 && op_class->op_class <= 84 && !freq2)