]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
AP: Fix setting MLD Parameters subfield in RNR element
authorIlan Peer <ilan.peer@intel.com>
Tue, 12 Dec 2023 16:56:31 +0000 (18:56 +0200)
committerJouni Malinen <j@w1.fi>
Sat, 16 Dec 2023 15:56:42 +0000 (17:56 +0200)
In case the TBTT information is reporting about an AP in the same AP MLD
as the current AP, the AP MLD ID in the MLD Parameters subfield should
be set to 0.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
src/ap/ieee802_11.c

index e85b0635f318bd538d3f0c02edc0fedecb9ffa9a..2f8cb086ada31e7d5e6d869af99e44f48fc54ceb 100644 (file)
@@ -7586,7 +7586,13 @@ static u8 * hostapd_eid_rnr_iface(struct hostapd_data *hapd,
                                len += RNR_TBTT_INFO_LEN;
                        } else {
 #ifdef CONFIG_IEEE80211BE
-                               *eid++ = hapd->conf->mld_id;
+                               if (reporting_hapd->conf->mld_ap &&
+                                   bss->conf->mld_id ==
+                                   reporting_hapd->conf->mld_id)
+                                       *eid++ = 0;
+                               else
+                                       *eid++ = hapd->conf->mld_id;
+
                                *eid++ = hapd->mld_link_id | (1 << 4);
                                *eid++ = 0;
                                len += RNR_TBTT_INFO_MLD_LEN;