From 4ea8a1f1f62369e3c3055d2cfd09e8d0e01c9766 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 22 Sep 2014 11:36:38 +0000 Subject: AA: mac80211: merge ath9k fixes from bb Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@42647 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch') 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); -- cgit v1.2.3