git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
KVM: PPC: Add dequeue for external on BookE
[safe/jmp/linux-2.6]
/
net
/
mac80211
/
debugfs_sta.c
diff --git
a/net/mac80211/debugfs_sta.c
b/net/mac80211/debugfs_sta.c
index
84865e7
..
d92800b
100644
(file)
--- a/
net/mac80211/debugfs_sta.c
+++ b/
net/mac80211/debugfs_sta.c
@@
-120,36
+120,38
@@
STA_OPS(last_seq_ctrl);
static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,
size_t count, loff_t *ppos)
{
static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,
size_t count, loff_t *ppos)
{
- char buf[
30 + STA_TID_NUM * 7
0], *p = buf;
+ char buf[
64 + STA_TID_NUM * 4
0], *p = buf;
int i;
struct sta_info *sta = file->private_data;
spin_lock_bh(&sta->lock);
int i;
struct sta_info *sta = file->private_data;
spin_lock_bh(&sta->lock);
- p += scnprintf(p, sizeof(buf)
+buf-p, "next dialog_token is
%#02x\n",
+ p += scnprintf(p, sizeof(buf)
+ buf - p, "next dialog_token:
%#02x\n",
sta->ampdu_mlme.dialog_token_allocator + 1);
sta->ampdu_mlme.dialog_token_allocator + 1);
+ p += scnprintf(p, sizeof(buf) + buf - p,
+ "TID\t\tRX\tDTKN\tSSN\t\tTX\tDTKN\tSSN\tpending\n");
for (i = 0; i < STA_TID_NUM; i++) {
for (i = 0; i < STA_TID_NUM; i++) {
- p += scnprintf(p, sizeof(buf)
+buf-p, "TID %02d:
", i);
- p += scnprintf(p, sizeof(buf)
+buf-p, " RX=
%x",
+ p += scnprintf(p, sizeof(buf)
+ buf - p, "%02d
", i);
+ p += scnprintf(p, sizeof(buf)
+ buf - p, "\t\t
%x",
sta->ampdu_mlme.tid_state_rx[i]);
sta->ampdu_mlme.tid_state_rx[i]);
- p += scnprintf(p, sizeof(buf)
+buf-p, "/DTKN=
%#.2x",
+ p += scnprintf(p, sizeof(buf)
+ buf - p, "\t
%#.2x",
sta->ampdu_mlme.tid_state_rx[i] ?
sta->ampdu_mlme.tid_rx[i]->dialog_token : 0);
sta->ampdu_mlme.tid_state_rx[i] ?
sta->ampdu_mlme.tid_rx[i]->dialog_token : 0);
- p += scnprintf(p, sizeof(buf)
+buf-p, "/SSN=
%#.3x",
+ p += scnprintf(p, sizeof(buf)
+ buf - p, "\t
%#.3x",
sta->ampdu_mlme.tid_state_rx[i] ?
sta->ampdu_mlme.tid_rx[i]->ssn : 0);
sta->ampdu_mlme.tid_state_rx[i] ?
sta->ampdu_mlme.tid_rx[i]->ssn : 0);
- p += scnprintf(p, sizeof(buf)
+buf-p, " TX=
%x",
+ p += scnprintf(p, sizeof(buf)
+ buf - p, "\t\t
%x",
sta->ampdu_mlme.tid_state_tx[i]);
sta->ampdu_mlme.tid_state_tx[i]);
- p += scnprintf(p, sizeof(buf)
+buf-p, "/DTKN=
%#.2x",
+ p += scnprintf(p, sizeof(buf)
+ buf - p, "\t
%#.2x",
sta->ampdu_mlme.tid_state_tx[i] ?
sta->ampdu_mlme.tid_tx[i]->dialog_token : 0);
sta->ampdu_mlme.tid_state_tx[i] ?
sta->ampdu_mlme.tid_tx[i]->dialog_token : 0);
- p += scnprintf(p, sizeof(buf)
+buf-p, "/SSN=
%#.3x",
+ p += scnprintf(p, sizeof(buf)
+ buf - p, "\t
%#.3x",
sta->ampdu_mlme.tid_state_tx[i] ?
sta->ampdu_mlme.tid_tx[i]->ssn : 0);
sta->ampdu_mlme.tid_state_tx[i] ?
sta->ampdu_mlme.tid_tx[i]->ssn : 0);
- p += scnprintf(p, sizeof(buf)
+buf-p, "/pending=
%03d",
+ p += scnprintf(p, sizeof(buf)
+ buf - p, "\t
%03d",
sta->ampdu_mlme.tid_state_tx[i] ?
skb_queue_len(&sta->ampdu_mlme.tid_tx[i]->pending) : 0);
sta->ampdu_mlme.tid_state_tx[i] ?
skb_queue_len(&sta->ampdu_mlme.tid_tx[i]->pending) : 0);
- p += scnprintf(p, sizeof(buf)
+buf-
p, "\n");
+ p += scnprintf(p, sizeof(buf)
+ buf -
p, "\n");
}
spin_unlock_bh(&sta->lock);
}
spin_unlock_bh(&sta->lock);