ath9k: improve tx dma fixes based on review feedback

[openwrt.git] / package / mac80211 / patches / 571-ath9k_fix_dma_stop.patch

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 (file)
--- 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
        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);
  
  }
  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;
 +
 +{
 +      int i, q;
 +


@@ -47,16 +47,12 @@
 +                      udelay(5);
 +              }
 +      }
 +                      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);
 +
 +      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);
 +
 +}
 +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);
  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);
  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);