diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-07-25 18:22:36 +0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-07-25 18:22:36 +0400 |
commit | 9a244409d0b0cf3b1e46f1dc331f2c718597fae0 (patch) | |
tree | 5d5aa1964a1f97cb978a33b3533134ee624f90b6 /drivers | |
parent | bac9832076ee3b134bc859e07698c99276fc9459 (diff) | |
parent | c01fac1c77a00227f706a1654317023e3f4ac7f0 (diff) | |
download | linux-9a244409d0b0cf3b1e46f1dc331f2c718597fae0.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/cfg.c
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 36115298f64e..704fcbcbe20b 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -897,6 +897,15 @@ ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq, tx_info = IEEE80211_SKB_CB(skb); tx_info->flags &= ~IEEE80211_TX_CTL_CLEAR_PS_FILT; + + /* + * No aggregation session is running, but there may be frames + * from a previous session or a failed attempt in the queue. + * Send them out as normal data frames + */ + if (!tid->active) + tx_info->flags &= ~IEEE80211_TX_CTL_AMPDU; + if (!(tx_info->flags & IEEE80211_TX_CTL_AMPDU)) { bf->bf_state.bf_type = 0; return bf; |