---

yaml --- r: 265475 b: refs/heads/master c: 37ca633 h: refs/heads/master i: 265473: 843fa87 265471: 771a277 v: v3
git-mirror · Aug 9, 2011 · 84b357f · 84b357f
1 parent 8607f99
commit 84b357f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f96efb5cb16fc58fe0220a7d3c66b4450493935f
+refs/heads/master: 37ca63350709c9bdb273afda6a19f61b88572237
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/debug.h b/trunk/drivers/net/wireless/ath/ath6kl/debug.h
@@ -35,6 +35,7 @@ enum ATH6K_DEBUG_MASK {
 	ATH6KL_DBG_SCATTER	= BIT(12),    /* hif scatter tracing */
 	ATH6KL_DBG_WLAN_CFG     = BIT(13),    /* cfg80211 i/f file tracing */
 	ATH6KL_DBG_RAW_BYTES    = BIT(14),    /* dump tx/rx and wmi frames */
+	ATH6KL_DBG_AGGR		= BIT(15),    /* aggregation */
 	ATH6KL_DBG_ANY	        = 0xffffffff  /* enable all logs */
 };
 

diff --git a/trunk/drivers/net/wireless/ath/ath6kl/txrx.c b/trunk/drivers/net/wireless/ath/ath6kl/txrx.c
@@ -1250,8 +1250,13 @@ static void aggr_timeout(unsigned long arg)
 		if (!rxtid->aggr || !rxtid->timer_mon || rxtid->progress)
 			continue;
 
+		/*
+		 * FIXME: these timeouts happen quite fruently, something
+		 * line once within 60 seconds. Investigate why.
+		 */
 		stats->num_timeouts++;
-		ath6kl_err("aggr timeout (st %d end %d)\n",
+		ath6kl_dbg(ATH6KL_DBG_AGGR,
+			   "aggr timeout (st %d end %d)\n",
 			   rxtid->seq_next,
 			   ((rxtid->seq_next + rxtid->hold_q_sz-1) &
 			    ATH6KL_MAX_SEQ_NO));