diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2011-12-02 22:08:52 +0100 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2011-12-06 16:07:07 -0500 |
| commit | aa5b549215f85cf48a7040bc9d33c4dae0c7d11a (patch) | |
| tree | 99558936788c104390443012594bd4de73be69c3 | |
| parent | iwlwifi: move ucode notification from iwl_priv to iwl_shared (diff) | |
| download | linux-dev-aa5b549215f85cf48a7040bc9d33c4dae0c7d11a.tar.xz linux-dev-aa5b549215f85cf48a7040bc9d33c4dae0c7d11a.zip | |
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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/mac80211/tx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index c4cb4a536e27..e74652d38245 100644 --- a/net/mac80211/tx.c +++ b/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); |