Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d601cd8d authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: fix managed mode channel context use 



My commit f2d9d270
("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: default avatarJohannes Berg <johannes.berg@intel.com>
parent 9887dbf5

net/mac80211/mlme.c

+4 −1
Original line number Diff line number Diff line
@@ -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;

}