diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-03-21 03:09:55 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-03-30 04:47:16 -0400 |
| commit | 527871d7206dac2733d0bae52f5a328811d299ee (patch) | |
| tree | ae1f8e35f545365d82647b322803cc3d4d8b5321 /net/mac80211/mlme.c | |
| parent | a73f8e21f3f93159bc19e154e8f50891c22c11db (diff) | |
mac80211: make sta.wme indicate whether QoS is used
Indicating just the peer's capability is fairly pointless
if the local device doesn't support it. Make the variable
track both combined, and remove the 'local support' check
in the TX path.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 8a06b1abc47a..0cbcde11fae3 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
| @@ -2990,7 +2990,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, | |||
| 2990 | sta->sta.mfp = false; | 2990 | sta->sta.mfp = false; |
| 2991 | } | 2991 | } |
| 2992 | 2992 | ||
| 2993 | sta->sta.wme = elems.wmm_param; | 2993 | sta->sta.wme = elems.wmm_param && local->hw.queues >= IEEE80211_NUM_ACS; |
| 2994 | 2994 | ||
| 2995 | err = sta_info_move_state(sta, IEEE80211_STA_ASSOC); | 2995 | err = sta_info_move_state(sta, IEEE80211_STA_ASSOC); |
| 2996 | if (!err && !(ifmgd->flags & IEEE80211_STA_CONTROL_PORT)) | 2996 | if (!err && !(ifmgd->flags & IEEE80211_STA_CONTROL_PORT)) |