62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
--- a/drivers/net/wireless/ath/ath9k/debug.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/debug.c
|
|
@@ -607,6 +607,28 @@ static ssize_t read_file_xmit(struct fil
|
|
return retval;
|
|
}
|
|
|
|
+static ssize_t print_queue(struct ath_softc *sc, struct ath_txq *txq,
|
|
+ char *buf, ssize_t size)
|
|
+{
|
|
+ ssize_t len = 0;
|
|
+
|
|
+ ath_txq_lock(sc, txq);
|
|
+
|
|
+ len += snprintf(buf + len, size - len, "%s: %d ",
|
|
+ "qnum", txq->axq_qnum);
|
|
+ len += snprintf(buf + len, size - len, "%s: %2d ",
|
|
+ "qdepth", txq->axq_depth);
|
|
+ len += snprintf(buf + len, size - len, "%s: %2d ",
|
|
+ "ampdu-depth", txq->axq_ampdu_depth);
|
|
+ len += snprintf(buf + len, size - len, "%s: %3d ",
|
|
+ "pending", txq->pending_frames);
|
|
+ len += snprintf(buf + len, size - len, "%s: %d\n",
|
|
+ "stopped", txq->stopped);
|
|
+
|
|
+ ath_txq_unlock(sc, txq);
|
|
+ return len;
|
|
+}
|
|
+
|
|
static ssize_t read_file_queues(struct file *file, char __user *user_buf,
|
|
size_t count, loff_t *ppos)
|
|
{
|
|
@@ -624,24 +646,13 @@ static ssize_t read_file_queues(struct f
|
|
|
|
for (i = 0; i < IEEE80211_NUM_ACS; i++) {
|
|
txq = sc->tx.txq_map[i];
|
|
- len += snprintf(buf + len, size - len, "(%s): ", qname[i]);
|
|
-
|
|
- ath_txq_lock(sc, txq);
|
|
-
|
|
- len += snprintf(buf + len, size - len, "%s: %d ",
|
|
- "qnum", txq->axq_qnum);
|
|
- len += snprintf(buf + len, size - len, "%s: %2d ",
|
|
- "qdepth", txq->axq_depth);
|
|
- len += snprintf(buf + len, size - len, "%s: %2d ",
|
|
- "ampdu-depth", txq->axq_ampdu_depth);
|
|
- len += snprintf(buf + len, size - len, "%s: %3d ",
|
|
- "pending", txq->pending_frames);
|
|
- len += snprintf(buf + len, size - len, "%s: %d\n",
|
|
- "stopped", txq->stopped);
|
|
-
|
|
- ath_txq_unlock(sc, txq);
|
|
+ len += snprintf(buf + len, size - len, "(%s): ", qname[i]);
|
|
+ len += print_queue(sc, txq, buf + len, size - len);
|
|
}
|
|
|
|
+ len += snprintf(buf + len, size - len, "(CAB): ");
|
|
+ len += print_queue(sc, sc->beacon.cabq, buf + len, size - len);
|
|
+
|
|
if (len > size)
|
|
len = size;
|
|
|