diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2016-10-18 16:12:12 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2016-10-19 06:13:54 -0400 |
commit | f438ceb81d424cb90a5a1aad569056bd7c2ab4c5 (patch) | |
tree | 05ec952f55a247467958c80492dbff4a3f31b659 /net/mac80211/mlme.c | |
parent | f3fe4e93dd6346c01fd4070ae02ec746fbae73bb (diff) |
mac80211: uapsd_queues is in QoS IE order
The uapsd_queue field is in QoS IE order and not in
IEEE80211_AC_*'s order.
This means that mac80211 would get confused between
BK and BE which is certainly not such a big deal but
needs to be fixed.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
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 7486f2dab4ba..c8d3a9b02fb6 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -3193,7 +3193,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, | |||
3193 | uapsd_queues = 0; | 3193 | uapsd_queues = 0; |
3194 | for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) | 3194 | for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) |
3195 | if (sdata->tx_conf[ac].uapsd) | 3195 | if (sdata->tx_conf[ac].uapsd) |
3196 | uapsd_queues |= BIT(ac); | 3196 | uapsd_queues |= ieee80211_ac_to_qos_mask[ac]; |
3197 | } | 3197 | } |
3198 | 3198 | ||
3199 | cfg80211_rx_assoc_resp(sdata->dev, bss, (u8 *)mgmt, len, uapsd_queues); | 3199 | cfg80211_rx_assoc_resp(sdata->dev, bss, (u8 *)mgmt, len, uapsd_queues); |