diff options
author | Johannes Berg <johannes.berg@intel.com> | 2014-07-22 08:50:47 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-08-15 08:38:08 -0400 |
commit | a74a8c846fb699f3277c0c21278bd4c414074b4a (patch) | |
tree | 35650df83624505b2a90a4195f350f0e3ecb3800 /net/mac80211/sta_info.h | |
parent | c9d26423e56ce1ab4d786f92aebecf859d419293 (diff) |
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/sta_info.h')
-rw-r--r-- | net/mac80211/sta_info.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index d411bcc8ef08..89c40d5c0633 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h | |||
@@ -31,7 +31,6 @@ | |||
31 | * when virtual port control is not in use. | 31 | * when virtual port control is not in use. |
32 | * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble | 32 | * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble |
33 | * frames. | 33 | * frames. |
34 | * @WLAN_STA_WME: Station is a QoS-STA. | ||
35 | * @WLAN_STA_WDS: Station is one of our WDS peers. | 34 | * @WLAN_STA_WDS: Station is one of our WDS peers. |
36 | * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the | 35 | * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the |
37 | * IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next | 36 | * IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next |
@@ -69,7 +68,6 @@ enum ieee80211_sta_info_flags { | |||
69 | WLAN_STA_PS_STA, | 68 | WLAN_STA_PS_STA, |
70 | WLAN_STA_AUTHORIZED, | 69 | WLAN_STA_AUTHORIZED, |
71 | WLAN_STA_SHORT_PREAMBLE, | 70 | WLAN_STA_SHORT_PREAMBLE, |
72 | WLAN_STA_WME, | ||
73 | WLAN_STA_WDS, | 71 | WLAN_STA_WDS, |
74 | WLAN_STA_CLEAR_PS_FILT, | 72 | WLAN_STA_CLEAR_PS_FILT, |
75 | WLAN_STA_MFP, | 73 | WLAN_STA_MFP, |