wifi: mt76: mt7996: fix chainmask calculation in mt7996_set_antenna()
authorShayne Chen <shayne.chen@mediatek.com>
Fri, 23 Dec 2022 10:13:45 +0000 (18:13 +0800)
committerFelix Fietkau <nbd@nbd.name>
Fri, 3 Feb 2023 13:47:16 +0000 (14:47 +0100)
Fix per-band chainmask when restoring from the dev chainmask.

Fixes: 98686cd21624 ("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>
drivers/net/wireless/mediatek/mt76/mt7996/main.c

index 4421cd5..c423b05 100644 (file)
@@ -880,7 +880,10 @@ mt7996_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)
        phy->mt76->antenna_mask = tx_ant;
 
        /* restore to the origin chainmask which might have auxiliary path */
-       if (hweight8(tx_ant) == max_nss)
+       if (hweight8(tx_ant) == max_nss && band_idx < MT_BAND2)
+               phy->mt76->chainmask = ((dev->chainmask >> shift) &
+                                       (BIT(dev->chainshift[band_idx + 1] - shift) - 1)) << shift;
+       else if (hweight8(tx_ant) == max_nss)
                phy->mt76->chainmask = (dev->chainmask >> shift) << shift;
        else
                phy->mt76->chainmask = tx_ant << shift;