diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-11 20:55:54 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-11 20:55:54 +0000 |
| commit | 7746d05fee586a3ad19c57c51677d2a13e508593 (patch) | |
| tree | 9d6b6ac1607ce54451f80829df06e6f64c72a58e /package/mac80211/patches/573-ath9k_beacon_stop.patch | |
| parent | fdb9acb4b967831ced46cbfd8f01f7a251d49dbd (diff) | |
mac80211/ath9k: improve pending patches based on review feedback
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26041 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/573-ath9k_beacon_stop.patch')
| -rw-r--r-- | package/mac80211/patches/573-ath9k_beacon_stop.patch | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/package/mac80211/patches/573-ath9k_beacon_stop.patch b/package/mac80211/patches/573-ath9k_beacon_stop.patch index 7a9f63fc7..5574d1716 100644 --- a/package/mac80211/patches/573-ath9k_beacon_stop.patch +++ b/package/mac80211/patches/573-ath9k_beacon_stop.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c -@@ -170,84 +170,30 @@ void ath9k_hw_abort_tx_dma(struct ath_hw +@@ -171,84 +171,31 @@ void ath9k_hw_abort_tx_dma(struct ath_hw } EXPORT_SYMBOL(ath9k_hw_abort_tx_dma); @@ -34,11 +34,11 @@ REG_WRITE(ah, AR_Q_TXD, 1 << q); for (wait = wait_time; wait != 0; wait--) { - if (ath9k_hw_numtxpending(ah, q) == 0) - break; +- if (ath9k_hw_numtxpending(ah, q) == 0) +- break; - udelay(ATH9K_TIME_QUANTUM); - } - +- - if (ath9k_hw_numtxpending(ah, q)) { - ath_dbg(common, ATH_DBG_QUEUE, - "%s: Num of pending TX Frames %d on Q %d\n", @@ -73,11 +73,13 @@ - "Failed to stop TX DMA in 100 msec after killing last frame\n"); - break; - } -- udelay(ATH9K_TIME_QUANTUM); ++ if (wait != wait_time) + udelay(ATH9K_TIME_QUANTUM); - } -- + - REG_CLR_BIT(ah, AR_DIAG_SW, AR_DIAG_FORCE_CH_IDLE_HIGH); -+ udelay(ATH9K_TIME_QUANTUM); ++ if (ath9k_hw_numtxpending(ah, q) == 0) ++ break; } REG_WRITE(ah, AR_Q_TXD, 0); |