wifi: mac80211: chan: chandef is non-NULL for reserved

[ Upstream commit 9bf7079bc2271321fac467cae981c44e495b76b9 ]

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 <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240129194108.bad8ec1e76c8.I12287452f42c54baf75821e75491cf6d021af20a@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Stable-dep-of: d87c3ca0f8f1 ("wifi: mac80211: finish link init before RCU publish")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 68952752b5990f917f0257a241a0a650ca2e1463..31c4f112345ea42d697e04d3136b046aa392dff6 100644 (file)
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -89,11 +89,11 @@ ieee80211_chanctx_reserved_chandef(struct ieee80211_local *local,
 
        lockdep_assert_held(&local->chanctx_mtx);
 
+       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)