wifi: mt76: mt7996: disable AMSDU for non-data frames

[ Upstream commit 5d5edc09197cd8c705b42a73cdf8ba03db53c033 ]

Disable AMSDU for non-data frames to prevent TX token leak issues.

Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
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 b0d0ae5080e82f2c6c8d30bf2579587213975b96..73d46ec1181ae8b59a519cf5067ada4b5298ac19 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -757,6 +757,9 @@ mt7996_mac_write_txwi_8023(struct mt7996_dev *dev, __le32 *txwi,
              FIELD_PREP(MT_TXD2_SUB_TYPE, fc_stype);
 
        txwi[2] |= cpu_to_le32(val);
+
+       if (wcid->amsdu)
+               txwi[3] |= cpu_to_le32(MT_TXD3_HW_AMSDU);
 }
 
 static void
@@ -887,8 +890,6 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi,
                val |= MT_TXD3_PROTECT_FRAME;
        if (info->flags & IEEE80211_TX_CTL_NO_ACK)
                val |= MT_TXD3_NO_ACK;
-       if (wcid->amsdu)
-               val |= MT_TXD3_HW_AMSDU;
 
        txwi[3] = cpu_to_le32(val);
        txwi[4] = 0;