mt76: mt7615: fix antenna selection for testmode tx_frames

Do not alter the tx/rx chain settings during channel setup, antennas are
remapped by the testmode specific register writes already

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index 897279b..30677d0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -2850,14 +2850,6 @@ int mt7615_mcu_set_chan_info(struct mt7615_phy *phy, int cmd)
                .center_chan2 = ieee80211_frequency_to_channel(freq2),
        };
 
-#ifdef CONFIG_NL80211_TESTMODE
-       if (dev->mt76.test.state == MT76_TM_STATE_TX_FRAMES &&
-           dev->mt76.test.tx_antenna_mask) {
-               req.tx_streams = hweight8(dev->mt76.test.tx_antenna_mask);
-               req.rx_streams_mask = dev->mt76.test.tx_antenna_mask;
-       }
-#endif
-
        if (dev->mt76.hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
                req.switch_reason = CH_SWITCH_SCAN_BYPASS_DPD;
        else if ((chandef->chan->flags & IEEE80211_CHAN_RADAR) &&

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/testmode.c b/drivers/net/wireless/mediatek/mt76/mt7615/testmode.c
index 2cfa58d..1a67c24 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/testmode.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/testmode.c
@@ -193,7 +193,7 @@ mt7615_tm_set_tx_antenna(struct mt7615_dev *dev, bool en)
        for (i = 0; i < 4; i++) {
                mt76_rmw_field(dev, MT_WF_PHY_RFINTF3_0(i),
                               MT_WF_PHY_RFINTF3_0_ANT,
-                              td->tx_antenna_mask & BIT(i) ? 0 : 0xa);
+                              (td->tx_antenna_mask & BIT(i)) ? 0 : 0xa);
 
        }