aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/567-ath9k_fix_init_nfcal.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-09-22 11:36:38 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-09-22 11:36:38 +0000
commit4ea8a1f1f62369e3c3055d2cfd09e8d0e01c9766 (patch)
treeb7b2ab7270ddc7ffc69f7c24a3e918606d348794 /package/mac80211/patches/567-ath9k_fix_init_nfcal.patch
parentad639a0cd548c1d3fdd5fab7d0f9bf938ba2a2d9 (diff)
downloadupstream-4ea8a1f1f62369e3c3055d2cfd09e8d0e01c9766.tar.gz
upstream-4ea8a1f1f62369e3c3055d2cfd09e8d0e01c9766.tar.bz2
upstream-4ea8a1f1f62369e3c3055d2cfd09e8d0e01c9766.zip
AA: mac80211: merge ath9k fixes from bbattitude_adjustment
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@42647 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/567-ath9k_fix_init_nfcal.patch')
-rw-r--r--package/mac80211/patches/567-ath9k_fix_init_nfcal.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/mac80211/patches/567-ath9k_fix_init_nfcal.patch b/package/mac80211/patches/567-ath9k_fix_init_nfcal.patch
index 8a4be73ea1..70ceca7bf1 100644
--- 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
-@@ -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);