Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 266527
b: refs/heads/master
c: 5bade10
h: refs/heads/master
i:
  266525: 996ae4b
  266523: 1d4ea32
  266519: 6a55de8
  266511: a3ab30b
  266495: 972db11
v: v3
  • Loading branch information
Johannes Berg authored and John W. Linville committed Sep 30, 2011
1 parent e149307 commit d0c626c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c2c98fdeb5c897499644eb247285c8e3dacc6450
refs/heads/master: 5bade101eceedb716e39bd35b2928c465e3fbd10
25 changes: 14 additions & 11 deletions trunk/net/mac80211/debugfs_sta.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,22 @@ STA_FILE(last_signal, last_signal, D);
static ssize_t sta_flags_read(struct file *file, char __user *userbuf,
size_t count, loff_t *ppos)
{
char buf[100];
char buf[121];
struct sta_info *sta = file->private_data;

int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s",
test_sta_flag(sta, WLAN_STA_AUTH) ? "AUTH\n" : "",
test_sta_flag(sta, WLAN_STA_ASSOC) ? "ASSOC\n" : "",
test_sta_flag(sta, WLAN_STA_PS_STA) ? "PS (sta)\n" : "",
test_sta_flag(sta, WLAN_STA_PS_DRIVER) ? "PS (driver)\n" : "",
test_sta_flag(sta, WLAN_STA_AUTHORIZED) ? "AUTHORIZED\n" : "",
test_sta_flag(sta, WLAN_STA_SHORT_PREAMBLE) ? "SHORT PREAMBLE\n" : "",
test_sta_flag(sta, WLAN_STA_WME) ? "WME\n" : "",
test_sta_flag(sta, WLAN_STA_WDS) ? "WDS\n" : "",
test_sta_flag(sta, WLAN_STA_MFP) ? "MFP\n" : "");
#define TEST(flg) \
test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""

int res = scnprintf(buf, sizeof(buf),
"%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
TEST(PS_DRIVER), TEST(AUTHORIZED),
TEST(SHORT_PREAMBLE), TEST(ASSOC_AP),
TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
TEST(TDLS_PEER_AUTH));
#undef TEST
return simple_read_from_buffer(userbuf, count, ppos, buf, res);
}
STA_OPS(flags);
Expand Down

0 comments on commit d0c626c

Please sign in to comment.