Commit b642f4c5 authored by Deren Wu's avatar Deren Wu Committed by Felix Fietkau
Browse files

wifi: mt76: mt7921: fix skb leak by txs missing in AMSDU 



txs may be dropped if the frame is aggregated in AMSDU. When the problem
shows up, some SKBs would be hold in driver to cause network stopped
temporarily. Even if the problem can be recovered by txs timeout handling,
mt7921 still need to disable txs in AMSDU to avoid this issue.

Cc: stable@vger.kernel.org
Fixes: 163f4d22 ("mt76: mt7921: add MAC support")
Reviewed-by: default avatarShayne Chen <shayne.chen@mediatek.com>
Signed-off-by: default avatarDeren Wu <deren.wu@mediatek.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 9aecfa75

drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c

+5 −2
Original line number Diff line number Diff line
@@ -495,6 +495,7 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi, 
				    BSS_CHANGED_BEACON_ENABLED));

	bool inband_disc = !!(changed & (BSS_CHANGED_UNSOL_BCAST_PROBE_RESP |

					 BSS_CHANGED_FILS_DISCOVERY));

	bool amsdu_en = wcid->amsdu;



	if (vif) {

		struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
@@ -554,12 +555,14 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi, 
	txwi[4] = 0;



	val = FIELD_PREP(MT_TXD5_PID, pid);

	if (pid >= MT_PACKET_ID_FIRST)

	if (pid >= MT_PACKET_ID_FIRST) {

		val |= MT_TXD5_TX_STATUS_HOST;

		amsdu_en = amsdu_en && !is_mt7921(dev);

	}



	txwi[5] = cpu_to_le32(val);

	txwi[6] = 0;

	txwi[7] = wcid->amsdu ? cpu_to_le32(MT_TXD7_HW_AMSDU) : 0;

	txwi[7] = amsdu_en ? cpu_to_le32(MT_TXD7_HW_AMSDU) : 0;



	if (is_8023)

		mt76_connac2_mac_write_txwi_8023(txwi, skb, wcid);