aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-09-22 11:36:38 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-09-22 11:36:38 +0000
commit4ea8a1f1f62369e3c3055d2cfd09e8d0e01c9766 (patch)
treeb7b2ab7270ddc7ffc69f7c24a3e918606d348794 /package/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch
parentad639a0cd548c1d3fdd5fab7d0f9bf938ba2a2d9 (diff)
downloadupstream-4ea8a1f1f62369e3c3055d2cfd09e8d0e01c9766.tar.gz
upstream-4ea8a1f1f62369e3c3055d2cfd09e8d0e01c9766.tar.bz2
upstream-4ea8a1f1f62369e3c3055d2cfd09e8d0e01c9766.zip
AA: mac80211: merge ath9k fixes from bbattitude_adjustment
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@42647 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch')
-rw-r--r--package/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch b/package/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch
index 10280d97ae..a3094c0f15 100644
--- a/package/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch
+++ b/package/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch
@@ -20,7 +20,7 @@
/******************/
/* Chip Revisions */
/******************/
-@@ -1337,6 +1350,9 @@ static bool ath9k_hw_set_reset(struct at
+@@ -1340,6 +1353,9 @@ static bool ath9k_hw_set_reset(struct at
if (AR_SREV_9100(ah))
udelay(50);
@@ -30,7 +30,7 @@
return true;
}
-@@ -1436,6 +1452,9 @@ static bool ath9k_hw_chip_reset(struct a
+@@ -1439,6 +1455,9 @@ static bool ath9k_hw_chip_reset(struct a
ar9003_hw_internal_regulator_apply(ah);
ath9k_hw_init_pll(ah, chan);
@@ -40,7 +40,7 @@
return true;
}
-@@ -1730,8 +1749,14 @@ static int ath9k_hw_do_fastcc(struct ath
+@@ -1733,8 +1752,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;
}
-@@ -1959,6 +1984,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1962,6 +1987,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);