From: Janusz Dziedzic Date: Wed, 16 Jul 2025 16:54:01 +0000 (+0200) Subject: wifi: mt76: mt7921: don't disconnect when CSA to DFS chan X-Git-Tag: v6.16.6~152 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eab71f6d9c9e3662657ce723a01a909832c59840;p=thirdparty%2Fkernel%2Fstable.git wifi: mt76: mt7921: don't disconnect when CSA to DFS chan [ Upstream commit 87f38519d27a514c9909f84b8f1334125df9778e ] When station mode, don't disconnect when we get channel switch from AP to DFS channel. Most APs send CSA request after pass background CAC. In other case we should disconnect after detect beacon miss. Without patch when we get CSA to DFS channel get: "kernel: wlo1: preparing for channel switch failed, disconnecting" Fixes: 8aa2f59260eb ("wifi: mt76: mt7921: introduce CSA support") Signed-off-by: Janusz Dziedzic Link: https://patch.msgid.link/20250716165443.28354-1-janusz.dziedzic@gmail.com Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c index 77f73ae1d7ecc..f6b431c422ebc 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c @@ -1457,11 +1457,8 @@ static int mt7921_pre_channel_switch(struct ieee80211_hw *hw, if (vif->type != NL80211_IFTYPE_STATION || !vif->cfg.assoc) return -EOPNOTSUPP; - /* Avoid beacon loss due to the CAC(Channel Availability Check) time - * of the AP. - */ if (!cfg80211_chandef_usable(hw->wiphy, &chsw->chandef, - IEEE80211_CHAN_RADAR)) + IEEE80211_CHAN_DISABLED)) return -EOPNOTSUPP; return 0;