[PATCH] mac80211: fix retransmit
From: Johannes Berg <johannes@sipsolutions.net>
Date: 2011-12-02 21:08:54
From: Johannes Berg <redacted> 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: Johannes Berg <redacted> --- net/mac80211/tx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
--- a/net/mac80211/tx.c 2011-12-02 22:01:28.000000000 +0100
+++ b/net/mac80211/tx.c 2011-12-02 22:05:54.000000000 +0100@@ -1326,8 +1326,11 @@ static int invoke_tx_handlers(struct iee if (!(tx->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL)) 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; + } CALL_TXH(ieee80211_tx_h_michael_mic_add); CALL_TXH(ieee80211_tx_h_sequence);