diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-09-08 11:14:56 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-09-08 11:14:56 -0400 |
| commit | 61a3d4f9d52c00b2016bc27fc66b10a194043f76 (patch) | |
| tree | 938a7bd50bbef0215a20dfec99007b4c30828019 /net/mac80211/debugfs_sta.c | |
| parent | db906eb2101b0564b0c65edf4a8647395196342e (diff) | |
| parent | 1bd3fa7b8c9b2936c16c6e6452f9cc991c405872 (diff) | |
| download | linux-61a3d4f9d52c00b2016bc27fc66b10a194043f76.tar.gz linux-61a3d4f9d52c00b2016bc27fc66b10a194043f76.tar.bz2 linux-61a3d4f9d52c00b2016bc27fc66b10a194043f76.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/debugfs_sta.c')
| -rw-r--r-- | net/mac80211/debugfs_sta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c index 4a20fb8f1e23..33eb4a43a2f3 100644 --- a/net/mac80211/debugfs_sta.c +++ b/net/mac80211/debugfs_sta.c @@ -168,7 +168,7 @@ static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf, p += scnprintf(p, sizeof(buf) + buf - p, "next dialog_token: %#02x\n", sta->ampdu_mlme.dialog_token_allocator + 1); p += scnprintf(p, sizeof(buf) + buf - p, - "TID\t\tRX active\tDTKN\tSSN\t\tTX\tDTKN\tpending\n"); + "TID\t\tRX\tDTKN\tSSN\t\tTX\tDTKN\tpending\n"); for (i = 0; i < IEEE80211_NUM_TIDS; i++) { tid_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[i]); |