From 84b357f59fb6295c87a40162b5f5f6dbac136415 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Thu, 21 Jul 2011 10:54:26 +0300 Subject: [PATCH] --- yaml --- r: 265475 b: refs/heads/master c: 37ca63350709c9bdb273afda6a19f61b88572237 h: refs/heads/master i: 265473: 843fa87cc9886b4acdfa3c6ca7afd094fbaafb96 265471: 771a27707552047ac97519729e20d0b85a727781 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/debug.h | 1 + trunk/drivers/net/wireless/ath/ath6kl/txrx.c | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4ab329c1c2f9..54ddddd3f81c 100644 --- 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 index 2e6058856a6a..66b399962f01 100644 --- 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 index 615b46d388f6..0cab1c1b6fd1 100644 --- 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));