diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-02-07 11:28:11 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-02-07 11:28:11 +0000 |
| commit | 2119054b0a501a065a656f106d3fec11f0c854d3 (patch) | |
| tree | 591965ae3e7e4671400eff996096b8f4545d7338 /package/mac80211/patches/542-ath9k_ar9280_cold_reset.patch | |
| parent | a633639fe6e9486f9403914cded6aff130c2e973 (diff) | |
| download | master-187ad058-2119054b0a501a065a656f106d3fec11f0c854d3.tar.gz master-187ad058-2119054b0a501a065a656f106d3fec11f0c854d3.tar.bz2 master-187ad058-2119054b0a501a065a656f106d3fec11f0c854d3.zip | |
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/542-ath9k_ar9280_cold_reset.patch')
| -rw-r--r-- | package/mac80211/patches/542-ath9k_ar9280_cold_reset.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/package/mac80211/patches/542-ath9k_ar9280_cold_reset.patch b/package/mac80211/patches/542-ath9k_ar9280_cold_reset.patch deleted file mode 100644 index 70889d69d6..0000000000 --- a/package/mac80211/patches/542-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 -@@ -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)) |