This is a note to let you know that I've just added the patch titled
mac80211: fix rate control for retransmitted frames
to the 5.15-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:
mac80211-fix-rate-control-for-retransmitted-frames.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 18688c80ad8a8dd50523dc9276e929932cac86d4 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@xxxxxxxx>
Date: Mon, 22 Nov 2021 21:43:23 +0100
Subject: mac80211: fix rate control for retransmitted frames
From: Felix Fietkau <nbd@xxxxxxxx>
commit 18688c80ad8a8dd50523dc9276e929932cac86d4 upstream.
Since retransmission clears info->control, rate control needs to be called
again, otherwise the driver might crash due to invalid rates.
Cc: stable@xxxxxxxxxxxxxxx # 5.14+
Reported-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Reported-by: Robert W <rwbugreport@xxxxxxxxxxxxxxxxxxxx>
Fixes: 03c3911d2d67 ("mac80211: call ieee80211_tx_h_rate_ctrl() when dequeue")
Signed-off-by: Felix Fietkau <nbd@xxxxxxxx>
Tested-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
Link: https://lore.kernel.org/r/20211122204323.9787-1-nbd@xxxxxxxx
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/mac80211/tx.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1821,15 +1821,15 @@ static int invoke_tx_handlers_late(struc
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
ieee80211_tx_result res = TX_CONTINUE;
+ if (!ieee80211_hw_check(&tx->local->hw, HAS_RATE_CONTROL))
+ CALL_TXH(ieee80211_tx_h_rate_ctrl);
+
if (unlikely(info->flags & IEEE80211_TX_INTFL_RETRANSMISSION)) {
__skb_queue_tail(&tx->skbs, tx->skb);
tx->skb = NULL;
goto txh_done;
}
- if (!ieee80211_hw_check(&tx->local->hw, HAS_RATE_CONTROL))
- CALL_TXH(ieee80211_tx_h_rate_ctrl);
-
CALL_TXH(ieee80211_tx_h_michael_mic_add);
CALL_TXH(ieee80211_tx_h_sequence);
CALL_TXH(ieee80211_tx_h_fragment);
Patches currently in stable-queue which might be from nbd@xxxxxxxx are
queue-5.15/mac80211-fix-regression-in-ssn-handling-of-addba-tx.patch
queue-5.15/mac80211-fix-rate-control-for-retransmitted-frames.patch
queue-5.15/mac80211-send-addba-requests-using-the-tid-queue-of-the-aggregation-session.patch
