adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

net: wifi_utils: correct channel scan range in Wi-Fi 6GHz

Browse source 
Introduce `wifi_utils_get_next_chan_6g` to get the next
valid Wi-Fi 6GHz channel.

This commit addresses the proper handling of cases when
`chan_start` is not 1.

Fix #74063

Signed-off-by: Pisit Sawangvonganan <pisit@ndrsolution.com>
This commit is contained in:
Pisit Sawangvonganan 2024-08-07 18:53:24 +07:00 committed by Anas Nashif
parent ede19a4337
commit edbf8efeab
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
subsys/net/l2/wifi/wifi_utils.c
View file

@ -102,6 +102,23 @@ bool wifi_utils_validate_chan(uint8_t band,
return result;
}
/**
* @brief Get the next Wi-Fi 6GHz channel based on the given (valid) channel.
* The function handles the initial edge cases (1 -> 2, 2 -> 5) and then increments by 4.
*
* @param chan Current channel number.
* @return Next valid channel number.
*/
uint16_t wifi_utils_get_next_chan_6g(uint16_t chan)
{
if (chan == 1) {
return 2;
} else if (chan == 2) {
return 5;
} else {
return chan + 4;
}
}
static int wifi_utils_get_all_chans_in_range(uint8_t chan_start,
uint8_t chan_end,
@ -173,20 +190,14 @@ static int wifi_utils_get_all_chans_in_range(uint8_t chan_start,
case WIFI_FREQ_BAND_6_GHZ:
idx = *chan_idx;
i = chan_start+1;
i = wifi_utils_get_next_chan_6g(chan_start);
while (i <= chan_end) {
band_chan[idx].band = band_idx;
band_chan[idx].channel = i;
idx++;
if (i == 1) {
i++;
} else if (i == 2) {
i += 3;
} else {
i += 4;
}
i = wifi_utils_get_next_chan_6g(i);
}
*chan_idx = idx;