diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-10-09 15:48:03 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-10-09 15:48:03 +0000 |
| commit | 487bc0ebd7fed4086769ae684088185e565f29d6 (patch) | |
| tree | c6db5ac8890ff67cb9546cae8dc635cf263707ec /package/mac80211/patches/550-ath9k_ar9280_cold_reset.patch | |
| parent | f739d5952bf77a9c79fb2f46c27a9caf4398dca7 (diff) | |
mac80211: update to wireless-testing 2011-10-05 + pending patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28392 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, 0 insertions, 23 deletions
diff --git a/package/mac80211/patches/550-ath9k_ar9280_cold_reset.patch b/package/mac80211/patches/550-ath9k_ar9280_cold_reset.patch deleted file mode 100644 index bbc462077c..0000000000 --- a/package/mac80211/patches/550-ath9k_ar9280_cold_reset.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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)) |