From 9db6bd56093848fed96ed3e3c4423da7d41affb8 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 14 Feb 2013 12:13:53 +0100
Subject: [PATCH] --- yaml --- r: 352737 b: refs/heads/master c:
 586e01ededf9b713a1512dd658806791a7ca1a50 h: refs/heads/master i:   352735:
 3f87759f10cbcb289b5ddc96064d9aa95487f63a v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e1b0fe5a2301..7ca3423d488f 100644
--- 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
index 7a8cd789e487..9f6464f3e05f 100644
--- 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)) {