| developer | abdbf25 | 2023-02-06 16:02:21 +0800 | [diff] [blame] | 1 | From 9c2313ddded0179ae1a9e6112e2762a1a3e958d7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Shayne Chen <shayne.chen@mediatek.com> |
| 3 | Date: Fri, 3 Feb 2023 11:01:11 +0800 |
| 4 | Subject: [PATCH 2/7] Revert "wifi: mt76: mt7996: rely on |
| 5 | mt76_connac_txp_skb_unmap" |
| 6 | |
| 7 | This reverts commit bdb7dc38a6d150b5aa4b09b82a8954c6bb49ba4a. |
| 8 | --- |
| 9 | mt7996/mac.c | 14 +++++++++++++- |
| 10 | 1 file changed, 13 insertions(+), 1 deletion(-) |
| 11 | |
| 12 | diff --git a/mt7996/mac.c b/mt7996/mac.c |
| 13 | index 0d718598..df97d7cf 100644 |
| 14 | --- a/mt7996/mac.c |
| 15 | +++ b/mt7996/mac.c |
| 16 | @@ -1187,6 +1187,18 @@ mt7996_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi) |
| 17 | ieee80211_start_tx_ba_session(sta, tid, 0); |
| 18 | } |
| 19 | |
| 20 | +static void |
| 21 | +mt7996_txp_skb_unmap(struct mt76_dev *dev, struct mt76_txwi_cache *t) |
| 22 | +{ |
| 23 | + struct mt76_connac_txp_common *txp; |
| 24 | + int i; |
| 25 | + |
| 26 | + txp = mt7996_txwi_to_txp(dev, t); |
| 27 | + for (i = 0; i < txp->fw.nbuf; i++) |
| 28 | + dma_unmap_single(dev->dev, le32_to_cpu(txp->fw.buf[i]), |
| 29 | + le16_to_cpu(txp->fw.len[i]), DMA_TO_DEVICE); |
| 30 | +} |
| 31 | + |
| 32 | static void |
| 33 | mt7996_txwi_free(struct mt7996_dev *dev, struct mt76_txwi_cache *t, |
| 34 | struct ieee80211_sta *sta, struct list_head *free_list) |
| 35 | @@ -1196,7 +1208,7 @@ mt7996_txwi_free(struct mt7996_dev *dev, struct mt76_txwi_cache *t, |
| 36 | __le32 *txwi; |
| 37 | u16 wcid_idx; |
| 38 | |
| 39 | - mt76_connac_txp_skb_unmap(mdev, t); |
| 40 | + mt7996_txp_skb_unmap(mdev, t); |
| 41 | if (!t->skb) |
| 42 | goto out; |
| 43 | |
| 44 | -- |
| 45 | 2.25.1 |
| 46 | |