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

MLD STA: Find partner links by BSSID and SSID

Browse source 
Non-AP MLD finds AP MLD's partner links by BSSID from the scan results.
However, if the scan results contain BSSs with the same BSSID but
different BSS information, the non-AP MLD might assign a wrong BSS to
one of the AP MLD's partner links.

Avoids the problem by using both BSSID and SSID to find the AP MLD's
partner links.

Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
This commit is contained in:
Michael-CY Lee 2024-04-09 14:50:23 +08:00 committed by Jouni Malinen
parent 6809f2b955
commit e7172e26d3
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wpa_supplicant/bss.c
View file

@ -1554,8 +1554,14 @@ wpa_bss_parse_ml_rnr_ap_info(struct wpa_supplicant *wpa_s,
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"MLD: Reported link not part of MLD"); "MLD: Reported link not part of MLD");
} else if (!(BIT(link_id) & *seen)) { } else if (!(BIT(link_id) & *seen)) {
struct wpa_bss *neigh_bss = struct wpa_bss *neigh_bss;
wpa_bss_get_bssid(wpa_s, pos + 1);
if (ssid && ssid->ssid_len)
neigh_bss = wpa_bss_get(wpa_s, pos + 1,
ssid->ssid,
ssid->ssid_len);
else
neigh_bss = wpa_bss_get_bssid(wpa_s, pos + 1);
*seen |= BIT(link_id); *seen |= BIT(link_id);
wpa_printf(MSG_DEBUG, "MLD: mld ID=%u, link ID=%u", wpa_printf(MSG_DEBUG, "MLD: mld ID=%u, link ID=%u",

19
wpa_supplicant/sme.c
View file

@ -392,7 +392,8 @@ static void wpas_ml_handle_removed_links(struct wpa_supplicant *wpa_s,
#ifdef CONFIG_TESTING_OPTIONS #ifdef CONFIG_TESTING_OPTIONS
static struct wpa_bss * wpas_ml_connect_pref(struct wpa_supplicant *wpa_s, static struct wpa_bss * wpas_ml_connect_pref(struct wpa_supplicant *wpa_s,
struct wpa_bss *bss) struct wpa_bss *bss,
struct wpa_ssid *ssid)
{ {
unsigned int low, high, i; unsigned int low, high, i;
@ -458,7 +459,11 @@ found:
MAC2STR(wpa_s->links[i].bssid)); MAC2STR(wpa_s->links[i].bssid));
/* Get the BSS entry and do the switch */ /* Get the BSS entry and do the switch */
bss = wpa_bss_get_bssid(wpa_s, wpa_s->links[i].bssid); if (ssid && ssid->ssid_len)
bss = wpa_bss_get(wpa_s, wpa_s->links[i].bssid, ssid->ssid,
ssid->ssid_len);
else
bss = wpa_bss_get_bssid(wpa_s, wpa_s->links[i].bssid);
wpa_s->mlo_assoc_link_id = i; wpa_s->mlo_assoc_link_id = i;
return bss; return bss;
@ -513,7 +518,7 @@ static int wpas_sme_ml_auth(struct wpa_supplicant *wpa_s,
static void wpas_sme_set_mlo_links(struct wpa_supplicant *wpa_s, static void wpas_sme_set_mlo_links(struct wpa_supplicant *wpa_s,
struct wpa_bss *bss) struct wpa_bss *bss, struct wpa_ssid *ssid)
{ {
u8 i; u8 i;
@ -530,6 +535,10 @@ static void wpas_sme_set_mlo_links(struct wpa_supplicant *wpa_s,
if (bss->mld_link_id == i) if (bss->mld_link_id == i)
wpa_s->links[i].bss = bss; wpa_s->links[i].bss = bss;
else if (ssid && ssid->ssid_len)
wpa_s->links[i].bss = wpa_bss_get(wpa_s, bssid,
ssid->ssid,
ssid->ssid_len);
else else
wpa_s->links[i].bss = wpa_bss_get_bssid(wpa_s, bssid); wpa_s->links[i].bss = wpa_bss_get_bssid(wpa_s, bssid);
} }
@ -574,10 +583,10 @@ static void sme_send_authentication(struct wpa_supplicant *wpa_s,
NULL, ssid, NULL) && NULL, ssid, NULL) &&
bss->valid_links) { bss->valid_links) {
wpa_printf(MSG_DEBUG, "MLD: In authentication"); wpa_printf(MSG_DEBUG, "MLD: In authentication");
wpas_sme_set_mlo_links(wpa_s, bss); wpas_sme_set_mlo_links(wpa_s, bss, ssid);
#ifdef CONFIG_TESTING_OPTIONS #ifdef CONFIG_TESTING_OPTIONS
bss = wpas_ml_connect_pref(wpa_s, bss); bss = wpas_ml_connect_pref(wpa_s, bss, ssid);
if (wpa_s->conf->mld_force_single_link) { if (wpa_s->conf->mld_force_single_link) {
wpa_printf(MSG_DEBUG, "MLD: Force single link"); wpa_printf(MSG_DEBUG, "MLD: Force single link");