RNR: Skip interfaces on the same radio for MBSSID

Do not include interfaces on the same radio in reduced neighbor
report elements (RNR) as multiple BSSID elements from the same
management frame already include these if MBSSID feature is enabled.

Signed-off-by: Aloka Dixit <quic_alokad@quicinc.com>

diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index 0142ee44acacfafe1fa28435b42ee360b5b44041..c5962abb04afb48169fba107c055bcc8586911af 100644 (file)
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -6550,7 +6550,8 @@ size_t hostapd_eid_rnr_len(struct hostapd_data *hapd, u32 type)
                        total_len += hostapd_eid_rnr_colocation_len(
                                hapd, &current_len);
 
-               if (hapd->conf->rnr && hapd->iface->num_bss > 1)
+               if (hapd->conf->rnr && hapd->iface->num_bss > 1 &&
+                   !hapd->iconf->mbssid)
                        total_len += hostapd_eid_rnr_iface_len(hapd, hapd,
                                                               &current_len);
                break;
@@ -6759,7 +6760,8 @@ u8 * hostapd_eid_rnr(struct hostapd_data *hapd, u8 *eid, u32 type)
                        eid = hostapd_eid_rnr_colocation(hapd, eid,
                                                         &current_len);
 
-               if (hapd->conf->rnr && hapd->iface->num_bss > 1)
+               if (hapd->conf->rnr && hapd->iface->num_bss > 1 &&
+                   !hapd->iconf->mbssid)
                        eid = hostapd_eid_rnr_iface(hapd, hapd, eid,
                                                    &current_len);
                break;