This is a note to let you know that I've just added the patch titled
mt76: mt7615: use ieee80211_free_txskb() in mt7615_tx_token_put()
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mt76-mt7615-use-ieee80211_free_txskb-in-mt7615_tx_token_put.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 06991d1f73a9bdbc5f234ee96737b9102705b89c Mon Sep 17 00:00:00 2001
From: Ryder Lee <ryder.lee@xxxxxxxxxxxx>
Date: Tue, 13 Apr 2021 16:00:07 +0800
Subject: mt76: mt7615: use ieee80211_free_txskb() in mt7615_tx_token_put()
From: Ryder Lee <ryder.lee@xxxxxxxxxxxx>
commit 06991d1f73a9bdbc5f234ee96737b9102705b89c upstream.
We should use ieee80211_free_txskb() to report skb status avoid wrong
aql accounting after reset.
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Ryder Lee <ryder.lee@xxxxxxxxxxxx>
Signed-off-by: Felix Fietkau <nbd@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -2106,8 +2106,12 @@ void mt7615_tx_token_put(struct mt7615_d
spin_lock_bh(&dev->token_lock);
idr_for_each_entry(&dev->token, txwi, id) {
mt7615_txp_skb_unmap(&dev->mt76, txwi);
- if (txwi->skb)
- dev_kfree_skb_any(txwi->skb);
+ if (txwi->skb) {
+ struct ieee80211_hw *hw;
+
+ hw = mt76_tx_status_get_hw(&dev->mt76, txwi->skb);
+ ieee80211_free_txskb(hw, txwi->skb);
+ }
mt76_put_txwi(&dev->mt76, txwi);
}
spin_unlock_bh(&dev->token_lock);
Patches currently in stable-queue which might be from ryder.lee@xxxxxxxxxxxx are
queue-5.10/mt76-mt7615-use-ieee80211_free_txskb-in-mt7615_tx_token_put.patch
