---

yaml --- r: 203819 b: refs/heads/master c: d973497 h: refs/heads/master i: 203817: 21f4d64 203815: 34e7a1f v: v3
git-mirror · Jul 26, 2010 · c32ca07 · c32ca07
1 parent a469b3f
commit c32ca07
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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,