From 01944c0957ba20ee1790eb2473cc5970f8b1f17e Mon Sep 17 00:00:00 2001
From: Shay Bar <shay.bar@celeno.com>
Date: Thu, 26 May 2022 10:13:22 +0300
Subject: [PATCH] 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 <shay.bar@celeno.com>
Signed-off-by: moran.daori <moran.daori@celeno.com>
---
 src/ap/ieee802_11.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;