2013-02-14 11:20:30

by Johannes Berg

Subject: [PATCH] mac80211: prevent spurious HT/VHT downgrade message

From: Johannes Berg <[email protected]>

Even when connecting to an AP that doesn't support VHT,
and even when the local device doesn't support it either,
the downgrade message gets printed. Suppress the message
if HT and/or VHT is disabled.

Signed-off-by: Johannes Berg <[email protected]>
---
net/mac80211/mlme.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 7d6a863..1087538 100644
--- a/net/mac80211/mlme.c
+++ b/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)) {
--
1.8.0

2013-02-14 20:24:42

by Johannes Berg

Subject: Re: [PATCH] mac80211: prevent spurious HT/VHT downgrade message

On Thu, 2013-02-14 at 12:20 +0100, Johannes Berg wrote:
> From: Johannes Berg <[email protected]>
>
> Even when connecting to an AP that doesn't support VHT,
> and even when the local device doesn't support it either,
> the downgrade message gets printed. Suppress the message
> if HT and/or VHT is disabled.

Applied.

johannes