diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-09-15 17:55:16 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-09-15 17:55:16 +0000 |
commit | b65db4089dfd161286634ec82c7aaec11dc84ac4 (patch) | |
tree | aa6b1ef5eb5fa5afdaa907307757781f101bf85f /package/mac80211/patches/550-ath9k_ar9280_cold_reset.patch | |
parent | 9ac95ba999b6908e5d57d661c9ebe3f638ceaf6e (diff) | |
download | upstream-b65db4089dfd161286634ec82c7aaec11dc84ac4.tar.gz upstream-b65db4089dfd161286634ec82c7aaec11dc84ac4.tar.bz2 upstream-b65db4089dfd161286634ec82c7aaec11dc84ac4.zip |
mac80211: update to wireless-testing 2011-09-14
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28245 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/550-ath9k_ar9280_cold_reset.patch')
-rw-r--r-- | package/mac80211/patches/550-ath9k_ar9280_cold_reset.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/package/mac80211/patches/550-ath9k_ar9280_cold_reset.patch b/package/mac80211/patches/550-ath9k_ar9280_cold_reset.patch new file mode 100644 index 0000000000..bbc462077c --- /dev/null +++ b/package/mac80211/patches/550-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 +@@ -1371,10 +1371,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)) |