diff options
author | Rajkumar Manoharan <rmanoharan@atheros.com> | 2010-10-07 11:28:39 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-10-07 14:41:28 -0400 |
commit | 15a6321d1c0f8db561932cd99e1b9897981da71f (patch) | |
tree | ff00f48ec53ac86a34f3f4ffeffe078b6cc73500 /drivers | |
parent | 388ac775be95e510c2095ed6cd59422a5183a9fb (diff) |
ath9k_hw: Fix hw reset failure with HTC driver
The following commit removed DISABLE_REGWRITE_BUFFER ops. The unnecessary
REGWRITE_BUFFER_FLUSH was not removed properly which is causing failure on
hw reset.
Author: Felix Fietkau <nbd@openwrt.org>
Date: Tue Oct 5 12:03:42 2010 +0200
ath9k_hw: clean up register write buffering
Signed-off-by: Rajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c index e5784595bd0f..8c13479b17cd 100644 --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c | |||
@@ -491,8 +491,6 @@ bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q) | |||
491 | REG_WRITE(ah, AR_DMISC(q), | 491 | REG_WRITE(ah, AR_DMISC(q), |
492 | AR_D_MISC_CW_BKOFF_EN | AR_D_MISC_FRAG_WAIT_EN | 0x2); | 492 | AR_D_MISC_CW_BKOFF_EN | AR_D_MISC_FRAG_WAIT_EN | 0x2); |
493 | 493 | ||
494 | REGWRITE_BUFFER_FLUSH(ah); | ||
495 | |||
496 | if (qi->tqi_cbrPeriod) { | 494 | if (qi->tqi_cbrPeriod) { |
497 | REG_WRITE(ah, AR_QCBRCFG(q), | 495 | REG_WRITE(ah, AR_QCBRCFG(q), |
498 | SM(qi->tqi_cbrPeriod, AR_Q_CBRCFG_INTERVAL) | | 496 | SM(qi->tqi_cbrPeriod, AR_Q_CBRCFG_INTERVAL) | |
@@ -508,8 +506,6 @@ bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q) | |||
508 | AR_Q_RDYTIMECFG_EN); | 506 | AR_Q_RDYTIMECFG_EN); |
509 | } | 507 | } |
510 | 508 | ||
511 | REGWRITE_BUFFER_FLUSH(ah); | ||
512 | |||
513 | REG_WRITE(ah, AR_DCHNTIME(q), | 509 | REG_WRITE(ah, AR_DCHNTIME(q), |
514 | SM(qi->tqi_burstTime, AR_D_CHNTIME_DUR) | | 510 | SM(qi->tqi_burstTime, AR_D_CHNTIME_DUR) | |
515 | (qi->tqi_burstTime ? AR_D_CHNTIME_EN : 0)); | 511 | (qi->tqi_burstTime ? AR_D_CHNTIME_EN : 0)); |