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

net: wifi_mgmt: Fix size calculation for net_mgmt info

Browse source 
net_iface_status is larger than scan_result, causing
net_iface events to be dropped due to info exceeding
NET_EVENT_INFO_MAX_SIZE.

Signed-off-by: Noah Luskey <LuskeyNoah@gmail.com>
This commit is contained in:
Noah Luskey 2023-08-24 12:06:32 -04:00 committed by Carles Cufí
parent abb8ede0bc
commit e71840ed69
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -461,6 +461,19 @@ struct wifi_raw_scan_result {
uint8_t data[CONFIG_WIFI_MGMT_RAW_SCAN_RESULT_LENGTH];
};
#endif /* CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS */
/* for use in max info size calculations */
union wifi_mgmt_events {
struct wifi_scan_result scan_result;
struct wifi_status connect_status;
struct wifi_iface_status iface_status;
#ifdef CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS
struct wifi_raw_scan_result raw_scan_result;
#endif /* CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS */
struct wifi_twt_params twt_params;
};
#include <zephyr/net/net_if.h>
/** Scan result callback

5
subsys/net/ip/net_private.h
View file

@ -31,10 +31,7 @@ union net_mgmt_events {
struct net_if_dhcpv4 dhcpv4;
#endif /* CONFIG_NET_DHCPV4 */
#if defined(CONFIG_NET_L2_WIFI_MGMT)
struct wifi_scan_result wifi_scan_result;
#if defined(CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS)
struct wifi_raw_scan_result raw_scan_result;
#endif /* CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS */
union wifi_mgmt_events wifi;
#endif /* CONFIG_NET_L2_WIFI_MGMT */
#if defined(CONFIG_NET_IPV6)
struct net_event_ipv6_prefix ipv6_prefix;