diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-10-22 17:46:04 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-11-03 10:55:55 +0100 |
| commit | cec6628350802b0a652486c41b57d4e1dd37a65c (patch) | |
| tree | 5dd6ac2861cb90843f9d0ce6bbdd83452812951d /net/mac80211/iface.c | |
| parent | e86abc689c5cb963f713c1bab9c37775421a6a96 (diff) | |
| download | linux-cec6628350802b0a652486c41b57d4e1dd37a65c.tar.gz linux-cec6628350802b0a652486c41b57d4e1dd37a65c.tar.bz2 linux-cec6628350802b0a652486c41b57d4e1dd37a65c.zip | |
mac80211: make enable_qos parameter to ieee80211_set_wmm_default()
The function currently determines this value, for use in bss_info.qos,
based on the interface type itself. Make it a parameter instead and
set it with the same logic for now.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index f848c75518a2..d0dc1bfaeec2 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -661,11 +661,13 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) } /* - * set default queue parameters so drivers don't + * Set default queue parameters so drivers don't * need to initialise the hardware if the hardware - * doesn't start up with sane defaults + * doesn't start up with sane defaults. + * Enable QoS for anything but station interfaces. */ - ieee80211_set_wmm_default(sdata, true); + ieee80211_set_wmm_default(sdata, true, + sdata->vif.type != NL80211_IFTYPE_STATION); } set_bit(SDATA_STATE_RUNNING, &sdata->state); |