diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-01 16:11:33 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-01 16:11:33 +0000 |
| commit | 6dfcb18e8a1e3d6de5a280d46085b1f410bec53f (patch) | |
| tree | 18be7763159388664d1484e3a85870e929a2759a /package/mac80211/patches/300-pending_work.patch | |
| parent | be36aada21f3c2b0d7c50cc0bf627dc41b396382 (diff) | |
ath9k: merge an upstream patch that provides a minor throughput improvement on ar9003
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27339 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/300-pending_work.patch')
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index 8e78e1fba..0900596dc 100644 --- a/package/mac80211/patches/300-pending_work.patch +++ b/package/mac80211/patches/300-pending_work.patch @@ -347,7 +347,17 @@ } 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) { ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET, "tx hung, resetting the chip\n"); |