From c32ca07027d4d77217e223901c826b92a583fecd Mon Sep 17 00:00:00 2001 From: Sujith Date: Fri, 23 Jul 2010 10:47:11 +0530 Subject: [PATCH] --- yaml --- r: 203819 b: refs/heads/master c: d97349797fa76753c747ed8b888414fe78795439 h: refs/heads/master i: 203817: 21f4d642f913df23d47ab9fe22e5841a9ca04823 203815: 34e7a1fd0ac502047a65fa834cd637a94d02fa82 v: v3 --- [refs] | 2 +- trunk/net/mac80211/util.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1b16c149cd92..2399bacae8b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 487f0e010cf5b6ba504150dfb20c21fd93e3b9e6 +refs/heads/master: d97349797fa76753c747ed8b888414fe78795439 diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c index 794792177376..748387d45bc0 100644 --- a/trunk/net/mac80211/util.c +++ b/trunk/net/mac80211/util.c @@ -803,8 +803,12 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata) /* after reinitialize QoS TX queues setting to default, * disable QoS at all */ - sdata->vif.bss_conf.qos = sdata->vif.type != NL80211_IFTYPE_STATION; - ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_QOS); + + if (sdata->vif.type != NL80211_IFTYPE_MONITOR) { + sdata->vif.bss_conf.qos = + sdata->vif.type != NL80211_IFTYPE_STATION; + ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_QOS); + } } void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata,