Skip to content

Commit df46792

Browse files
Johan Almbladhgregkh
authored andcommitted
mt76: mt7915: fix injected MPDU transmission to not use HW A-MSDU
[ Upstream commit 28225a6 ] Before, the hardware would be allowed to transmit injected 802.11 MPDUs as A-MSDU. This resulted in corrupted frames being transmitted. Now, injected MPDUs are transmitted as-is, without A-MSDU. The fix was verified with frame injection on MT7915 hardware, both with and without the injected frame being encrypted. If the hardware cannot do A-MSDU aggregation on MPDUs, this problem would also be present in the TX path where mac80211 does the 802.11 encapsulation. However, I have not observed any such problem when disabling IEEE80211_HW_SUPPORTS_TX_ENCAP_OFFLOAD to force that mode. Therefore this fix is isolated to injected frames only. The same A-MSDU logic is also present in the mt7921 driver, so it is likely that this fix should be applied there too. I do not have access to mt7921 hardware so I have not been able to test that. Signed-off-by: Johan Almbladh <johan.almbladh@anyfinetworks.com> Signed-off-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent e5ecdb0 commit df46792

File tree

1 file changed

+1
-0
lines changed
  • drivers/net/wireless/mediatek/mt76/mt7915

1 file changed

+1
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,7 @@ mt7915_mac_write_txwi_80211(struct mt7915_dev *dev, __le32 *txwi,
899899
val = MT_TXD3_SN_VALID |
900900
FIELD_PREP(MT_TXD3_SEQ, IEEE80211_SEQ_TO_SN(seqno));
901901
txwi[3] |= cpu_to_le32(val);
902+
txwi[7] &= ~cpu_to_le32(MT_TXD7_HW_AMSDU);
902903
}
903904

904905
val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |

0 commit comments

Comments
 (0)