lkml.org 
[lkml]   [2021]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.13 123/189] mt76: dma: use ieee80211_tx_status_ext to free packets when tx fails
    Date
    From: Felix Fietkau <nbd@nbd.name>

    [ 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>
    ---
    drivers/net/wireless/mediatek/mt76/dma.c | 18 ++++++++++++------
    1 file changed, 12 insertions(+), 6 deletions(-)

    diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
    index 72b1cc0ecfda..e5c324dd24f9 100644
    --- a/drivers/net/wireless/mediatek/mt76/dma.c
    +++ b/drivers/net/wireless/mediatek/mt76/dma.c
    @@ -349,6 +349,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,
    };
    @@ -360,11 +363,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;
    @@ -427,8 +428,13 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,
    }
    #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;
    }

    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-06 13:24    [W:5.855 / U:0.432 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site