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 <benjamin.berg@intel.com>
Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>

diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index 5a5be0ef4d8e0b1d5a31f230f2e20673570dd450..935ffd25ef31bd6816a077a54b1f3d0ec53c8e9d 100644 (file)
--- 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 3e4c10ff67ef5bc234bc402dcaf41b12a6de5cb2..530128c9c6408dceefd00b7806fc4bb4a85d2a6c 100644 (file)
--- 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))