summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/541-ath9k_ar9280_cold_reset.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-07 11:28:11 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-07 11:28:11 +0000
commitd8db515de0a58dd4ef09d52519d1df2c260a65f9 (patch)
tree591965ae3e7e4671400eff996096b8f4545d7338 /package/mac80211/patches/541-ath9k_ar9280_cold_reset.patch
parent6c242e52a8451894639dfd36b8744b7a84eaef95 (diff)
mac80211: update to wireless-testing 2012-02-06
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30346 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/541-ath9k_ar9280_cold_reset.patch')
-rw-r--r--package/mac80211/patches/541-ath9k_ar9280_cold_reset.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/package/mac80211/patches/541-ath9k_ar9280_cold_reset.patch b/package/mac80211/patches/541-ath9k_ar9280_cold_reset.patch
new file mode 100644
index 000000000..70889d69d
--- /dev/null
+++ b/package/mac80211/patches/541-ath9k_ar9280_cold_reset.patch
@@ -0,0 +1,23 @@
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -1394,10 +1394,16 @@ static bool ath9k_hw_set_reset_reg(struc
+ static bool ath9k_hw_chip_reset(struct ath_hw *ah,
+ struct ath9k_channel *chan)
+ {
+- if (AR_SREV_9280(ah) && ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL)) {
+- if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON))
+- return false;
+- } else if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_WARM))
++ int reset_type = ATH9K_RESET_WARM;
++
++ if (AR_SREV_9280(ah)) {
++ if (ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL))
++ reset_type = ATH9K_RESET_POWER_ON;
++ else
++ reset_type = ATH9K_RESET_COLD;
++ }
++
++ if (!ath9k_hw_set_reset_reg(ah, reset_type))
+ return false;
+
+ if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))