wifi: mt76: mt7996: Fix mt7996_reverse_frag0_hdr_trans for MLO

[ Upstream commit a3ea1c309bf32fdb3665898c40b3ff8ca29ba6c4 ]

Update mt7996_reverse_frag0_hdr_trans routine to support MLO.

Co-developed-by: Bo Jiao <Bo.Jiao@mediatek.com>
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Co-developed-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20250904-mt7996-mlo-more-fixes-v1-1-89d8fed67f20@kernel.org
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 28477702c18b3ddb307f5fe4b96804fb8b156f41..222e720a56cf51ff84353f48c6f4d2d453fdb82a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -229,7 +229,9 @@ static int mt7996_reverse_frag0_hdr_trans(struct sk_buff *skb, u16 hdr_gap)
 {
        struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;
        struct ethhdr *eth_hdr = (struct ethhdr *)(skb->data + hdr_gap);
-       struct mt7996_sta *msta = (struct mt7996_sta *)status->wcid;
+       struct mt7996_sta_link *msta_link = (void *)status->wcid;
+       struct mt7996_sta *msta = msta_link->sta;
+       struct ieee80211_bss_conf *link_conf;
        __le32 *rxd = (__le32 *)skb->data;
        struct ieee80211_sta *sta;
        struct ieee80211_vif *vif;
@@ -246,8 +248,11 @@ static int mt7996_reverse_frag0_hdr_trans(struct sk_buff *skb, u16 hdr_gap)
        if (!msta || !msta->vif)
                return -EINVAL;
 
-       sta = container_of((void *)msta, struct ieee80211_sta, drv_priv);
+       sta = wcid_to_sta(status->wcid);
        vif = container_of((void *)msta->vif, struct ieee80211_vif, drv_priv);
+       link_conf = rcu_dereference(vif->link_conf[msta_link->wcid.link_id]);
+       if (!link_conf)
+               return -EINVAL;
 
        /* store the info from RXD and ethhdr to avoid being overridden */
        frame_control = le32_get_bits(rxd[8], MT_RXD8_FRAME_CONTROL);
@@ -260,7 +265,7 @@ static int mt7996_reverse_frag0_hdr_trans(struct sk_buff *skb, u16 hdr_gap)
        switch (frame_control & (IEEE80211_FCTL_TODS |
                                 IEEE80211_FCTL_FROMDS)) {
        case 0:
-               ether_addr_copy(hdr.addr3, vif->bss_conf.bssid);
+               ether_addr_copy(hdr.addr3, link_conf->bssid);
                break;
        case IEEE80211_FCTL_FROMDS:
                ether_addr_copy(hdr.addr3, eth_hdr->h_source);