diff options
author | Keith Packard <keithp@keithp.com> | 2011-07-22 13:40:42 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-07-22 13:40:42 -0700 |
commit | df7976797fa9af161690dbf4dee81ed92cdc150f (patch) | |
tree | be6f04706d91cc80da4dbd3a5f5f2a174f1bdae3 /drivers/net/wireless/ath/ath9k/xmit.c | |
parent | f0b69efc29b024747a88ce020dada425e3193d5a (diff) | |
parent | 9c54c0dd948d715ccfd79e97d852f80eeb53254a (diff) |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/xmit.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 3779b8977d4..33443bcaa8d 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -671,7 +671,8 @@ static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid, * TODO - this could be improved to be dependent on the rate. * The hardware can keep up at lower rates, but not higher rates */ - if (fi->keyix != ATH9K_TXKEYIX_INVALID) + if ((fi->keyix != ATH9K_TXKEYIX_INVALID) && + !(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)) ndelim += ATH_AGGR_ENCRYPTDELIM; /* |