From d64ec941400e76ead39898dec96c6056bd3b92ec Mon Sep 17 00:00:00 2001 From: Andrei Otcheretianski Date: Tue, 21 Nov 2023 01:51:36 +0200 Subject: [PATCH] AP MLD: Don't include AP MLD ID in Beacon frames IEEE P802.11be/D4.0, 9.4.2.312.2.3 states that the AP MLD ID should only be included in some ML probe responses. Beacon frames shouldn't include AP MLD ID. Signed-off-by: Benjamin Berg Signed-off-by: Andrei Otcheretianski --- src/ap/beacon.c | 2 +- tests/hwsim/test_eht.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ap/beacon.c b/src/ap/beacon.c index 5a5be0ef4..935ffd25e 100644 --- a/src/ap/beacon.c +++ b/src/ap/beacon.c @@ -2289,7 +2289,7 @@ int ieee802_11_build_ap_params(struct hostapd_data *hapd, if (hapd->iconf->ieee80211be && !hapd->conf->disable_11be) { if (hapd->conf->mld_ap) tailpos = hostapd_eid_eht_ml_beacon(hapd, NULL, - tailpos, true); + tailpos, false); tailpos = hostapd_eid_eht_capab(hapd, tailpos, IEEE80211_MODE_AP); tailpos = hostapd_eid_eht_operation(hapd, tailpos); diff --git a/tests/hwsim/test_eht.py b/tests/hwsim/test_eht.py index 3e4c10ff6..530128c9c 100644 --- a/tests/hwsim/test_eht.py +++ b/tests/hwsim/test_eht.py @@ -250,7 +250,7 @@ def test_eht_mld_discovery(dev, apdev): rnr_pattern = re.compile(".*ap_info.*, mld ID=0, link ID=", re.MULTILINE) - ml_pattern = re.compile(".*multi-link:.*, MLD ID=0x0", re.MULTILINE) + ml_pattern = re.compile(".*multi-link:.*, MLD addr=.*", re.MULTILINE) bss = wpas.request("BSS " + hapd0.own_addr()) logger.info("BSS 0: " + str(bss))