From: Shay Bar Date: Thu, 26 May 2022 07:13:22 +0000 (+0300) Subject: Fix RNR BSSID setting for own interfaces X-Git-Tag: hostap_2_11~1689 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01944c0957ba20ee1790eb2473cc5970f8b1f17e;p=thirdparty%2Fhostap.git Fix RNR BSSID setting for own interfaces bss->conf->bssid may be kept unset and will cause an empty BSSID field in RNR. Fix this to use own_addr instead. Signed-off-by: Shay Bar Signed-off-by: moran.daori --- diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c index 86761a266..a65a2964b 100644 --- a/src/ap/ieee802_11.c +++ b/src/ap/ieee802_11.c @@ -7516,7 +7516,7 @@ static u8 * hostapd_eid_rnr_iface(struct hostapd_data *hapd, break; *eid++ = RNR_NEIGHBOR_AP_OFFSET_UNKNOWN; - os_memcpy(eid, bss->conf->bssid, ETH_ALEN); + os_memcpy(eid, bss->own_addr, ETH_ALEN); eid += ETH_ALEN; os_memcpy(eid, &bss->conf->ssid.short_ssid, 4); eid += 4;