mac80211: merge version 2010-09-14 from trunk

[openwrt-10.03/.git] / package / mac80211 / patches / 408-ath9k_tweak_rx_intr_mitigation.patch

diff --git a/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch b/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch
index b900f411f6f8a4b800467687fbd6a8c438cc2cb4..64481fcc345a29523a6e31edd8f19e8be3eb95b6 100644 (file)
--- a/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch
+++ b/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2109,7 +2109,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1427,7 +1427,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
  
        if (ah->config.rx_intr_mitigation) {
                REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500);
@@ -8,4 +8,4 @@
 +              REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_FIRST, 500);
        }
  
-       ath9k_hw_init_bb(ah, chan);
+       if (ah->config.tx_intr_mitigation) {