[RFC,2/2] wifi: mac80211: chan: chandef is non-NULL for reserved

Commit Message

Johannes Berg Nov. 8, 2023, 11:30 p.m. UTC

From: Johannes Berg <[e-mail]>

The last caller of this with a NULL argument was related to
the non-chanctx code, so we can now remove this odd logic.

Signed-off-by: Johannes Berg <[e-mail]>
---
 net/mac80211/chan.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 0a08dc7b7976..085ea7ce5750 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -90,11 +90,11 @@  ieee80211_chanctx_reserved_chandef(struct ieee80211_local *local,
 
 	lockdep_assert_wiphy(local->hw.wiphy);
 
+	if (WARN_ON(!compat))
+		return NULL;
+
 	list_for_each_entry(link, &ctx->reserved_links,
 			    reserved_chanctx_list) {
-		if (!compat)
-			compat = &link->reserved_chandef;
-
 		compat = cfg80211_chandef_compatible(&link->reserved_chandef,
 						     compat);
 		if (!compat)