mt7996_mcu_rx_radar_detected() reports a radar with a NULL channel context, so mac80211 marks every channel context of the multi-radio wiphy. A radar on the 5 GHz band thus also ends the CAC on the other bands and is reported on their channels. Report the radar on the channel context of the radio that detected it. Fixes: 69d54ce7491d ("wifi: mt76: mt7996: switch to single multi-radio wiphy") Signed-off-by: Felix Fietkau --- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c index e56b60346fc4..b082998a4170 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c @@ -572,10 +572,16 @@ mt7996_mcu_rx_radar_detected(struct mt7996_dev *dev, struct sk_buff *skb) &dev->rdd2_chandef, GFP_ATOMIC); } else { + struct mt76_chanctx *ctx = READ_ONCE(mphy->chanctx); struct mt7996_phy *phy = mphy->priv; + struct ieee80211_chanctx_conf *conf; phy->rdd_tx_paused = true; - ieee80211_radar_detected(mphy->hw, NULL); + if (ctx) { + conf = container_of((void *)ctx, + struct ieee80211_chanctx_conf, drv_priv); + ieee80211_radar_detected(mphy->hw, conf); + } } dev->hw_pattern++; -- 2.47.3