Commit 95bc6b84 authored by John W. Linville's avatar John W. Linville
parents 2e1253d6 382a103b
...@@ -2582,7 +2582,7 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local, ...@@ -2582,7 +2582,7 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local,
list_del(&dep->list); list_del(&dep->list);
mutex_unlock(&local->mtx); mutex_unlock(&local->mtx);
ieee80211_roc_notify_destroy(dep); ieee80211_roc_notify_destroy(dep, true);
return 0; return 0;
} }
...@@ -2622,7 +2622,7 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local, ...@@ -2622,7 +2622,7 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local,
ieee80211_start_next_roc(local); ieee80211_start_next_roc(local);
mutex_unlock(&local->mtx); mutex_unlock(&local->mtx);
ieee80211_roc_notify_destroy(found); ieee80211_roc_notify_destroy(found, true);
} else { } else {
/* work may be pending so use it all the time */ /* work may be pending so use it all the time */
found->abort = true; found->abort = true;
...@@ -2632,6 +2632,8 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local, ...@@ -2632,6 +2632,8 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local,
/* work will clean up etc */ /* work will clean up etc */
flush_delayed_work(&found->work); flush_delayed_work(&found->work);
WARN_ON(!found->to_be_freed);
kfree(found);
} }
return 0; return 0;
......
...@@ -63,6 +63,7 @@ ieee80211_new_chanctx(struct ieee80211_local *local, ...@@ -63,6 +63,7 @@ ieee80211_new_chanctx(struct ieee80211_local *local,
enum ieee80211_chanctx_mode mode) enum ieee80211_chanctx_mode mode)
{ {
struct ieee80211_chanctx *ctx; struct ieee80211_chanctx *ctx;
u32 changed;
int err; int err;
lockdep_assert_held(&local->chanctx_mtx); lockdep_assert_held(&local->chanctx_mtx);
...@@ -76,6 +77,13 @@ ieee80211_new_chanctx(struct ieee80211_local *local, ...@@ -76,6 +77,13 @@ ieee80211_new_chanctx(struct ieee80211_local *local,
ctx->conf.rx_chains_dynamic = 1; ctx->conf.rx_chains_dynamic = 1;
ctx->mode = mode; ctx->mode = mode;
/* acquire mutex to prevent idle from changing */
mutex_lock(&local->mtx);
/* turn idle off *before* setting channel -- some drivers need that */
changed = ieee80211_idle_off(local);
if (changed)
ieee80211_hw_config(local, changed);
if (!local->use_chanctx) { if (!local->use_chanctx) {
local->_oper_channel_type = local->_oper_channel_type =
cfg80211_get_chandef_type(chandef); cfg80211_get_chandef_type(chandef);
...@@ -85,14 +93,17 @@ ieee80211_new_chanctx(struct ieee80211_local *local, ...@@ -85,14 +93,17 @@ ieee80211_new_chanctx(struct ieee80211_local *local,
err = drv_add_chanctx(local, ctx); err = drv_add_chanctx(local, ctx);
if (err) { if (err) {
kfree(ctx); kfree(ctx);
return ERR_PTR(err); ctx = ERR_PTR(err);
ieee80211_recalc_idle(local);
goto out;
} }
} }
/* and keep the mutex held until the new chanctx is on the list */
list_add_rcu(&ctx->list, &local->chanctx_list); list_add_rcu(&ctx->list, &local->chanctx_list);
mutex_lock(&local->mtx); out:
ieee80211_recalc_idle(local);
mutex_unlock(&local->mtx); mutex_unlock(&local->mtx);
return ctx; return ctx;
......
...@@ -309,6 +309,7 @@ struct ieee80211_roc_work { ...@@ -309,6 +309,7 @@ struct ieee80211_roc_work {
struct ieee80211_channel *chan; struct ieee80211_channel *chan;
bool started, abort, hw_begun, notified; bool started, abort, hw_begun, notified;
bool to_be_freed;
unsigned long hw_start_time; unsigned long hw_start_time;
...@@ -1347,7 +1348,7 @@ void ieee80211_offchannel_return(struct ieee80211_local *local); ...@@ -1347,7 +1348,7 @@ void ieee80211_offchannel_return(struct ieee80211_local *local);
void ieee80211_roc_setup(struct ieee80211_local *local); void ieee80211_roc_setup(struct ieee80211_local *local);
void ieee80211_start_next_roc(struct ieee80211_local *local); void ieee80211_start_next_roc(struct ieee80211_local *local);
void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata); void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata);
void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc); void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc, bool free);
void ieee80211_sw_roc_work(struct work_struct *work); void ieee80211_sw_roc_work(struct work_struct *work);
void ieee80211_handle_roc_started(struct ieee80211_roc_work *roc); void ieee80211_handle_roc_started(struct ieee80211_roc_work *roc);
...@@ -1361,6 +1362,7 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata, ...@@ -1361,6 +1362,7 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata,
enum nl80211_iftype type); enum nl80211_iftype type);
void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata); void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata);
void ieee80211_remove_interfaces(struct ieee80211_local *local); void ieee80211_remove_interfaces(struct ieee80211_local *local);
u32 ieee80211_idle_off(struct ieee80211_local *local);
void ieee80211_recalc_idle(struct ieee80211_local *local); void ieee80211_recalc_idle(struct ieee80211_local *local);
void ieee80211_adjust_monitor_flags(struct ieee80211_sub_if_data *sdata, void ieee80211_adjust_monitor_flags(struct ieee80211_sub_if_data *sdata,
const int offset); const int offset);
......
...@@ -78,7 +78,7 @@ void ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata) ...@@ -78,7 +78,7 @@ void ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata)
ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_TXPOWER); ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_TXPOWER);
} }
static u32 ieee80211_idle_off(struct ieee80211_local *local) u32 ieee80211_idle_off(struct ieee80211_local *local)
{ {
if (!(local->hw.conf.flags & IEEE80211_CONF_IDLE)) if (!(local->hw.conf.flags & IEEE80211_CONF_IDLE))
return 0; return 0;
......
...@@ -297,10 +297,13 @@ void ieee80211_start_next_roc(struct ieee80211_local *local) ...@@ -297,10 +297,13 @@ void ieee80211_start_next_roc(struct ieee80211_local *local)
} }
} }
void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc) void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc, bool free)
{ {
struct ieee80211_roc_work *dep, *tmp; struct ieee80211_roc_work *dep, *tmp;
if (WARN_ON(roc->to_be_freed))
return;
/* was never transmitted */ /* was never transmitted */
if (roc->frame) { if (roc->frame) {
cfg80211_mgmt_tx_status(&roc->sdata->wdev, cfg80211_mgmt_tx_status(&roc->sdata->wdev,
...@@ -316,9 +319,12 @@ void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc) ...@@ -316,9 +319,12 @@ void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc)
GFP_KERNEL); GFP_KERNEL);
list_for_each_entry_safe(dep, tmp, &roc->dependents, list) list_for_each_entry_safe(dep, tmp, &roc->dependents, list)
ieee80211_roc_notify_destroy(dep); ieee80211_roc_notify_destroy(dep, true);
if (free)
kfree(roc); kfree(roc);
else
roc->to_be_freed = true;
} }
void ieee80211_sw_roc_work(struct work_struct *work) void ieee80211_sw_roc_work(struct work_struct *work)
...@@ -331,6 +337,9 @@ void ieee80211_sw_roc_work(struct work_struct *work) ...@@ -331,6 +337,9 @@ void ieee80211_sw_roc_work(struct work_struct *work)
mutex_lock(&local->mtx); mutex_lock(&local->mtx);
if (roc->to_be_freed)
goto out_unlock;
if (roc->abort) if (roc->abort)
goto finish; goto finish;
...@@ -370,7 +379,7 @@ void ieee80211_sw_roc_work(struct work_struct *work) ...@@ -370,7 +379,7 @@ void ieee80211_sw_roc_work(struct work_struct *work)
finish: finish:
list_del(&roc->list); list_del(&roc->list);
started = roc->started; started = roc->started;
ieee80211_roc_notify_destroy(roc); ieee80211_roc_notify_destroy(roc, !roc->abort);
if (started) { if (started) {
drv_flush(local, false); drv_flush(local, false);
...@@ -410,7 +419,7 @@ static void ieee80211_hw_roc_done(struct work_struct *work) ...@@ -410,7 +419,7 @@ static void ieee80211_hw_roc_done(struct work_struct *work)
list_del(&roc->list); list_del(&roc->list);
ieee80211_roc_notify_destroy(roc); ieee80211_roc_notify_destroy(roc, true);
/* if there's another roc, start it now */ /* if there's another roc, start it now */
ieee80211_start_next_roc(local); ieee80211_start_next_roc(local);
...@@ -460,12 +469,14 @@ void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata) ...@@ -460,12 +469,14 @@ void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata)
list_for_each_entry_safe(roc, tmp, &tmp_list, list) { list_for_each_entry_safe(roc, tmp, &tmp_list, list) {
if (local->ops->remain_on_channel) { if (local->ops->remain_on_channel) {
list_del(&roc->list); list_del(&roc->list);
ieee80211_roc_notify_destroy(roc); ieee80211_roc_notify_destroy(roc, true);
} else { } else {
ieee80211_queue_delayed_work(&local->hw, &roc->work, 0); ieee80211_queue_delayed_work(&local->hw, &roc->work, 0);
/* work will clean up etc */ /* work will clean up etc */
flush_delayed_work(&roc->work); flush_delayed_work(&roc->work);
WARN_ON(!roc->to_be_freed);
kfree(roc);
} }
} }
......
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