@@ -310,14 +310,13 @@ void wpa_supplicant_stop_countermeasures(void *eloop_ctx, void *sock_ctx)
static void wpas_reset_mlo_info(struct wpa_supplicant *wpa_s)
{
- int i;
-
if (!wpa_s->valid_links)
return;
wpa_s->valid_links = 0;
- for (i = 0; i < MAX_NUM_MLD_LINKS; i++)
- wpa_s->links[i].bss = NULL;
+ wpa_s->mlo_assoc_link_id = 0;
+ os_memset(wpa_s->ap_mld_addr, 0, ETH_ALEN);
+ os_memset(wpa_s->links, 0, sizeof(wpa_s->links));
}
@@ -687,8 +687,8 @@ struct wpa_supplicant {
unsigned int assoc_freq;
u8 ap_mld_addr[ETH_ALEN];
u8 mlo_assoc_link_id;
- u8 valid_links; /* bitmap of valid MLO link IDs */
- struct {
+ u16 valid_links; /* bitmap of valid MLO link IDs */
+ struct ml_sta_link_info {
u8 addr[ETH_ALEN];
u8 bssid[ETH_ALEN];
unsigned int freq;
MAX_NUM_MLD_LINKS is 15, thus u8 isn't enough for the bitmap. Fix it. While at it, clean mlo information better. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> --- wpa_supplicant/events.c | 7 +++---- wpa_supplicant/wpa_supplicant_i.h | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-)