703515f889
Includes the following changes:9edff13abdmac80211: disable potentially harmful PS software retry for A-MPDU sessions75216a76b0mac80211: backport upstream fix for CSA in IBSS mode368cc8ef47mac80211: update brcmfmac backporting brcmf_err cleanups66a63d25c4mac80211: fix build on linux 3.189eacb9d7fcrt2x00: mt7620: lots of improvementsfd94fa61a7mac80211: brcmfmac: update Raspberry Pi patches for linux 4.9649e766a64mac80211: update to wireless-testing 2017-01-3147540afa5dath9k: add a warning to the tx99 config optionb367eef21dmac80211: rt2x00: add support for external LNA on MT76209200e168f2mac80211: move (& update) upstream accepted brcmfmac patches Signed-off-by: Felix Fietkau <nbd@nbd.name>
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From: Felix Fietkau <nbd@openwrt.org>
|
|
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. Don't use rx_clear in TX99 mode.
|
|
|
|
Cc: stable@vger.kernel.org
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
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,18 @@ void ath9k_hw_startpcureceive(struct ath
|
|
|
|
ath9k_ani_reset(ah, is_scanning);
|
|
|
|
- REG_CLR_BIT(ah, AR_DIAG_SW, (AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT));
|
|
+ REG_CLR_BIT(ah, AR_DIAG_SW,
|
|
+ AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT | AR_DIAG_FORCE_RX_CLEAR);
|
|
}
|
|
EXPORT_SYMBOL(ath9k_hw_startpcureceive);
|
|
|
|
void ath9k_hw_abortpcurecv(struct ath_hw *ah)
|
|
{
|
|
- REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_ABORT | AR_DIAG_RX_DIS);
|
|
+ u32 reg = AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT;
|
|
+
|
|
+ if (!IS_ENABLED(CPTCFG_ATH9K_TX99))
|
|
+ reg |= AR_DIAG_FORCE_RX_CLEAR;
|
|
+ REG_SET_BIT(ah, AR_DIAG_SW, reg);
|
|
|
|
ath9k_hw_disable_mib_counters(ah);
|
|
}
|