From 19ae61a52f0468683441b8f73d1dc7bba02a2a17 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 7 Feb 2013 20:54:51 +0100 Subject: [PATCH] --- yaml --- r: 349754 b: refs/heads/master c: d601cd8d950c85032cefdcda162b8cd2cda363bb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c370e0dc438a..a5591280738e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9887dbf5b2163bcf69cd4456c21352e9a81c6003 +refs/heads/master: d601cd8d950c85032cefdcda162b8cd2cda363bb diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index a3552929a21d..3b9cb510aa36 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/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; }