--- a/src/ap/ieee802_11.c +++ b/src/ap/ieee802_11.c @@ -7924,7 +7924,11 @@ if (!nr->nr || wpabuf_len(nr->nr) < 12) continue; - if (nr->short_ssid == hapd->conf->ssid.short_ssid) + /* Skip this BSS's own nr_db entry (hostapd_neighbor_set_own_report). + * Match by BSSID, not short_ssid: same-ESS remote APs must remain + * eligible for RNR; only avoid advertising ourselves. Other colocated + * BSS BSSIDs stay eligible. */ + if (ether_addr_equal(nr->bssid, hapd->own_addr)) continue; /* Start a new element */ @@ -8281,7 +8285,11 @@ if (!nr->nr || wpabuf_len(nr->nr) < 12) continue; - if (nr->short_ssid == hapd->conf->ssid.short_ssid) + /* Skip this BSS's own nr_db entry (hostapd_neighbor_set_own_report). + * Match by BSSID, not short_ssid: same-ESS remote APs must remain + * eligible for RNR; only avoid advertising ourselves. Other colocated + * BSS BSSIDs stay eligible. */ + if (ether_addr_equal(nr->bssid, hapd->own_addr)) continue; /* Start a new element */