Skip to content

Commit b473b8f

Browse files
committed
mac80211: improve RX aggregation data in debugfs
When the driver sets the SUPPORTS_REORDERING_BUFFER hardware flag, the debugfs data for RX aggregation sessions won't even indicate that a session is open. Since the previous fix to store the dialog token separately, we can indicate that it's open and add the token so that there's at least some data (ssn is not available.) Signed-off-by: Johannes Berg <[email protected]>
1 parent 1c3d185 commit b473b8f

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

net/mac80211/debugfs_sta.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,18 @@ static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,
199199
"TID\t\tRX\tDTKN\tSSN\t\tTX\tDTKN\tpending\n");
200200

201201
for (i = 0; i < IEEE80211_NUM_TIDS; i++) {
202+
bool tid_rx_valid;
203+
202204
tid_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[i]);
203205
tid_tx = rcu_dereference(sta->ampdu_mlme.tid_tx[i]);
206+
tid_rx_valid = test_bit(i, sta->ampdu_mlme.agg_session_valid);
204207

205208
p += scnprintf(p, sizeof(buf) + buf - p, "%02d", i);
206-
p += scnprintf(p, sizeof(buf) + buf - p, "\t\t%x", !!tid_rx);
209+
p += scnprintf(p, sizeof(buf) + buf - p, "\t\t%x",
210+
tid_rx_valid);
207211
p += scnprintf(p, sizeof(buf) + buf - p, "\t%#.2x",
208-
tid_rx ? sta->ampdu_mlme.tid_rx_token[i] : 0);
212+
tid_rx_valid ?
213+
sta->ampdu_mlme.tid_rx_token[i] : 0);
209214
p += scnprintf(p, sizeof(buf) + buf - p, "\t%#.3x",
210215
tid_rx ? tid_rx->ssn : 0);
211216

0 commit comments

Comments
 (0)