ath9k: merge an upstream patch that provides a minor throughput improvement on ar9003
SVN-Revision: 27339
This commit is contained in:
parent
dde7babe01
commit
aca1b30101
1 changed files with 11 additions and 1 deletions
|
@ -347,7 +347,17 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
|
static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
|
||||||
@@ -2169,7 +2166,9 @@ static void ath_tx_complete_poll_work(st
|
@@ -664,7 +661,8 @@ static int ath_compute_num_delims(struct
|
||||||
|
* 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;
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -2169,7 +2167,9 @@ static void ath_tx_complete_poll_work(st
|
||||||
if (needreset) {
|
if (needreset) {
|
||||||
ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET,
|
ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET,
|
||||||
"tx hung, resetting the chip\n");
|
"tx hung, resetting the chip\n");
|
||||||
|
|
Loading…
Reference in a new issue