mt76: dma: use ieee80211_tx_status_ext to free packets when tx fails

BugLink: https://bugs.launchpad.net/bugs/1939450
[ Upstream commit 94e4f5794627a80ce036c35b32a9900daeb31be3 ]

Fixes AQL issues on full queues, especially with 802.3 encap offload

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
index 28611e7a4d392a53af152fa07f6e3c5d3380faa5..517290eb64f35d43827fc0698c0059af1f9a47a7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/dma.c
@@ -340,6 +340,9 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,
                      struct sk_buff *skb, struct mt76_wcid *wcid,
                      struct ieee80211_sta *sta)
 {
+       struct ieee80211_tx_status status = {
+               .sta = sta,
+       };
        struct mt76_tx_info tx_info = {
                .skb = skb,
        };
@@ -351,11 +354,9 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,
        u8 *txwi;
 
        t = mt76_get_txwi(dev);
-       if (!t) {
-               hw = mt76_tx_status_get_hw(dev, skb);
-               ieee80211_free_txskb(hw, skb);
-               return -ENOMEM;
-       }
+       if (!t)
+               goto free_skb;
+
        txwi = mt76_get_txwi_ptr(dev, t);
 
        skb->prev = skb->next = NULL;
@@ -414,8 +415,13 @@ free:
                dev->test.tx_done--;
 #endif
 
-       dev_kfree_skb(tx_info.skb);
        mt76_put_txwi(dev, t);
+
+free_skb:
+       status.skb = tx_info.skb;
+       hw = mt76_tx_status_get_hw(dev, tx_info.skb);
+       ieee80211_tx_status_ext(hw, &status);
+
        return ret;
 }