AA: mac80211: merge ath9k fixes from bb

[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 567-ath9k_fix_init_nfcal.patch

diff --git a/package/mac80211/patches/567-ath9k_fix_init_nfcal.patch b/package/mac80211/patches/567-ath9k_fix_init_nfcal.patch
index 8a4be73ea189069f69573beae0f3700e8f17a63c..70ceca7bf11e377d36d3e9a78bbd4fa3e9096a7f 100644 (file)
--- a/package/mac80211/patches/567-ath9k_fix_init_nfcal.patch
+++ b/package/mac80211/patches/567-ath9k_fix_init_nfcal.patch
@@ -10,7 +10,7 @@
                set_bit(NFCAL_PENDING, &ah->caldata->cal_flags);
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
                set_bit(NFCAL_PENDING, &ah->caldata->cal_flags);
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c

-@@ -1969,8 +1969,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1972,8 +1972,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st

        if (ath9k_hw_mci_is_enabled(ah))
                ar9003_mci_check_bt(ah);
  
        if (ath9k_hw_mci_is_enabled(ah))
                ar9003_mci_check_bt(ah);