summaryrefslogtreecommitdiff
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-03-21 07:09:55 (GMT)
committerJohannes Berg <johannes.berg@intel.com>2015-03-30 08:47:16 (GMT)
commit527871d7206dac2733d0bae52f5a328811d299ee (patch)
treeae1f8e35f545365d82647b322803cc3d4d8b5321 /net/mac80211/tx.c
parenta73f8e21f3f93159bc19e154e8f50891c22c11db (diff)
downloadlinux-527871d7206dac2733d0bae52f5a328811d299ee.tar.xz
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/tx.c')
-rw-r--r--net/mac80211/tx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 34b0e75..018f029 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2088,8 +2088,8 @@ static struct sk_buff *ieee80211_build_hdr(struct ieee80211_sub_if_data *sdata,
if (ieee80211_vif_is_mesh(&sdata->vif))
wme_sta = true;
- /* receiver and we are QoS enabled, use a QoS type frame */
- if (wme_sta && local->hw.queues >= IEEE80211_NUM_ACS) {
+ /* receiver does QoS (which also means we do) use it */
+ if (wme_sta) {
fc |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA);
hdrlen += 2;
}