2024-01-29 18:48:44

by Johannes Berg

[permalink] [raw]
Subject: [PATCH 05/15] wifi: mac80211: chan: chandef is non-NULL for reserved

From: Johannes Berg <[email protected]>

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

Reviewed-by: Miriam Rachel Korenblit <[email protected]>
Signed-off-by: Johannes Berg <[email protected]>
---
net/mac80211/chan.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index cf6297ffaef3..6b82c79cf7a6 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)
--
2.43.0