diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-07-22 12:50:47 (GMT) |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-08-15 12:38:08 (GMT) |
| commit | a74a8c846fb699f3277c0c21278bd4c414074b4a (patch) | |
| tree | 35650df83624505b2a90a4195f350f0e3ecb3800 /net/mac80211/wme.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/wme.c')
| -rw-r--r-- | net/mac80211/wme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index d51422c..6459946 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c @@ -118,7 +118,7 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata, case NL80211_IFTYPE_AP_VLAN: sta = rcu_dereference(sdata->u.vlan.sta); if (sta) { - qos = test_sta_flag(sta, WLAN_STA_WME); + qos = sta->sta.wme; break; } case NL80211_IFTYPE_AP: @@ -145,7 +145,7 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata, if (!sta && ra && !is_multicast_ether_addr(ra)) { sta = sta_info_get(sdata, ra); if (sta) - qos = test_sta_flag(sta, WLAN_STA_WME); + qos = sta->sta.wme; } rcu_read_unlock(); |