You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
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 (!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);
|
|
}
|