diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-11-07 11:17:41 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-11-07 11:17:41 +0000 |
| commit | 62ca685194e2547b9159ebe220051c26fe4b7ece (patch) | |
| tree | eec1d2dea440f681e3ae2bd5bd5a5b27da188839 /package/kernel/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch | |
| parent | 258b5fe8e43f0959a4c525c0c8cac951a721339b (diff) | |
| download | upstream-62ca685194e2547b9159ebe220051c26fe4b7ece.tar.gz upstream-62ca685194e2547b9159ebe220051c26fe4b7ece.tar.bz2 upstream-62ca685194e2547b9159ebe220051c26fe4b7ece.zip | |
mac80211: merge a few pending upstream fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r43208
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@43209 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/kernel/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch b/package/kernel/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch index a3094c0f15..feadd2d2f9 100644 --- a/package/kernel/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch +++ b/package/kernel/mac80211/patches/551-ath9k-ar933x-usb-hang-workaround.patch @@ -20,7 +20,7 @@ /******************/ /* Chip Revisions */ /******************/ -@@ -1340,6 +1353,9 @@ static bool ath9k_hw_set_reset(struct at +@@ -1327,6 +1340,9 @@ static bool ath9k_hw_set_reset(struct at if (AR_SREV_9100(ah)) udelay(50); @@ -30,7 +30,7 @@ return true; } -@@ -1439,6 +1455,9 @@ static bool ath9k_hw_chip_reset(struct a +@@ -1426,6 +1442,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; } -@@ -1733,8 +1752,14 @@ static int ath9k_hw_do_fastcc(struct ath +@@ -1720,8 +1739,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; } -@@ -1962,6 +1987,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st +@@ -1949,6 +1974,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); |