From ba5eea732a0c53e6e0fded8b0c3346b94b274eca Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 2 Dec 2011 22:08:52 +0100
Subject: [PATCH] --- yaml --- r: 278623 b: refs/heads/master c:
 aa5b549215f85cf48a7040bc9d33c4dae0c7d11a h: refs/heads/master i:   278621:
 228feec2334d8f207ecf2d7998de328206fedad5   278619:
 9fa83c5e818e67b4eeb88eaaf95dcebf32a454e2   278615:
 b2f195973f15553eac73d815b087b9db32dbb245   278607:
 2574927c9fccbab20b4b8b5a5940cefdb22e42d4   278591:
 96f282be7e06aad94f494afe11a60642e44c6c9d v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/tx.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0cf9cfeeb31b..7c54baf26d94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79e3b16b7123018610f2754ce1bd219c5dd844f5
+refs/heads/master: aa5b549215f85cf48a7040bc9d33c4dae0c7d11a
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index c4cb4a536e27..e74652d38245 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -1332,8 +1332,11 @@ static int invoke_tx_handlers(struct ieee80211_tx_data *tx)
 	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);