wifi: mt76: mt7996: use the correct vif link for scanning/roc

[ Upstream commit 4be3b46ec5190dc79cd38e3750480b2c66a791ad ]

restore fix which was dropped during MLO rework

Fixes: f0b0b239b8f3 ("wifi: mt76: mt7996: rework mt7996_mac_write_txwi() for MLO support")
Signed-off-by: Chad Monroe <chad@monroe.io>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/180fffd409aa57f535a3d2c1951e41ae398ce09e.1754659732.git.chad@monroe.io
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index f675cf537898a0fe32214cd84b04e8b67be2e8b5..b0fa051fc30941d459c1fa0c6042e4b5e7198620 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -903,8 +903,12 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi,
                                       IEEE80211_TX_CTRL_MLO_LINK);
 
        mvif = vif ? (struct mt7996_vif *)vif->drv_priv : NULL;
-       if (mvif)
-               mlink = rcu_dereference(mvif->mt76.link[link_id]);
+       if (mvif) {
+               if (wcid->offchannel)
+                       mlink = rcu_dereference(mvif->mt76.offchannel_link);
+               if (!mlink)
+                       mlink = rcu_dereference(mvif->mt76.link[link_id]);
+       }
 
        if (mlink) {
                omac_idx = mlink->omac_idx;