Commit c685034c authored Aug 31, 2023 by Shayne Chen Committed by Felix Fietkau Sep 30, 2023

wifi: mt76: fix per-band IEEE80211_CONF_MONITOR flag comparison



Use the correct ieee80211_conf of each band for IEEE80211_CONF_MONITOR
comparison.

Fixes: 24e69f6b ("mt76: fix monitor rx FCS error in DFS channel")
Fixes: 98686cd2 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices")
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

parent 413f05d6

drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2147,7 +2147,7 @@ int mt7615_mcu_set_chan_info(struct mt7615_phy *phy, int cmd)
		};

		if (cmd == MCU_EXT_CMD(SET_RX_PATH) \|\|
		dev->mt76.hw->conf.flags & IEEE80211_CONF_MONITOR)
		phy->mt76->hw->conf.flags & IEEE80211_CONF_MONITOR)
		req.switch_reason = CH_SWITCH_NORMAL;
		else if (phy->mt76->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
		req.switch_reason = CH_SWITCH_SCAN_BYPASS_DPD;

drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2742,7 +2742,7 @@ int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd)
		if (mt76_connac_spe_idx(phy->mt76->antenna_mask))
		req.tx_path_num = fls(phy->mt76->antenna_mask);

		if (dev->mt76.hw->conf.flags & IEEE80211_CONF_MONITOR)
		if (phy->mt76->hw->conf.flags & IEEE80211_CONF_MONITOR)
		req.switch_reason = CH_SWITCH_NORMAL;
		else if (phy->mt76->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL \|\|
		phy->mt76->hw->conf.flags & IEEE80211_CONF_IDLE)

drivers/net/wireless/mediatek/mt76/mt7996/mcu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3182,7 +3182,7 @@ int mt7996_mcu_set_chan_info(struct mt7996_phy *phy, u16 tag)
		.channel_band = ch_band[chandef->chan->band],
		};

		if (dev->mt76.hw->conf.flags & IEEE80211_CONF_MONITOR)
		if (phy->mt76->hw->conf.flags & IEEE80211_CONF_MONITOR)
		req.switch_reason = CH_SWITCH_NORMAL;
		else if (phy->mt76->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL \|\|
		phy->mt76->hw->conf.flags & IEEE80211_CONF_IDLE)