From: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Date: Sun, 11 Jan 2026 17:25:32 +0000 (+0200)
Subject: wifi: mac80211: don't send an unused argument to ieee80211_check_combinations
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33821a2b20b96886e8821ab7cd75b9e26c41b43d;p=thirdparty%2Fkernel%2Flinux.git

wifi: mac80211: don't send an unused argument to ieee80211_check_combinations

When ieee80211_check_combinations is called with NULL as the chandef,
the chanmode argument is not relevant. Send a don't care (0) instead.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20260111192411.9aa743647b43.I407b3d878d94464ce01e25f16c6e2b687bcd8b5a@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 27c234948fbee..6da32bd4c6c60 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -4409,7 +4409,7 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
 		goto out;
 
 	/* if reservation is invalid then this will fail */
-	err = ieee80211_check_combinations(sdata, NULL, chanctx->mode, 0, -1);
+	err = ieee80211_check_combinations(sdata, NULL, 0, 0, -1);
 	if (err) {
 		ieee80211_link_unreserve_chanctx(link_data);
 		goto out;