summaryrefslogtreecommitdiffstats
path: root/net/mac80211/ibss.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2014-07-22 14:50:47 +0200
committerJohannes Berg <johannes.berg@intel.com>2014-08-15 14:38:08 +0200
commita74a8c846fb699f3277c0c21278bd4c414074b4a (patch)
tree35650df83624505b2a90a4195f350f0e3ecb3800 /net/mac80211/ibss.c
parentc9d26423e56ce1ab4d786f92aebecf859d419293 (diff)
downloadlinux-a74a8c846fb699f3277c0c21278bd4c414074b4a.tar.gz
linux-a74a8c846fb699f3277c0c21278bd4c414074b4a.tar.bz2
linux-a74a8c846fb699f3277c0c21278bd4c414074b4a.zip
mac80211: don't duplicate station QoS capability data
We currently track the QoS capability twice: for all peer stations in the WLAN_STA_WME flag, and for any clients associated to an AP interface separately for drivers in the sta->sta.wme field. Remove the WLAN_STA_WME flag and track the capability only in the driver-visible field, getting rid of the limitation that the field is only valid in AP mode. Reviewed-by: Arik Nemtsov <arik@wizery.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r--net/mac80211/ibss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 9713dc54ea4b..5f9654d31a8d 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -1038,7 +1038,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
}
if (sta && elems->wmm_info)
- set_sta_flag(sta, WLAN_STA_WME);
+ sta->sta.wme = true;
if (sta && elems->ht_operation && elems->ht_cap_elem &&
sdata->u.ibss.chandef.width != NL80211_CHAN_WIDTH_20_NOHT &&