From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 7 Feb 2013 19:54:51 +0000 (+0100)
Subject: mac80211: fix managed mode channel context use
X-Git-Tag: MMI-PSA29.97-13-9~15060^2~6^2^2~1^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d601cd8d950c85032cefdcda162b8cd2cda363bb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

mac80211: fix managed mode channel context use

My commit f2d9d270c15ae0139b54a7e7466d738327e97e03
("mac80211: support VHT association") introduced a
very stupid bug: the loop to downgrade the channel
width never attempted to actually use it again so
it would downgrade all the way to 20_NOHT. Fix it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index a3552929a21d..3b9cb510aa36 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3529,8 +3529,11 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
 	 */
 	ret = ieee80211_vif_use_channel(sdata, &chandef,
 					IEEE80211_CHANCTX_SHARED);
-	while (ret && chandef.width != NL80211_CHAN_WIDTH_20_NOHT)
+	while (ret && chandef.width != NL80211_CHAN_WIDTH_20_NOHT) {
 		ifmgd->flags |= chandef_downgrade(&chandef);
+		ret = ieee80211_vif_use_channel(sdata, &chandef,
+						IEEE80211_CHANCTX_SHARED);
+	}
 	return ret;
 }