Re: ath9k: fix build with CONFIG_ATH9K_STATION_STATISTICS=y

2015-08-07 Thread Kalle Valo

 kbuild bot reported that commit 592fa228f213 (ath9k: remove struct
 ath_atx_ac) broke the build when CONFIG_ATH9K_STATION_STATISTICS is y.
 
 Reported-by: kbuild test robot fengguang...@intel.com
 Fixes: 592fa228f213 (ath9k: remove struct ath_atx_ac)
 Signed-off-by: Felix Fietkau n...@openwrt.org

Thanks, applied to wireless-drivers-next.git.

Kalle Valo
--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] ath9k: fix build with CONFIG_ATH9K_STATION_STATISTICS=y

2015-08-06 Thread Felix Fietkau
Fixes: 592fa228f213 (ath9k: remove struct ath_atx_ac)
Signed-off-by: Felix Fietkau n...@openwrt.org
---
 drivers/net/wireless/ath/ath9k/debug_sta.c | 20 +++-
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/debug_sta.c 
b/drivers/net/wireless/ath/ath9k/debug_sta.c
index ffca918..c2ca57a 100644
--- a/drivers/net/wireless/ath/ath9k/debug_sta.c
+++ b/drivers/net/wireless/ath/ath9k/debug_sta.c
@@ -26,12 +26,11 @@ static ssize_t read_file_node_aggr(struct file *file, char 
__user *user_buf,
struct ath_node *an = file-private_data;
struct ath_softc *sc = an-sc;
struct ath_atx_tid *tid;
-   struct ath_atx_ac *ac;
struct ath_txq *txq;
u32 len = 0, size = 4096;
char *buf;
size_t retval;
-   int tidno, acno;
+   int tidno;
 
buf = kzalloc(size, GFP_KERNEL);
if (buf == NULL)
@@ -49,26 +48,13 @@ static ssize_t read_file_node_aggr(struct file *file, char 
__user *user_buf,
 an-mpdudensity);
 
len += scnprintf(buf + len, size - len,
-%2s%7s\n, AC, SCHED);
-
-   for (acno = 0, ac = an-ac[acno];
-acno  IEEE80211_NUM_ACS; acno++, ac++) {
-   txq = ac-txq;
-   ath_txq_lock(sc, txq);
-   len += scnprintf(buf + len, size - len,
-%2d%7d\n,
-acno, ac-sched);
-   ath_txq_unlock(sc, txq);
-   }
-
-   len += scnprintf(buf + len, size - len,
 \n%3s%11s%10s%10s%10s%10s%9s%6s%8s\n,
 TID, SEQ_START, SEQ_NEXT, BAW_SIZE,
 BAW_HEAD, BAW_TAIL, BAR_IDX, SCHED, PAUSED);
 
for (tidno = 0, tid = an-tid[tidno];
 tidno  IEEE80211_NUM_TIDS; tidno++, tid++) {
-   txq = tid-ac-txq;
+   txq = tid-txq;
ath_txq_lock(sc, txq);
if (tid-active) {
len += scnprintf(buf + len, size - len,
@@ -80,7 +66,7 @@ static ssize_t read_file_node_aggr(struct file *file, char 
__user *user_buf,
 tid-baw_head,
 tid-baw_tail,
 tid-bar_index,
-tid-sched);
+!list_empty(tid-list));
}
ath_txq_unlock(sc, txq);
}
-- 
2.2.2

--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html