mt76: stop the radar detector after leaving dfs channel

[ Upstream commit 4e58ef4b6d727abdb071f7799aef763f8d6f2ad8 ]

The radar detctor is used for dfs channel. So it will start after switching
to dfs channel and will stop after leaving. The TX will be blocked if radar
detctor isn't stopped in non-dfs channel.

This patch resets the dfs state to indicate the radar detector needs to be
stopped.

Signed-off-by: Xing Song <xing.song@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
index 8f1338dae21148acfcdcb07eaf14a7ffa231aaac..96667b7d722d56fcb8395c0c003066c66aa50f0e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
@@ -290,7 +290,8 @@ static void mt7615_init_dfs_state(struct mt7615_phy *phy)
        if (hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
                return;
 
-       if (!(chandef->chan->flags & IEEE80211_CHAN_RADAR))
+       if (!(chandef->chan->flags & IEEE80211_CHAN_RADAR) &&
+           !(mphy->chandef.chan->flags & IEEE80211_CHAN_RADAR))
                return;
 
        if (mphy->chandef.chan->center_freq == chandef->chan->center_freq &&

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index 6aca470e24013a8cca530b1e0d2f64982957cb3d..7a4f277a162238d0ca47439c572303e2c9f1af5b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -302,7 +302,8 @@ static void mt7915_init_dfs_state(struct mt7915_phy *phy)
        if (hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
                return;
 
-       if (!(chandef->chan->flags & IEEE80211_CHAN_RADAR))
+       if (!(chandef->chan->flags & IEEE80211_CHAN_RADAR) &&
+           !(mphy->chandef.chan->flags & IEEE80211_CHAN_RADAR))
                return;
 
        if (mphy->chandef.chan->center_freq == chandef->chan->center_freq &&