Commit 18688c80 authored by Felix Fietkau's avatar Felix Fietkau Committed by Johannes Berg
Browse files

mac80211: fix rate control for retransmitted frames 



Since retransmission clears info->control, rate control needs to be called
again, otherwise the driver might crash due to invalid rates.

Cc: stable@vger.kernel.org # 5.14+
Reported-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Reported-by: default avatarRobert W <rwbugreport@lost-in-the-void.net>
Fixes: 03c3911d ("mac80211: call ieee80211_tx_h_rate_ctrl() when dequeue")
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Tested-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Link: https://lore.kernel.org/r/20211122204323.9787-1-nbd@nbd.name


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent d5e568c3

net/mac80211/tx.c

+3 −3
Original line number Diff line number Diff line
@@ -1822,15 +1822,15 @@ static int invoke_tx_handlers_late(struct ieee80211_tx_data *tx) 
	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);