Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa5b5492 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: fix retransmit 



This fixes another regression from my "pass all
fragments to driver at once" patches -- if the
packet is being retransmitted then we don't go
through all handlers, but we still need to move
it to the skbs list, otherwise we run into the
first warning in __ieee80211_tx() and leak the
skb.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 79e3b16b

net/mac80211/tx.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1332,8 +1332,11 @@ static int invoke_tx_handlers(struct ieee80211_tx_data *tx) 
	if (!(tx->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL))

	if (!(tx->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL))

		CALL_TXH(ieee80211_tx_h_rate_ctrl);

		CALL_TXH(ieee80211_tx_h_rate_ctrl);





	if (unlikely(info->flags & IEEE80211_TX_INTFL_RETRANSMISSION))

	if (unlikely(info->flags & IEEE80211_TX_INTFL_RETRANSMISSION)) {

		__skb_queue_tail(&tx->skbs, tx->skb);

		tx->skb = NULL;

		goto txh_done;

		goto txh_done;

	}





	CALL_TXH(ieee80211_tx_h_michael_mic_add);

	CALL_TXH(ieee80211_tx_h_michael_mic_add);

	CALL_TXH(ieee80211_tx_h_sequence);

	CALL_TXH(ieee80211_tx_h_sequence);