Commit e4746851 authored by Simon Wunderlich's avatar Simon Wunderlich Committed by Johannes Berg

mac80211: fix recalc_radar hwconf sync problem

local->hw.conf maybe not be synced when recalcing whether radar is
enabled, sometimes leaving radar enabled even if it's not neccesary
anymore.

Fix this by:
 * setting radar_enabled when creating the chanctx
 * turning radar_enabled off before destroying the last channel context
Reported-by: default avatarZefir Kurtisi <zefir.kurtisi@neratec.com>
Signed-off-by: default avatarSimon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3088f7d2
...@@ -57,6 +57,22 @@ ieee80211_find_chanctx(struct ieee80211_local *local, ...@@ -57,6 +57,22 @@ ieee80211_find_chanctx(struct ieee80211_local *local,
return NULL; return NULL;
} }
static bool ieee80211_is_radar_required(struct ieee80211_local *local)
{
struct ieee80211_sub_if_data *sdata;
rcu_read_lock();
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
if (sdata->radar_required) {
rcu_read_unlock();
return true;
}
}
rcu_read_unlock();
return false;
}
static struct ieee80211_chanctx * static struct ieee80211_chanctx *
ieee80211_new_chanctx(struct ieee80211_local *local, ieee80211_new_chanctx(struct ieee80211_local *local,
const struct cfg80211_chan_def *chandef, const struct cfg80211_chan_def *chandef,
...@@ -75,6 +91,9 @@ ieee80211_new_chanctx(struct ieee80211_local *local, ...@@ -75,6 +91,9 @@ ieee80211_new_chanctx(struct ieee80211_local *local,
ctx->conf.rx_chains_static = 1; ctx->conf.rx_chains_static = 1;
ctx->conf.rx_chains_dynamic = 1; ctx->conf.rx_chains_dynamic = 1;
ctx->mode = mode; ctx->mode = mode;
ctx->conf.radar_enabled = ieee80211_is_radar_required(local);
if (!local->use_chanctx)
local->hw.conf.radar_enabled = ctx->conf.radar_enabled;
if (!local->use_chanctx) { if (!local->use_chanctx) {
local->_oper_chandef = *chandef; local->_oper_chandef = *chandef;
...@@ -99,6 +118,7 @@ ieee80211_new_chanctx(struct ieee80211_local *local, ...@@ -99,6 +118,7 @@ ieee80211_new_chanctx(struct ieee80211_local *local,
static void ieee80211_free_chanctx(struct ieee80211_local *local, static void ieee80211_free_chanctx(struct ieee80211_local *local,
struct ieee80211_chanctx *ctx) struct ieee80211_chanctx *ctx)
{ {
bool check_single_channel = false;
lockdep_assert_held(&local->chanctx_mtx); lockdep_assert_held(&local->chanctx_mtx);
WARN_ON_ONCE(ctx->refcount != 0); WARN_ON_ONCE(ctx->refcount != 0);
...@@ -108,6 +128,14 @@ static void ieee80211_free_chanctx(struct ieee80211_local *local, ...@@ -108,6 +128,14 @@ static void ieee80211_free_chanctx(struct ieee80211_local *local,
chandef->width = NL80211_CHAN_WIDTH_20_NOHT; chandef->width = NL80211_CHAN_WIDTH_20_NOHT;
chandef->center_freq1 = chandef->chan->center_freq; chandef->center_freq1 = chandef->chan->center_freq;
chandef->center_freq2 = 0; chandef->center_freq2 = 0;
/* NOTE: Disabling radar is only valid here for
* single channel context. To be sure, check it ...
*/
if (local->hw.conf.radar_enabled)
check_single_channel = true;
local->hw.conf.radar_enabled = false;
ieee80211_hw_config(local, 0); ieee80211_hw_config(local, 0);
} else { } else {
drv_remove_chanctx(local, ctx); drv_remove_chanctx(local, ctx);
...@@ -116,6 +144,9 @@ static void ieee80211_free_chanctx(struct ieee80211_local *local, ...@@ -116,6 +144,9 @@ static void ieee80211_free_chanctx(struct ieee80211_local *local,
list_del_rcu(&ctx->list); list_del_rcu(&ctx->list);
kfree_rcu(ctx, rcu_head); kfree_rcu(ctx, rcu_head);
/* throw a warning if this wasn't the only channel context. */
WARN_ON(check_single_channel && !list_empty(&local->chanctx_list));
mutex_lock(&local->mtx); mutex_lock(&local->mtx);
ieee80211_recalc_idle(local); ieee80211_recalc_idle(local);
mutex_unlock(&local->mtx); mutex_unlock(&local->mtx);
...@@ -227,19 +258,11 @@ static void __ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata) ...@@ -227,19 +258,11 @@ static void __ieee80211_vif_release_channel(struct ieee80211_sub_if_data *sdata)
void ieee80211_recalc_radar_chanctx(struct ieee80211_local *local, void ieee80211_recalc_radar_chanctx(struct ieee80211_local *local,
struct ieee80211_chanctx *chanctx) struct ieee80211_chanctx *chanctx)
{ {
struct ieee80211_sub_if_data *sdata; bool radar_enabled;
bool radar_enabled = false;
lockdep_assert_held(&local->chanctx_mtx); lockdep_assert_held(&local->chanctx_mtx);
rcu_read_lock(); radar_enabled = ieee80211_is_radar_required(local);
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
if (sdata->radar_required) {
radar_enabled = true;
break;
}
}
rcu_read_unlock();
if (radar_enabled == chanctx->conf.radar_enabled) if (radar_enabled == chanctx->conf.radar_enabled)
return; return;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment