diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2016-10-18 23:12:12 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2016-10-19 12:13:54 +0200 |
| commit | f438ceb81d424cb90a5a1aad569056bd7c2ab4c5 (patch) | |
| tree | 05ec952f55a247467958c80492dbff4a3f31b659 /net/mac80211/rx.c | |
| parent | f3fe4e93dd6346c01fd4070ae02ec746fbae73bb (diff) | |
| download | linux-f438ceb81d424cb90a5a1aad569056bd7c2ab4c5.tar.bz2 | |
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/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 837d56261bb2..21a8947651e1 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1401,7 +1401,8 @@ void ieee80211_sta_uapsd_trigger(struct ieee80211_sta *pubsta, u8 tid) * enabled queues, but for now we only implement uAPSD w/o * TSPEC changes to the ACs, so they're always the same. */ - if (!(sta->sta.uapsd_queues & BIT(ac)) && tid != IEEE80211_NUM_TIDS) + if (!(sta->sta.uapsd_queues & ieee80211_ac_to_qos_mask[ac]) && + tid != IEEE80211_NUM_TIDS) return; /* if we are in a service period, do nothing */ |