Commit 228e4f93 authored by Johannes Berg's avatar Johannes Berg

wifi: mac80211: move radar detect work to wiphy work

Move the radar detect work to wiphy work in order
to lock the wiphy for it without doing it manually.
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 766d2601
...@@ -1412,7 +1412,7 @@ struct ieee80211_local { ...@@ -1412,7 +1412,7 @@ struct ieee80211_local {
/* wowlan is enabled -- don't reconfig on resume */ /* wowlan is enabled -- don't reconfig on resume */
bool wowlan; bool wowlan;
struct work_struct radar_detected_work; struct wiphy_work radar_detected_work;
/* number of RX chains the hardware has */ /* number of RX chains the hardware has */
u8 rx_chains; u8 rx_chains;
...@@ -2571,7 +2571,8 @@ bool ieee80211_is_radar_required(struct ieee80211_local *local); ...@@ -2571,7 +2571,8 @@ bool ieee80211_is_radar_required(struct ieee80211_local *local);
void ieee80211_dfs_cac_timer_work(struct wiphy *wiphy, struct wiphy_work *work); void ieee80211_dfs_cac_timer_work(struct wiphy *wiphy, struct wiphy_work *work);
void ieee80211_dfs_cac_cancel(struct ieee80211_local *local); void ieee80211_dfs_cac_cancel(struct ieee80211_local *local);
void ieee80211_dfs_radar_detected_work(struct work_struct *work); void ieee80211_dfs_radar_detected_work(struct wiphy *wiphy,
struct wiphy_work *work);
int ieee80211_send_action_csa(struct ieee80211_sub_if_data *sdata, int ieee80211_send_action_csa(struct ieee80211_sub_if_data *sdata,
struct cfg80211_csa_settings *csa_settings); struct cfg80211_csa_settings *csa_settings);
......
...@@ -338,7 +338,6 @@ static void ieee80211_restart_work(struct work_struct *work) ...@@ -338,7 +338,6 @@ static void ieee80211_restart_work(struct work_struct *work)
/* wait for scan work complete */ /* wait for scan work complete */
flush_workqueue(local->workqueue); flush_workqueue(local->workqueue);
flush_work(&local->sched_scan_stopped_work); flush_work(&local->sched_scan_stopped_work);
flush_work(&local->radar_detected_work);
rtnl_lock(); rtnl_lock();
/* we might do interface manipulations, so need both */ /* we might do interface manipulations, so need both */
...@@ -814,7 +813,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, ...@@ -814,7 +813,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len,
INIT_WORK(&local->restart_work, ieee80211_restart_work); INIT_WORK(&local->restart_work, ieee80211_restart_work);
INIT_WORK(&local->radar_detected_work, wiphy_work_init(&local->radar_detected_work,
ieee80211_dfs_radar_detected_work); ieee80211_dfs_radar_detected_work);
INIT_WORK(&local->reconfig_filter, ieee80211_reconfig_filter); INIT_WORK(&local->reconfig_filter, ieee80211_reconfig_filter);
...@@ -1483,13 +1482,15 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw) ...@@ -1483,13 +1482,15 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
*/ */
ieee80211_remove_interfaces(local); ieee80211_remove_interfaces(local);
wiphy_lock(local->hw.wiphy);
wiphy_work_cancel(local->hw.wiphy, &local->radar_detected_work);
wiphy_unlock(local->hw.wiphy);
rtnl_unlock(); rtnl_unlock();
cancel_delayed_work_sync(&local->roc_work); cancel_delayed_work_sync(&local->roc_work);
cancel_work_sync(&local->restart_work); cancel_work_sync(&local->restart_work);
cancel_work_sync(&local->reconfig_filter); cancel_work_sync(&local->reconfig_filter);
flush_work(&local->sched_scan_stopped_work); flush_work(&local->sched_scan_stopped_work);
flush_work(&local->radar_detected_work);
ieee80211_clear_tx_pending(local); ieee80211_clear_tx_pending(local);
rate_control_deinitialize(local); rate_control_deinitialize(local);
......
...@@ -4358,7 +4358,8 @@ void ieee80211_dfs_cac_cancel(struct ieee80211_local *local) ...@@ -4358,7 +4358,8 @@ void ieee80211_dfs_cac_cancel(struct ieee80211_local *local)
mutex_unlock(&local->mtx); mutex_unlock(&local->mtx);
} }
void ieee80211_dfs_radar_detected_work(struct work_struct *work) void ieee80211_dfs_radar_detected_work(struct wiphy *wiphy,
struct wiphy_work *work)
{ {
struct ieee80211_local *local = struct ieee80211_local *local =
container_of(work, struct ieee80211_local, radar_detected_work); container_of(work, struct ieee80211_local, radar_detected_work);
...@@ -4376,9 +4377,7 @@ void ieee80211_dfs_radar_detected_work(struct work_struct *work) ...@@ -4376,9 +4377,7 @@ void ieee80211_dfs_radar_detected_work(struct work_struct *work)
} }
mutex_unlock(&local->chanctx_mtx); mutex_unlock(&local->chanctx_mtx);
wiphy_lock(local->hw.wiphy);
ieee80211_dfs_cac_cancel(local); ieee80211_dfs_cac_cancel(local);
wiphy_unlock(local->hw.wiphy);
if (num_chanctx > 1) if (num_chanctx > 1)
/* XXX: multi-channel is not supported yet */ /* XXX: multi-channel is not supported yet */
...@@ -4393,7 +4392,7 @@ void ieee80211_radar_detected(struct ieee80211_hw *hw) ...@@ -4393,7 +4392,7 @@ void ieee80211_radar_detected(struct ieee80211_hw *hw)
trace_api_radar_detected(local); trace_api_radar_detected(local);
schedule_work(&local->radar_detected_work); wiphy_work_queue(hw->wiphy, &local->radar_detected_work);
} }
EXPORT_SYMBOL(ieee80211_radar_detected); EXPORT_SYMBOL(ieee80211_radar_detected);
......
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