diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2014-08-09 09:42:51 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2014-08-09 09:42:51 +0200 |
| commit | d4aae06b3367396512d7dd40d7c520bd271d455d (patch) | |
| tree | a593511e390fc9f0e93cef5f712e83b35a48ec46 /drivers/net/wireless | |
| parent | 1d0192e1dba127acf8fd93e3c7cccffb45437a9b (diff) | |
| parent | e21af7dfe5795138dc2466dc5684d3297acd48a9 (diff) | |
Merge tag 'v3.14.16' into v3.14-rt
This is the 3.14.16 stable release
Diffstat (limited to 'drivers/net/wireless')
| -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 0526ddff977d..0fe7674ad100 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -890,6 +890,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; |