patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

net: wifi: Fix TWT interval

Browse source 
As we are using a generic validation function for limits, due to data
type mismatch the check for TWT interval overflow and fails.

Fix the data type and accordingly the maximum value in the help.

Signed-off-by: Krishna T <krishna.t@nordicsemi.no>
This commit is contained in:
Krishna T 2023-05-04 20:13:35 +05:30 committed by Fabio Baltieri
parent bb1ede6a9b
commit 2b48c92742
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -232,7 +232,7 @@ struct wifi_twt_params {
/* Flow ID is only 3 bits */
#define WIFI_MAX_TWT_FLOWS 8
#define WIFI_MAX_TWT_INTERVAL_US (ULONG_MAX - 1)
#define WIFI_MAX_TWT_INTERVAL_US (LONG_MAX - 1)
/* 256 (u8) * 1TU */
#define WIFI_MAX_TWT_WAKE_INTERVAL_US 262144
struct wifi_twt_flow_info {

8
subsys/net/l2/wifi/wifi_shell.c
View file

@ -59,7 +59,7 @@ static struct net_mgmt_event_callback wifi_shell_mgmt_cb;
} \
} while (false)
static bool parse_number(const struct shell *sh, long *param, char *str, int min, int max)
static bool parse_number(const struct shell *sh, long *param, char *str, long min, long max)
{
char *endptr;
char *str_tmp = str;
@ -70,7 +70,7 @@ static bool parse_number(const struct shell *sh, long *param, char *str, int min
return false;
}
if ((num) < (min) || (num) > (max)) {
print(sh, SHELL_WARNING, "Value out of range: %s, (%d-%d)", str_tmp, min, max);
print(sh, SHELL_WARNING, "Value out of range: %s, (%ld-%ld)", str_tmp, min, max);
return false;
}
*param = num;
@ -866,13 +866,13 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_cmd_ap,
SHELL_STATIC_SUBCMD_SET_CREATE(wifi_twt_ops,
SHELL_CMD(quick_setup, NULL, " Start a TWT flow with defaults:\n"
"<twt_wake_interval: 1-262144us> <twt_interval: 1us-2^64us>\n",
"<twt_wake_interval: 1-262144us> <twt_interval: 1us-2^31us>\n",
cmd_wifi_twt_setup_quick),
SHELL_CMD(setup, NULL, " Start a TWT flow:\n"
"<negotiation_type, 0: Individual, 1: Broadcast, 2: Wake TBTT>\n"
"<setup_cmd: 0: Request, 1: Suggest, 2: Demand>\n"
"<dialog_token: 1-255> <flow_id: 0-7> <responder: 0/1> <trigger: 0/1> <implicit:0/1> "
"<announce: 0/1> <twt_wake_interval: 1-262144us> <twt_interval: 1us-2^64us>\n",
"<announce: 0/1> <twt_wake_interval: 1-262144us> <twt_interval: 1us-2^31us>\n",
cmd_wifi_twt_setup),
SHELL_CMD(teardown, NULL, " Teardown a TWT flow:\n"
"<negotiation_type, 0: Individual, 1: Broadcast, 2: Wake TBTT>\n"