diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-07-22 14:50:47 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-08-15 14:38:08 +0200 |
| commit | a74a8c846fb699f3277c0c21278bd4c414074b4a (patch) | |
| tree | 35650df83624505b2a90a4195f350f0e3ecb3800 /net/mac80211/tdls.c | |
| parent | c9d26423e56ce1ab4d786f92aebecf859d419293 (diff) | |
| download | linux-stable-a74a8c846fb699f3277c0c21278bd4c414074b4a.tar.gz linux-stable-a74a8c846fb699f3277c0c21278bd4c414074b4a.tar.bz2 linux-stable-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/tdls.c')
| -rw-r--r-- | net/mac80211/tdls.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c index 1b21050be174..f2cb3b6c1871 100644 --- a/net/mac80211/tdls.c +++ b/net/mac80211/tdls.c @@ -316,8 +316,7 @@ ieee80211_tdls_add_setup_cfm_ies(struct ieee80211_sub_if_data *sdata, } /* add the QoS param IE if both the peer and we support it */ - if (local->hw.queues >= IEEE80211_NUM_ACS && - test_sta_flag(sta, WLAN_STA_WME)) + if (local->hw.queues >= IEEE80211_NUM_ACS && sta->sta.wme) ieee80211_tdls_add_wmm_param_ie(sdata, skb); /* add any custom IEs that go before HT operation */ |