diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-06-13 13:33:39 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-06-13 13:33:39 +0000 |
| commit | 050a22b6b6249f8c2170bd79b6cf18a0b6186493 (patch) | |
| tree | 1e0a6b4dc52443ce68ae2757da0cf6e4674fbb16 /package/mac80211/patches/567-ath9k_fix_init_nfcal.patch | |
| parent | 006119faa07526ed204ac8f8c6968c1a38bd5e66 (diff) | |
| download | upstream-050a22b6b6249f8c2170bd79b6cf18a0b6186493.tar.gz upstream-050a22b6b6249f8c2170bd79b6cf18a0b6186493.tar.bz2 upstream-050a22b6b6249f8c2170bd79b6cf18a0b6186493.zip | |
AA: mac80211: sync with trunk r41181
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@41182 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.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/package/mac80211/patches/567-ath9k_fix_init_nfcal.patch b/package/mac80211/patches/567-ath9k_fix_init_nfcal.patch new file mode 100644 index 0000000000..8a4be73ea1 --- /dev/null +++ b/package/mac80211/patches/567-ath9k_fix_init_nfcal.patch @@ -0,0 +1,25 @@ +--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c ++++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c +@@ -854,6 +854,7 @@ static bool ar9002_hw_init_cal(struct at + + /* Do PA Calibration */ + ar9002_hw_pa_cal(ah, true); ++ ath9k_hw_start_nfcal(ah, true); + + if (ah->caldata) + 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 + if (ath9k_hw_mci_is_enabled(ah)) + ar9003_mci_check_bt(ah); + +- ath9k_hw_loadnf(ah, chan); +- ath9k_hw_start_nfcal(ah, true); ++ if (AR_SREV_9300_20_OR_LATER(ah)) { ++ ath9k_hw_loadnf(ah, chan); ++ ath9k_hw_start_nfcal(ah, true); ++ } + + if (AR_SREV_9300_20_OR_LATER(ah)) + ar9003_hw_bb_watchdog_config(ah); |