diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-22 14:36:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-22 14:36:18 -0700 |
| commit | db138908ccff404b9920f18f6244f4bff2368c04 (patch) | |
| tree | 18734f9b833a5f1134fc138a00d9223fc2afa028 /drivers/net/wireless/ath/ath9k/xmit.c | |
| parent | 04024b937a6e9b7d4320b5853557cea3930d528c (diff) | |
| parent | 8bc8aecdc5e26cfda12dbd6867af4aa67836da6a (diff) | |
| download | blackbird-op-linux-db138908ccff404b9920f18f6244f4bff2368c04.tar.gz blackbird-op-linux-db138908ccff404b9920f18f6244f4bff2368c04.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/xmit.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index ef22096d40c9..26734e53b37f 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -1725,8 +1725,8 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf, u8 tidno; spin_lock_bh(&txctl->txq->axq_lock); - - if (ieee80211_is_data_qos(hdr->frame_control) && txctl->an) { + if ((sc->sc_flags & SC_OP_TXAGGR) && txctl->an && + ieee80211_is_data_qos(hdr->frame_control)) { tidno = ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK; tid = ATH_AN_2_TID(txctl->an, tidno); |
