diff options
author | Johannes Berg <johannes.berg@intel.com> | 2015-10-22 11:46:04 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2015-11-03 04:55:55 -0500 |
commit | cec6628350802b0a652486c41b57d4e1dd37a65c (patch) | |
tree | 5dd6ac2861cb90843f9d0ce6bbdd83452812951d /net/mac80211/ibss.c | |
parent | e86abc689c5cb963f713c1bab9c37775421a6a96 (diff) |
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/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 3b5874e0174f..337bb5d78003 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c | |||
@@ -356,7 +356,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, | |||
356 | else | 356 | else |
357 | sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE; | 357 | sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE; |
358 | 358 | ||
359 | ieee80211_set_wmm_default(sdata, true); | 359 | ieee80211_set_wmm_default(sdata, true, false); |
360 | 360 | ||
361 | sdata->vif.bss_conf.ibss_joined = true; | 361 | sdata->vif.bss_conf.ibss_joined = true; |
362 | sdata->vif.bss_conf.ibss_creator = creator; | 362 | sdata->vif.bss_conf.ibss_creator = creator; |