]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mt76: mt7996: Fix mlink lookup in mt7996_tx_prepare_skb
authorLorenzo Bianconi <lorenzo@kernel.org>
Fri, 4 Jul 2025 13:08:09 +0000 (15:08 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Aug 2025 16:41:11 +0000 (18:41 +0200)
[ Upstream commit 59ea7af6f9ce218b86f9f46520819247c3a5f97b ]

Use proper link_id in mt7996_tx_prepare_skb routine for mlink lookup.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20250704-mt7996-mlo-fixes-v1-5-356456c73f43@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/mediatek/mt76/mt7996/mac.c

index 92148518f6a5158525cc46ab824a889f8787dc54..37b21ad828b966e53eb3905508f17a584f05c82a 100644 (file)
@@ -1084,9 +1084,9 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
                if (wcid->offchannel)
                        mlink = rcu_dereference(mvif->mt76.offchannel_link);
                if (!mlink)
-                       mlink = &mvif->deflink.mt76;
+                       mlink = rcu_dereference(mvif->mt76.link[wcid->link_id]);
 
-               txp->fw.bss_idx = mlink->idx;
+               txp->fw.bss_idx = mlink ? mlink->idx : mvif->deflink.mt76.idx;
        }
 
        txp->fw.token = cpu_to_le16(id);