diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-07-15 15:20:26 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-07-15 15:20:26 +0000 |
| commit | 934cc697681a4fb0fa90ad3c9f6e7ba223502d92 (patch) | |
| tree | 41e229f0933b9ee560cb9db816e387c612518967 /package/mac80211/patches | |
| parent | 03a6d65c37b4dd5481da48bdf11d3f9c714a6ef4 (diff) | |
| download | upstream-934cc697681a4fb0fa90ad3c9f6e7ba223502d92.tar.gz upstream-934cc697681a4fb0fa90ad3c9f6e7ba223502d92.tar.bz2 upstream-934cc697681a4fb0fa90ad3c9f6e7ba223502d92.zip | |
ath9k: fix an uninitialized variable warning
SVN-Revision: 32734
Diffstat (limited to 'package/mac80211/patches')
| -rw-r--r-- | package/mac80211/patches/576-ath9k_rx_dma_stop_check.patch | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/package/mac80211/patches/576-ath9k_rx_dma_stop_check.patch b/package/mac80211/patches/576-ath9k_rx_dma_stop_check.patch index b8280f68d7..606eb1c63d 100644 --- a/package/mac80211/patches/576-ath9k_rx_dma_stop_check.patch +++ b/package/mac80211/patches/576-ath9k_rx_dma_stop_check.patch @@ -1,15 +1,28 @@ --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c -@@ -718,6 +718,12 @@ bool ath9k_hw_stopdmarecv(struct ath_hw - udelay(AH_TIME_QUANTUM); +@@ -689,7 +689,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw + { + #define AH_RX_STOP_DMA_TIMEOUT 10000 /* usec */ + struct ath_common *common = ath9k_hw_common(ah); +- u32 mac_status, last_mac_status = 0; ++ u32 mac_status = 0, last_mac_status = 0; + int i; + + /* Enable access to the DMA observation bus */ +@@ -719,6 +719,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw } -+ if (!AR_SREV_9300_20_OR_LATER(ah) && (mac_status & 0x700) == 0) { -+ /* DMA is idle but the MAC is still stuck processing events */ -+ *reset = true; -+ return true; -+ } -+ if (i == 0) { ++ if (!AR_SREV_9300_20_OR_LATER(ah) && ++ (mac_status & 0x700) == 0) { ++ /* ++ * DMA is idle but the MAC is still stuck ++ * processing events ++ */ ++ *reset = true; ++ return true; ++ } ++ ath_err(common, "DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x DMADBG_7=0x%08x\n", + AH_RX_STOP_DMA_TIMEOUT / 1000, |