diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2013-02-15 09:41:21 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-15 09:41:21 +0100 |
| commit | 8cdc196b743c4224ffa59fef38133559c1fd2a5e (patch) | |
| tree | f5de9fd936d42150ffdbfdacdbce41c6697acb8b /net/mac80211/mlme.c | |
| parent | mac80211: use spin_lock_bh() for TKIP lock (diff) | |
| parent | mac80211: fix channel selection bug (diff) | |
| download | linux-dev-8cdc196b743c4224ffa59fef38133559c1fd2a5e.tar.xz linux-dev-8cdc196b743c4224ffa59fef38133559c1fd2a5e.zip | |
Merge remote-tracking branch 'mac80211/master' into HEAD
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 99be3b61a225..ac1374a8c30a 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -3488,6 +3488,7 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, ret = 0; +out: while (!cfg80211_chandef_usable(sdata->local->hw.wiphy, chandef, IEEE80211_CHAN_DISABLED)) { if (WARN_ON(chandef->width == NL80211_CHAN_WIDTH_20_NOHT)) { @@ -3496,14 +3497,13 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, goto out; } - ret = chandef_downgrade(chandef); + ret |= chandef_downgrade(chandef); } if (chandef->width != vht_chandef.width) sdata_info(sdata, - "local regulatory prevented using AP HT/VHT configuration, downgraded\n"); + "capabilities/regulatory prevented using AP HT/VHT configuration, downgraded\n"); -out: WARN_ON_ONCE(!cfg80211_chandef_valid(chandef)); return ret; } @@ -3617,8 +3617,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; } |