---

yaml --- r: 278623 b: refs/heads/master c: aa5b549 h: refs/heads/master i: 278621: 228feec 278619: 9fa83c5 278615: b2f1959 278607: 2574927 278591: 96f282b v: v3
git-mirror · Dec 6, 2011 · ba5eea7 · ba5eea7
1 parent c80b790
commit ba5eea7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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);