michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: wifi_mgmt: change type of wifi_scan_params->chan

Browse source 
All WiFi channel numbers fit within a 8 bit number, as the maximum
allocated channel is 233. This halves the memory requirement.

Signed-off-by: Jordan Yates <jordan.yates@data61.csiro.au>
This commit is contained in:
Jordan Yates 2023-09-16 15:41:39 +10:00 • committed by Fabio Baltieri
commit dd090f06b7
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/zephyr/net/wifi_mgmt.h
View file

@ -252,7 +252,7 @@ struct wifi_scan_params {
* not conforming to regulatory restrictions etc. The invoker of the API should * not conforming to regulatory restrictions etc. The invoker of the API should
* ensure that the channels specified follow regulatory rules. * ensure that the channels specified follow regulatory rules.
*/ */
uint16_t chan[WIFI_FREQ_BAND_MAX + 1][WIFI_CHANNEL_MAX]; uint8_t chan[WIFI_FREQ_BAND_MAX + 1][WIFI_CHANNEL_MAX];
}; };
/** Wi-Fi scan result, each result is provided to the net_mgmt_event_callback /** Wi-Fi scan result, each result is provided to the net_mgmt_event_callback

2
include/zephyr/net/wifi_utils.h
View file

@ -100,7 +100,7 @@ int wifi_utils_parse_scan_ssids(char *scan_ssids_str,
* @retval -errno value in case of failure. * @retval -errno value in case of failure.
*/ */
int wifi_utils_parse_scan_chan(char *scan_chan_str, int wifi_utils_parse_scan_chan(char *scan_chan_str,
uint16_t chan[][WIFI_CHANNEL_MAX]); uint8_t chan[][WIFI_CHANNEL_MAX]);
/** /**
* @} * @}

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

@ -103,13 +103,13 @@ static bool wifi_utils_validate_chan(uint8_t band,
} }
static int wifi_utils_get_all_chans_in_range(uint16_t chan_start, static int wifi_utils_get_all_chans_in_range(uint8_t chan_start,
uint16_t chan_end, uint8_t chan_end,
uint16_t chan[][WIFI_CHANNEL_MAX], uint8_t chan[][WIFI_CHANNEL_MAX],
uint8_t band_idx, uint8_t band_idx,
uint8_t *chan_idx) uint8_t *chan_idx)
{ {
uint16_t i; uint8_t i;
bool start = false; bool start = false;
bool end = false; bool end = false;
uint8_t idx; uint8_t idx;
@ -310,7 +310,7 @@ int wifi_utils_parse_scan_ssids(char *scan_ssids_str,
int wifi_utils_parse_scan_chan(char *scan_chan_str, int wifi_utils_parse_scan_chan(char *scan_chan_str,
uint16_t chan[][WIFI_CHANNEL_MAX]) uint8_t chan[][WIFI_CHANNEL_MAX])
{ {
char band_str[WIFI_UTILS_MAX_BAND_STR_LEN] = {0}; char band_str[WIFI_UTILS_MAX_BAND_STR_LEN] = {0};
char chan_str[WIFI_UTILS_MAX_CHAN_STR_LEN] = {0}; char chan_str[WIFI_UTILS_MAX_CHAN_STR_LEN] = {0};
@ -318,8 +318,8 @@ int wifi_utils_parse_scan_chan(char *scan_chan_str,
uint16_t band_str_start_idx = 0; uint16_t band_str_start_idx = 0;
uint16_t chan_str_start_idx = 0; uint16_t chan_str_start_idx = 0;
uint8_t chan_idx = 0; uint8_t chan_idx = 0;
uint16_t chan_start = 0; uint8_t chan_start = 0;
uint16_t chan_val = 0; uint8_t chan_val = 0;
uint16_t i = 0; uint16_t i = 0;
bool valid_band = false; bool valid_band = false;
bool valid_chan = false; bool valid_chan = false;