diff options
| author | Helmut Schaa <helmut.schaa@googlemail.com> | 2016-05-18 06:09:59 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-05-18 15:00:02 +0200 |
| commit | 21b04c623ecf901412c15b88d84ee75ec6064a35 (patch) | |
| tree | e4f79b8dae48deed096fdf49d4771c9e98a1a021 | |
| parent | 262cec2fb83845672605c1b2c94f6b5b12715e01 (diff) | |
| download | upstream-21b04c623ecf901412c15b88d84ee75ec6064a35.tar.gz upstream-21b04c623ecf901412c15b88d84ee75ec6064a35.tar.bz2 upstream-21b04c623ecf901412c15b88d84ee75ec6064a35.zip | |
ath9k: Fix TX99 support
The patch 300-ath9k-force-rx_clear-when-disabling-rx.patch broke TX99 support
in ath9k. Fix the patch by only applying rx_clear if TX99 mode is not used.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
| -rw-r--r-- | package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch b/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch index bddb15ad1a..9aa9d8bb13 100644 --- a/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch +++ b/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch @@ -3,15 +3,16 @@ Date: Sun, 7 Jun 2015 13:53:35 +0200 Subject: [PATCH] ath9k: force rx_clear when disabling rx This makes stopping Rx more reliable and should reduce the frequency of -Rx related DMA stop warnings +Rx related DMA stop warnings. Don't use rx_clear in TX99 mode. Cc: stable@vger.kernel.org Signed-off-by: Felix Fietkau <nbd@openwrt.org> +Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> --- --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c -@@ -677,13 +677,15 @@ void ath9k_hw_startpcureceive(struct ath +@@ -677,13 +677,18 @@ void ath9k_hw_startpcureceive(struct ath ath9k_ani_reset(ah, is_scanning); @@ -24,8 +25,11 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> void ath9k_hw_abortpcurecv(struct ath_hw *ah) { - REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_ABORT | AR_DIAG_RX_DIS); -+ REG_SET_BIT(ah, AR_DIAG_SW, -+ AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT | AR_DIAG_FORCE_RX_CLEAR); ++ u32 reg = AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT; ++ ++ if (!config_enabled(CPTCFG_ATH9K_TX99)) ++ reg |= AR_DIAG_FORCE_RX_CLEAR; ++ REG_SET_BIT(ah, AR_DIAG_SW, reg); ath9k_hw_disable_mib_counters(ah); } |