diff options
| author |   Felix Fietkau <nbd@openwrt.org> | 2012-04-19 21:18:29 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2012-04-23 15:35:32 -0400 |
| commit | 8d1bd2afc5142fd64d805fc1ca7ce59e09b4bd0d (patch) | |
| tree | c34f5ae58b13297d1a755f34b59b9a9986d18760 /drivers/net/wireless/ath/ath9k/mac.c | |
| parent | ath9k_hw: disable fast channel change when changing from/to half/quarter mode (diff) | |
| download | linux-dev-8d1bd2afc5142fd64d805fc1ca7ce59e09b4bd0d.tar.xz linux-dev-8d1bd2afc5142fd64d805fc1ca7ce59e09b4bd0d.zip | |
ath9k_hw: increase tx abort timeout for half/quarter channels
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/mac.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c index f7bd2532269c..04ef775ccee1 100644 --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c @@ -133,8 +133,16 @@ EXPORT_SYMBOL(ath9k_hw_updatetxtriglevel); void ath9k_hw_abort_tx_dma(struct ath_hw *ah) { + int maxdelay = 1000; int i, q; + if (ah->curchan) { + if (IS_CHAN_HALF_RATE(ah->curchan)) + maxdelay *= 2; + else if (IS_CHAN_QUARTER_RATE(ah->curchan)) + maxdelay *= 4; + } + REG_WRITE(ah, AR_Q_TXD, AR_Q_TXD_M); REG_SET_BIT(ah, AR_PCU_MISC, AR_PCU_FORCE_QUIET_COLL | AR_PCU_CLEAR_VMF); @@ -142,7 +150,7 @@ void ath9k_hw_abort_tx_dma(struct ath_hw *ah) REG_SET_BIT(ah, AR_D_GBL_IFS_MISC, AR_D_GBL_IFS_MISC_IGNORE_BACKOFF); for (q = 0; q < AR_NUM_QCU; q++) { - for (i = 0; i < 1000; i++) { + for (i = 0; i < maxdelay; i++) { if (i) udelay(5); |