---

yaml --- r: 352737 b: refs/heads/master c: 586e01e h: refs/heads/master i: 352735: 3f87759 v: v3
git-mirror · Feb 15, 2013 · 9db6bd5 · 9db6bd5
1 parent 52f34c7
commit 9db6bd5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 932dd97c5fef091dd6f605fb1d40143d67d91e09
+refs/heads/master: 586e01ededf9b713a1512dd658806791a7ca1a50
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
@@ -357,6 +357,10 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata,
 	ret = 0;
 
 out:
+	/* don't print the message below for VHT mismatch if VHT is disabled */
+	if (ret & IEEE80211_STA_DISABLE_VHT)
+		vht_chandef = *chandef;
+
 	while (!cfg80211_chandef_usable(sdata->local->hw.wiphy, chandef,
 					IEEE80211_CHAN_DISABLED)) {
 		if (WARN_ON(chandef->width == NL80211_CHAN_WIDTH_20_NOHT)) {