diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-09-04 19:41:33 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-09-04 19:41:33 +0200 |
| commit | ef4ead3f29256ed83991cd77b39334aadd25672a (patch) | |
| tree | a164b021488a7b1dc869c093886cada1ff07fde4 /net/mac80211/debugfs_sta.c | |
| parent | carl9170: tx: Replace rcu_assign_pointer() with RCU_INIT_POINTER() (diff) | |
| parent | net: rfkill: gpio: Add more Broadcom bluetooth ACPI IDs (diff) | |
| download | linux-ef4ead3f29256ed83991cd77b39334aadd25672a.tar.xz linux-ef4ead3f29256ed83991cd77b39334aadd25672a.zip | |
Merge tag 'mac80211-next-for-john-2014-08-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg <johannes@sipsolutions.net> says:
"Not that much content this time. Some RCU cleanups, crypto
performance improvements, and various patches all over,
rather than listing them one might as well look into the
git log instead."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Conflicts:
drivers/net/wireless/ath/wil6210/wmi.c
Diffstat (limited to 'net/mac80211/debugfs_sta.c')
| -rw-r--r-- | net/mac80211/debugfs_sta.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c index 3db96648b45a..4a20fb8f1e23 100644 --- a/net/mac80211/debugfs_sta.c +++ b/net/mac80211/debugfs_sta.c @@ -77,7 +77,8 @@ static ssize_t sta_flags_read(struct file *file, char __user *userbuf, TEST(AUTH), TEST(ASSOC), TEST(PS_STA), TEST(PS_DRIVER), TEST(AUTHORIZED), TEST(SHORT_PREAMBLE), - TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT), + sta->sta.wme ? "WME\n" : "", + TEST(WDS), TEST(CLEAR_PS_FILT), TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL), TEST(UAPSD), TEST(SP), TEST(TDLS_PEER), TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT), |