]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: mac80211: don't send an unused argument to ieee80211_check_combinations
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>
Sun, 11 Jan 2026 17:25:32 +0000 (19:25 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 12 Jan 2026 18:42:39 +0000 (19:42 +0100)
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>
net/mac80211/cfg.c

index 27c234948fbeef4181e8f13b70cb3028ee9ffd05..6da32bd4c6c60c98047b9c4d2b285f9a8f93f4ad 100644 (file)
@@ -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;