ath9k: merge an upstream patch that provides a minor throughput improvement on ar9003
authorFelix Fietkau <nbd@openwrt.org>
Fri, 1 Jul 2011 16:11:33 +0000 (16:11 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Fri, 1 Jul 2011 16:11:33 +0000 (16:11 +0000)
SVN-Revision: 27339

package/mac80211/patches/300-pending_work.patch

index 8e78e1fba3259555349aa3d1d5087c5add454d89..0900596dc980c44360dddf8c6b33304c00cd13c8 100644 (file)
  }
  
  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");