diff options
| author | Johannes Berg | 2015-03-21 08:09:55 +0100 |
|---|---|---|
| committer | Johannes Berg | 2015-03-30 10:47:16 +0200 |
| commit | 527871d7206dac2733d0bae52f5a328811d299ee (patch) | |
| tree | ae1f8e35f545365d82647b322803cc3d4d8b5321 /net/mac80211/ibss.c | |
| parent | mac80211: send AP probe as unicast again (diff) | |
| download | kernel-qcow2-linux-527871d7206dac2733d0bae52f5a328811d299ee.tar.gz kernel-qcow2-linux-527871d7206dac2733d0bae52f5a328811d299ee.tar.xz kernel-qcow2-linux-527871d7206dac2733d0bae52f5a328811d299ee.zip | |
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/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 17eda3575d7d..6da4e72f8178 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -1016,7 +1016,7 @@ static void ieee80211_update_sta_info(struct ieee80211_sub_if_data *sdata, } } - if (sta && elems->wmm_info) + if (sta && elems->wmm_info && local->hw.queues >= IEEE80211_NUM_ACS) sta->sta.wme = true; if (sta && elems->ht_operation && elems->ht_cap_elem && |