qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 03:50:37 +02:00
Code

ath9k: fix an uninitialized variable warning

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32734 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-07-15 15:20:26 +00:00
parent 1e55d88303
commit 09d999f54d
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
package/mac80211/patches/576-ath9k_rx_dma_stop_check.patch
View File

@ -1,15 +1,28 @@
--- a/drivers/net/wireless/ath/ath9k/mac.c --- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/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 @@ -689,7 +689,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
udelay(AH_TIME_QUANTUM); {
#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 (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, ath_err(common,
"DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x DMADBG_7=0x%08x\n", "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,