diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-03-10 12:59:24 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-03-10 12:59:24 +0000 |
| commit | e7f3111f2c324fefb55715a061b93af4e7991ae3 (patch) | |
| tree | 4b136ea41d399c790384cb9c99f5c6cffa99bb03 /package/mac80211/patches/541-ath9k_ar9280_cold_reset.patch | |
| parent | 43c8254ea249e359d6430862c481c30f9cac7f95 (diff) | |
| download | upstream-e7f3111f2c324fefb55715a061b93af4e7991ae3.tar.gz upstream-e7f3111f2c324fefb55715a061b93af4e7991ae3.tar.bz2 upstream-e7f3111f2c324fefb55715a061b93af4e7991ae3.zip | |
mac80211: reorganize patches, fold in patches that were merged upstream
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30863 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.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/package/mac80211/patches/541-ath9k_ar9280_cold_reset.patch b/package/mac80211/patches/541-ath9k_ar9280_cold_reset.patch deleted file mode 100644 index d6146e50a0..0000000000 --- a/package/mac80211/patches/541-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 -@@ -1395,10 +1395,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)) |