diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-03-10 13:37:26 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-03-10 13:37:26 +0000 |
| commit | 34f90988dd1604e1a32003d50e8fc31f247707a3 (patch) | |
| tree | de08a9a26b498453482689581b20aa1fe49cd9f8 /package/mac80211/patches/571-ath9k_fix_dma_stop.patch | |
| parent | deafde5632c37c2a43b761df46b06ababe5f33fa (diff) | |
| download | mtk-20170518-34f90988dd1604e1a32003d50e8fc31f247707a3.zip mtk-20170518-34f90988dd1604e1a32003d50e8fc31f247707a3.tar.gz mtk-20170518-34f90988dd1604e1a32003d50e8fc31f247707a3.tar.bz2 | |
ath9k: improve tx dma fixes based on review feedback
SVN-Revision: 26005
Diffstat (limited to 'package/mac80211/patches/571-ath9k_fix_dma_stop.patch')
| -rw-r--r-- | package/mac80211/patches/571-ath9k_fix_dma_stop.patch | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/package/mac80211/patches/571-ath9k_fix_dma_stop.patch b/package/mac80211/patches/571-ath9k_fix_dma_stop.patch index 698b05b..072e657 100644 --- a/package/mac80211/patches/571-ath9k_fix_dma_stop.patch +++ b/package/mac80211/patches/571-ath9k_fix_dma_stop.patch @@ -25,11 +25,11 @@ if (npend) --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c -@@ -143,6 +143,37 @@ bool ath9k_hw_updatetxtriglevel(struct a +@@ -143,6 +143,33 @@ bool ath9k_hw_updatetxtriglevel(struct a } EXPORT_SYMBOL(ath9k_hw_updatetxtriglevel); -+bool ath9k_hw_abort_tx_dma(struct ath_hw *ah) ++void ath9k_hw_abort_tx_dma(struct ath_hw *ah) +{ + int i, q; + @@ -47,16 +47,12 @@ + udelay(5); + } + } -+ if (!i) -+ return false; + + REG_CLR_BIT(ah, AR_PCU_MISC, AR_PCU_FORCE_QUIET_COLL | AR_PCU_CLEAR_VMF); + REG_CLR_BIT(ah, AR_DIAG_SW, AR_DIAG_FORCE_CH_IDLE_HIGH); + REG_CLR_BIT(ah, AR_D_GBL_IFS_MISC, AR_D_GBL_IFS_MISC_IGNORE_BACKOFF); + + REG_WRITE(ah, AR_Q_TXD, 0); -+ -+ return true; +} +EXPORT_SYMBOL(ath9k_hw_abort_tx_dma); + @@ -69,7 +65,7 @@ u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q); bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel); bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q); -+bool ath9k_hw_abort_tx_dma(struct ath_hw *ah); ++void ath9k_hw_abort_tx_dma(struct ath_hw *ah); void ath9k_hw_gettxintrtxqs(struct ath_hw *ah, u32 *txqs); bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q, const struct ath9k_tx_queue_info *qinfo); |