blob: 288c0324fe73783ceff6ffa3e6fd734f8a50b7c0 [file] [log] [blame]
developerd0c89452024-10-11 16:53:27 +08001From 943c075154f8b6569f9c0fc2ecc39742ba652bce Mon Sep 17 00:00:00 2001
developerbd9fa1e2023-10-16 11:04:00 +08002From: Shayne Chen <shayne.chen@mediatek.com>
3Date: Tue, 19 Sep 2023 11:21:23 +0800
developerd0c89452024-10-11 16:53:27 +08004Subject: [PATCH 001/223] mtk: Revert "wifi: mt76: mt7996: fill txd by host
developer1a173672023-12-21 14:49:33 +08005 driver"
developerbd9fa1e2023-10-16 11:04:00 +08006
7This reverts commit 325a0c4931990d553487024c4f76c776492bdcc2.
8---
9 mt7996/mac.c | 13 +++++++++----
10 1 file changed, 9 insertions(+), 4 deletions(-)
11
12diff --git a/mt7996/mac.c b/mt7996/mac.c
developerd0c89452024-10-11 16:53:27 +080013index 4706ddef..29297c07 100644
developerbd9fa1e2023-10-16 11:04:00 +080014--- a/mt7996/mac.c
15+++ b/mt7996/mac.c
developerd0c89452024-10-11 16:53:27 +080016@@ -958,8 +958,11 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
developerbd9fa1e2023-10-16 11:04:00 +080017 return id;
18
19 pid = mt76_tx_status_skb_add(mdev, wcid, tx_info->skb);
20- mt7996_mac_write_txwi(dev, txwi_ptr, tx_info->skb, wcid, key,
21- pid, qid, 0);
22+ memset(txwi_ptr, 0, MT_TXD_SIZE);
23+ /* Transmit non qos data by 802.11 header and need to fill txd by host*/
24+ if (!is_8023 || pid >= MT_PACKET_ID_FIRST)
25+ mt7996_mac_write_txwi(dev, txwi_ptr, tx_info->skb, wcid, key,
26+ pid, qid, 0);
27
28 txp = (struct mt76_connac_txp_common *)(txwi + MT_TXD_SIZE);
29 for (i = 0; i < nbuf; i++) {
developerd0c89452024-10-11 16:53:27 +080030@@ -976,8 +979,10 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
developerbd9fa1e2023-10-16 11:04:00 +080031 }
32 txp->fw.nbuf = nbuf;
33
34- txp->fw.flags =
35- cpu_to_le16(MT_CT_INFO_FROM_HOST | MT_CT_INFO_APPLY_TXD);
36+ txp->fw.flags = cpu_to_le16(MT_CT_INFO_FROM_HOST);
37+
38+ if (!is_8023 || pid >= MT_PACKET_ID_FIRST)
39+ txp->fw.flags |= cpu_to_le16(MT_CT_INFO_APPLY_TXD);
40
41 if (!key)
42 txp->fw.flags |= cpu_to_le16(MT_CT_INFO_NONE_CIPHER_FRAME);
43--
developerd0c89452024-10-11 16:53:27 +0800442.45.2
developerbd9fa1e2023-10-16 11:04:00 +080045