diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-01-30 13:21:36 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-01-30 13:21:36 +0000 |
commit | 9130ba35ea4e3c09ead64a7f5eb57aaf5b0694a6 (patch) | |
tree | 5f1204562d95c9f8f15137504a36ba3ded669320 /package/kernel/mac80211/patches/566-ath9k-ar933x-usb-hang-workaround.patch | |
parent | fdd820a54af9158b95ecfbb2209d6f3a934cf265 (diff) | |
download | upstream-9130ba35ea4e3c09ead64a7f5eb57aaf5b0694a6.tar.gz upstream-9130ba35ea4e3c09ead64a7f5eb57aaf5b0694a6.tar.bz2 upstream-9130ba35ea4e3c09ead64a7f5eb57aaf5b0694a6.zip |
mac80211: update to wireless-testing 2014-01-23
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39427 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/566-ath9k-ar933x-usb-hang-workaround.patch')
-rw-r--r-- | package/kernel/mac80211/patches/566-ath9k-ar933x-usb-hang-workaround.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/kernel/mac80211/patches/566-ath9k-ar933x-usb-hang-workaround.patch b/package/kernel/mac80211/patches/566-ath9k-ar933x-usb-hang-workaround.patch index 7608d481d7..289dda769c 100644 --- a/package/kernel/mac80211/patches/566-ath9k-ar933x-usb-hang-workaround.patch +++ b/package/kernel/mac80211/patches/566-ath9k-ar933x-usb-hang-workaround.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -269,6 +269,19 @@ void ath9k_hw_get_channel_centers(struct +@@ -217,6 +217,19 @@ void ath9k_hw_get_channel_centers(struct centers->synth_center + (extoff * HT40_CHANNEL_CENTER_SHIFT); } @@ -20,7 +20,7 @@ /******************/ /* Chip Revisions */ /******************/ -@@ -1357,6 +1370,9 @@ static bool ath9k_hw_set_reset(struct at +@@ -1337,6 +1350,9 @@ static bool ath9k_hw_set_reset(struct at if (AR_SREV_9100(ah)) udelay(50); @@ -30,9 +30,9 @@ return true; } -@@ -1457,6 +1473,9 @@ static bool ath9k_hw_chip_reset(struct a +@@ -1436,6 +1452,9 @@ static bool ath9k_hw_chip_reset(struct a + ar9003_hw_internal_regulator_apply(ah); ath9k_hw_init_pll(ah, chan); - ath9k_hw_set_rfmode(ah, chan); + if (AR_SREV_9330(ah) || AR_SREV_9340(ah)) + ath9k_hw_disable_pll_lock_detect(ah); @@ -40,7 +40,7 @@ return true; } -@@ -1817,8 +1836,14 @@ static int ath9k_hw_do_fastcc(struct ath +@@ -1725,8 +1744,14 @@ static int ath9k_hw_do_fastcc(struct ath if (AR_SREV_9271(ah)) ar9002_hw_load_ani_reg(ah, chan); @@ -55,7 +55,7 @@ return -EINVAL; } -@@ -2043,6 +2068,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st +@@ -1954,6 +1979,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st if (AR_SREV_9565(ah) && common->bt_ant_diversity) REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON); |