wifi: mt76: mt7996: fix definition of tx descriptor

For mt7992 chipsets, the definition of TXD.DW6.BIT10~15 has different
interpretations on different frame types. Driver only needs to fill
MSDU_CNT for non-management frames.

Fixes: 408566db8cad ("wifi: mt76: connac: add new definition of tx descriptor")
Co-developed-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Benjamin Lin <benjamin-jw.lin@mediatek.com>
Link: https://patch.msgid.link/20250114101026.3587702-6-shayne.chen@mediatek.com
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index f5865d9688b7e3756e281d65e2dd3280c78b561d..bc8cba4dca47cf7b0c9eb448740773f1d4e1dab9 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -826,6 +826,7 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi,
                           struct ieee80211_key_conf *key, int pid,
                           enum mt76_txq_id qid, u32 changed)
 {
+       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
        struct ieee80211_vif *vif = info->control.vif;
        u8 band_idx = (info->hw_queue & MT_TX_HW_QUEUE_PHY) >> 2;
@@ -893,8 +894,9 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi,
        val = MT_TXD6_DIS_MAT | MT_TXD6_DAS;
        if (is_mt7996(&dev->mt76))
                val |= FIELD_PREP(MT_TXD6_MSDU_CNT, 1);
-       else
+       else if (is_8023 || !ieee80211_is_mgmt(hdr->frame_control))
                val |= FIELD_PREP(MT_TXD6_MSDU_CNT_V2, 1);
+
        txwi[6] = cpu_to_le32(val);
        txwi[7] = 0;
 
@@ -904,7 +906,6 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi,
                mt7996_mac_write_txwi_80211(dev, txwi, skb, key);
 
        if (txwi[1] & cpu_to_le32(MT_TXD1_FIXED_RATE)) {
-               struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
                bool mcast = ieee80211_is_data(hdr->frame_control) &&
                             is_multicast_ether_addr(hdr->addr1);
                u8 idx = MT7996_BASIC_RATES_TBL;