Skip to content

Commit 98fa445

Browse files
cmonroegregkh
authored andcommitted
wifi: mt76: mt7996: use the correct vif link for scanning/roc
[ Upstream commit 4be3b46 ] restore fix which was dropped during MLO rework Fixes: f0b0b23 ("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>
1 parent eb19d5f commit 98fa445

File tree

1 file changed

+6
-2
lines changed
  • drivers/net/wireless/mediatek/mt76/mt7996

1 file changed

+6
-2
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -903,8 +903,12 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi,
903903
IEEE80211_TX_CTRL_MLO_LINK);
904904

905905
mvif = vif ? (struct mt7996_vif *)vif->drv_priv : NULL;
906-
if (mvif)
907-
mlink = rcu_dereference(mvif->mt76.link[link_id]);
906+
if (mvif) {
907+
if (wcid->offchannel)
908+
mlink = rcu_dereference(mvif->mt76.offchannel_link);
909+
if (!mlink)
910+
mlink = rcu_dereference(mvif->mt76.link[link_id]);
911+
}
908912

909913
if (mlink) {
910914
omac_idx = mlink->omac_idx;

0 commit comments

Comments
 (0)