summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath5k/debug.c
diff options
context:
space:
mode:
authorBruno Randolf2010-09-17 04:36:40 +0200
committerJohn W. Linville2010-09-21 17:05:09 +0200
commitcfddc11c429a655e418ffc111372cc69dee6a1a5 (patch)
tree5e6490aa9accb4e713d4c102f38d34023136cecc /drivers/net/wireless/ath/ath5k/debug.c
parentath5k: Use four hardware queues (diff)
downloadkernel-qcow2-linux-cfddc11c429a655e418ffc111372cc69dee6a1a5.tar.gz
kernel-qcow2-linux-cfddc11c429a655e418ffc111372cc69dee6a1a5.tar.xz
kernel-qcow2-linux-cfddc11c429a655e418ffc111372cc69dee6a1a5.zip
ath5k: Fix queue debug file
Take txq lock in debug file and fix reporting of used buffers. Signed-off-by: Bruno Randolf <br1@einfach.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/debug.c')
-rw-r--r--drivers/net/wireless/ath/ath5k/debug.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index 1b7c6d7fde93..b2c610ba8b7e 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -763,7 +763,7 @@ static ssize_t read_file_queue(struct file *file, char __user *user_buf,
struct ath5k_txq *txq;
struct ath5k_buf *bf, *bf0;
- int i, n = 0;
+ int i, n;
len += snprintf(buf+len, sizeof(buf)-len,
"available txbuffers: %d\n", sc->txbuf_len);
@@ -777,9 +777,14 @@ static ssize_t read_file_queue(struct file *file, char __user *user_buf,
if (!txq->setup)
continue;
+ n = 0;
+ spin_lock_bh(&txq->lock);
list_for_each_entry_safe(bf, bf0, &txq->q, list)
n++;
- len += snprintf(buf+len, sizeof(buf)-len, " len: %d\n", n);
+ spin_unlock_bh(&txq->lock);
+
+ len += snprintf(buf+len, sizeof(buf)-len,
+ " len: %d bufs: %d\n", txq->txq_len, n);
}
if (len > sizeof(buf))