diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-01-09 01:45:28 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-01-10 09:43:34 +0100 |
| commit | 03c8c06f2d080b841ecbfc63253228ba6efcab08 (patch) | |
| tree | fa8d392dcace4dadbe93fe8c29f9b1aa2bf094cc /net/mac80211 | |
| parent | f9f760b4883d7fbfb463a67267e2be6b440d1aeb (diff) | |
| download | kernel-common-03c8c06f2d080b841ecbfc63253228ba6efcab08.tar.gz kernel-common-03c8c06f2d080b841ecbfc63253228ba6efcab08.tar.bz2 kernel-common-03c8c06f2d080b841ecbfc63253228ba6efcab08.zip | |
mac80211: reset TX info flags when frame will be reprocessed
The temporary TX info flags need to be cleared if the frame will
be processed through the TX handlers again, otherwise it can get
messed up. This fixes a bug that happened when an aggregation
session was stopped while the station was sleeping - some frames
might get transmitted marked as aggregation erroneously without
this fix.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/tx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 377cf974d97d..9f3cbf14989b 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -500,6 +500,7 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) info->control.jiffies = jiffies; info->control.vif = &tx->sdata->vif; info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING; + info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS; skb_queue_tail(&sta->ps_tx_buf[ac], tx->skb); if (!timer_pending(&local->sta_cleanup)) @@ -1073,6 +1074,7 @@ static bool ieee80211_tx_prep_agg(struct ieee80211_tx_data *tx, queued = true; info->control.vif = &tx->sdata->vif; info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING; + info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS; __skb_queue_tail(&tid_tx->pending, skb); if (skb_queue_len(&tid_tx->pending) > STA_MAX_TX_BUFFER) purge_skb = __skb_dequeue(&tid_tx->pending); |