diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-07-17 15:39:38 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-07-17 15:39:41 +0200 |
| commit | 72bbe3d1c2d7a9e257956912040ffc7ba9f71e0d (patch) | |
| tree | 8f014bc8663c3e0eec3250ceb46ca18674e8932a /net/mac80211/tx.c | |
| parent | 322cd406da0b102dda9c0eec46181458a3667dbb (diff) | |
| parent | 923b352f19d9ea971ae2536eab55f5fc9e95fedf (diff) | |
| download | linux-stable-72bbe3d1c2d7a9e257956912040ffc7ba9f71e0d.tar.gz linux-stable-72bbe3d1c2d7a9e257956912040ffc7ba9f71e0d.tar.bz2 linux-stable-72bbe3d1c2d7a9e257956912040ffc7ba9f71e0d.zip | |
Merge branch 'mac80211' into mac80211-next
This is necessary to merge the new TDLS and mesh patches,
as they depend on some fixes.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index d14f3618069f..2079d480cd7b 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1113,7 +1113,9 @@ 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; + info->flags &= ~IEEE80211_TX_TEMPORARY_FLAGS | + IEEE80211_TX_CTL_NO_PS_BUFFER | + IEEE80211_TX_STATUS_EOSP; __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); |