diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-07-22 16:50:47 +0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-08-15 16:38:08 +0400 |
| commit | a74a8c846fb699f3277c0c21278bd4c414074b4a (patch) | |
| tree | 35650df83624505b2a90a4195f350f0e3ecb3800 /net/mac80211/mlme.c | |
| parent | c9d26423e56ce1ab4d786f92aebecf859d419293 (diff) | |
| download | linux-a74a8c846fb699f3277c0c21278bd4c414074b4a.tar.xz | |
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/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 31a8afaf7332..0e8d59a0e17e 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2677,8 +2677,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, if (ifmgd->flags & IEEE80211_STA_MFP_ENABLED) set_sta_flag(sta, WLAN_STA_MFP); - if (elems.wmm_param) - set_sta_flag(sta, WLAN_STA_WME); + sta->sta.wme = elems.wmm_param; err = sta_info_move_state(sta, IEEE80211_STA_ASSOC); if (!err && !(ifmgd->flags & IEEE80211_STA_CONTROL_PORT)) |