DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

MLD STA: Fix destination address for EAPOL frames

Browse source 
For MLO association, specify the destination address as the AP MLD MAC
address for sending EAPOL frames. Previously, this was set to the BSSID
in all cases (and hoped for the driver to map it to MLD MAC address when
needed).

Signed-off-by: Veerendranath Jakkam <quic_vjakkam@quicinc.com>
This commit is contained in:
Veerendranath Jakkam 2024-06-25 18:42:06 +05:30 committed by Jouni Malinen
parent 69d18ab9f2
commit bc43e75b2b
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
wpa_supplicant/wpas_glue.c
View file

@ -148,6 +148,7 @@ static int wpa_supplicant_eapol_send(void *ctx, int type, const u8 *buf,
{ {
struct wpa_supplicant *wpa_s = ctx; struct wpa_supplicant *wpa_s = ctx;
u8 *msg, *dst, bssid[ETH_ALEN]; u8 *msg, *dst, bssid[ETH_ALEN];
struct driver_sta_mlo_info drv_mlo;
size_t msglen; size_t msglen;
int res; int res;
@ -197,11 +198,16 @@ static int wpa_supplicant_eapol_send(void *ctx, int type, const u8 *buf,
if (is_zero_ether_addr(wpa_s->bssid)) { if (is_zero_ether_addr(wpa_s->bssid)) {
wpa_printf(MSG_DEBUG, "BSSID not set when trying to send an " wpa_printf(MSG_DEBUG, "BSSID not set when trying to send an "
"EAPOL frame"); "EAPOL frame");
os_memset(&drv_mlo, 0, sizeof(drv_mlo));
if (wpa_drv_get_bssid(wpa_s, bssid) == 0 && if (wpa_drv_get_bssid(wpa_s, bssid) == 0 &&
(!wpa_s->valid_links ||
wpas_drv_get_sta_mlo_info(wpa_s, &drv_mlo) == 0) &&
!is_zero_ether_addr(bssid)) { !is_zero_ether_addr(bssid)) {
dst = bssid; dst = drv_mlo.valid_links ? drv_mlo.ap_mld_addr : bssid;
wpa_printf(MSG_DEBUG, "Using current BSSID " MACSTR wpa_printf(MSG_DEBUG, "Using current %s " MACSTR
" from the driver as the EAPOL destination", " from the driver as the EAPOL destination",
drv_mlo.valid_links ? "AP MLD MAC address" :
"BSSID",
MAC2STR(dst)); MAC2STR(dst));
} else { } else {
dst = wpa_s->last_eapol_src; dst = wpa_s->last_eapol_src;
@ -211,9 +217,10 @@ static int wpa_supplicant_eapol_send(void *ctx, int type, const u8 *buf,
MAC2STR(dst)); MAC2STR(dst));
} }
} else { } else {
/* BSSID was already set (from (Re)Assoc event, so use it as /* BSSID was already set (from (Re)Assoc event, so use BSSID or
* the EAPOL destination. */ * AP MLD MAC address (in the case of MLO connection) as the
dst = wpa_s->bssid; * EAPOL destination. */
dst = wpa_s->valid_links ? wpa_s->ap_mld_addr : wpa_s->bssid;
} }
msg = wpa_alloc_eapol(wpa_s, type, buf, len, &msglen, NULL); msg = wpa_alloc_eapol(wpa_s, type, buf, len, &msglen, NULL);