AP: Do not iterate disabled interfaces when adding RNR

Message ID	20231226090625.477451-1-andrei.otcheretianski@intel.com
State	Changes Requested
Headers	show Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> From: Andrei Otcheretianski <andrei.otcheretianski@intel.com> To: hostap@lists.infradead.org Cc: Ilan Peer <ilan.peer@intel.com> Subject: [PATCH] AP: Do not iterate disabled interfaces when adding RNR Date: Tue, 26 Dec 2023 11:06:23 +0200 Message-ID: <20231226090625.477451-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 preview: From: Ilan Peer <ilan.peer@intel.com> Signed-off-by: Ilan Peer <ilan.peer@intel.com> --- src/ap/ieee802_11.c \| 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c index a939ad35e2..dc41f87da6 100644 --- a/src/ap/ieee802_11.c +++ b/src/ap/ieee802_11.c @@ -7403,6 +7403,9 @@ static size_t hostapd_eid_rnr_multi [...] Content analysis details: (-2.7 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [134.134.136.20 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [134.134.136.20 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Hostap" <hostap-bounces@lists.infradead.org> Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org
Series	AP: Do not iterate disabled interfaces when adding RNR \| expand AP: Do not iterate disabled interfaces when adding RNR

Message ID

20231226090625.477451-1-andrei.otcheretianski@intel.com

State

Changes Requested

Headers

From: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
To: hostap@lists.infradead.org
Cc: Ilan Peer <ilan.peer@intel.com>
Subject: [PATCH] AP: Do not iterate disabled interfaces when adding RNR
Date: Tue, 26 Dec 2023 11:06:23 +0200
Message-ID: <20231226090625.477451-1-andrei.otcheretianski@intel.com>
MIME-Version: 1.0
Precedence: list
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "Hostap" <hostap-bounces@lists.infradead.org>
Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org

Series

AP: Do not iterate disabled interfaces when adding RNR | expand

Comments

Jouni Malinen Jan. 13, 2024, 9:46 p.m. UTC | #1

On Tue, Dec 26, 2023 at 11:06:23AM +0200, Andrei Otcheretianski wrote:
> From: Ilan Peer <ilan.peer@intel.com>
> 
> Signed-off-by: Ilan Peer <ilan.peer@intel.com>

Could you please clarify why this should be done? That commit message
was not exactly helpful and these changes break the he_ap_ema test
case..

diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index a939ad35e2..dc41f87da6 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -7403,6 +7403,9 @@  static size_t hostapd_eid_rnr_multi_iface_len(struct hostapd_data *hapd,
 		iface = hapd->iface->interfaces->iface[i];
 		bool ap_mld = false;
 
+		if (iface->state != HAPD_IFACE_ENABLED)
+			continue;
+
 #ifdef CONFIG_IEEE80211BE
 		if (hapd->conf->mld_ap && iface->bss[0]->conf->mld_ap &&
 		    hapd->conf->mld_id == iface->bss[0]->conf->mld_id)
@@ -7612,6 +7615,9 @@  static u8 * hostapd_eid_rnr_iface(struct hostapd_data *hapd,
 	u8 tbtt_count = 0, op_class, channel;
 	bool ap_mld = false;
 
+	if (iface->state != HAPD_IFACE_ENABLED)
+		return eid;
+
 #ifdef CONFIG_IEEE80211BE
 	ap_mld = !!hapd->conf->mld_ap;
 #endif /* CONFIG_IEEE80211BE */
@@ -7676,6 +7682,9 @@  static u8 * hostapd_eid_rnr_multi_iface(struct hostapd_data *hapd, u8 *eid,
 		iface = hapd->iface->interfaces->iface[i];
 		bool ap_mld = false;
 
+		if (iface->state != HAPD_IFACE_ENABLED)
+			continue;
+
 #ifdef CONFIG_IEEE80211BE
 		if (hapd->conf->mld_ap && iface->bss[0]->conf->mld_ap &&
 		    hapd->conf->mld_id == iface->bss[0]->conf->mld_id)

AP: Do not iterate disabled interfaces when adding RNR

Commit Message

Comments

Patch