strict_strtoul is obsolete, use kstrtoul instead
[openwrt/svn-archive/archive.git] / package / kernel / mac80211 / patches / 563-ath9k_queue_cabq_debug.patch
1 --- a/drivers/net/wireless/ath/ath9k/debug.c
2 +++ b/drivers/net/wireless/ath/ath9k/debug.c
3 @@ -607,6 +607,28 @@ static ssize_t read_file_xmit(struct fil
4 return retval;
5 }
6
7 +static ssize_t print_queue(struct ath_softc *sc, struct ath_txq *txq,
8 + char *buf, ssize_t size)
9 +{
10 + ssize_t len = 0;
11 +
12 + ath_txq_lock(sc, txq);
13 +
14 + len += snprintf(buf + len, size - len, "%s: %d ",
15 + "qnum", txq->axq_qnum);
16 + len += snprintf(buf + len, size - len, "%s: %2d ",
17 + "qdepth", txq->axq_depth);
18 + len += snprintf(buf + len, size - len, "%s: %2d ",
19 + "ampdu-depth", txq->axq_ampdu_depth);
20 + len += snprintf(buf + len, size - len, "%s: %3d ",
21 + "pending", txq->pending_frames);
22 + len += snprintf(buf + len, size - len, "%s: %d\n",
23 + "stopped", txq->stopped);
24 +
25 + ath_txq_unlock(sc, txq);
26 + return len;
27 +}
28 +
29 static ssize_t read_file_queues(struct file *file, char __user *user_buf,
30 size_t count, loff_t *ppos)
31 {
32 @@ -624,24 +646,13 @@ static ssize_t read_file_queues(struct f
33
34 for (i = 0; i < IEEE80211_NUM_ACS; i++) {
35 txq = sc->tx.txq_map[i];
36 - len += snprintf(buf + len, size - len, "(%s): ", qname[i]);
37 -
38 - ath_txq_lock(sc, txq);
39 -
40 - len += snprintf(buf + len, size - len, "%s: %d ",
41 - "qnum", txq->axq_qnum);
42 - len += snprintf(buf + len, size - len, "%s: %2d ",
43 - "qdepth", txq->axq_depth);
44 - len += snprintf(buf + len, size - len, "%s: %2d ",
45 - "ampdu-depth", txq->axq_ampdu_depth);
46 - len += snprintf(buf + len, size - len, "%s: %3d ",
47 - "pending", txq->pending_frames);
48 - len += snprintf(buf + len, size - len, "%s: %d\n",
49 - "stopped", txq->stopped);
50 -
51 - ath_txq_unlock(sc, txq);
52 + len += snprintf(buf + len, size - len, "(%s): ", qname[i]);
53 + len += print_queue(sc, txq, buf + len, size - len);
54 }
55
56 + len += snprintf(buf + len, size - len, "(CAB): ");
57 + len += print_queue(sc, sc->beacon.cabq, buf + len, size - len);
58 +
59 if (len > size)
60 len = size;
61