diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-03-08 15:02:05 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-12 14:22:13 -0400 |
commit | 76f0303d61b3c7f1918ab63a64e77450a4418a60 (patch) | |
tree | 00f94eb0479a0459a71179e8d89d97b52442299a /net/mac80211/ieee80211_i.h | |
parent | 4e74bfdb30f79e9bf87aa359eff29fbdb93cc12a (diff) | |
download | lwn-76f0303d61b3c7f1918ab63a64e77450a4418a60.tar.gz lwn-76f0303d61b3c7f1918ab63a64e77450a4418a60.zip |
mac80211: simplify wmm check during association
Instead of setting assoc_data->wmm_used solely
based on the BSS also take into account our own
capabilities and later check those.
Also rename "wmm_used" and "uapsd_used" to just
"wmm" and "uapsd".
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 3c62ded64e32..173c1396070d 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -407,7 +407,7 @@ struct ieee80211_mgd_assoc_data { u8 ssid[IEEE80211_MAX_SSID_LEN]; u8 ssid_len; u8 supp_rates_len; - bool wmm_used, uapsd_used; + bool wmm, uapsd; bool have_beacon; bool sent_assoc; bool synced; |