wifi: mac80211: move radar detect work to wiphy work

[ Upstream commit 228e4f931b0e630dacca8dd867ddd863aea53913 ]

Move the radar detect work to wiphy work in order
to lock the wiphy for it without doing it manually.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Stable-dep-of: eadfb54756ae ("wifi: mac80211: move sched-scan stop work to wiphy work")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 99a976ea17498bd6c5c95f01b7adc1484ebd4a97..3960f40c9da99886e3c02eac694e380001a7a5d7 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1361,7 +1361,7 @@ struct ieee80211_local {
        /* wowlan is enabled -- don't reconfig on resume */
        bool wowlan;
 
-       struct work_struct radar_detected_work;
+       struct wiphy_work radar_detected_work;
 
        /* number of RX chains the hardware has */
        u8 rx_chains;
@@ -2483,7 +2483,8 @@ bool ieee80211_is_radar_required(struct ieee80211_local *local);
 void ieee80211_dfs_cac_timer(unsigned long data);
 void ieee80211_dfs_cac_timer_work(struct work_struct *work);
 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,
                              struct cfg80211_csa_settings *csa_settings);
 

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 02b5abc7326bc52ea38ade9d19d1e5870110a3e1..444a0d6021f358bc4f8cbba1ba0ca4b4a4d48e95 100644 (file)
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -337,7 +337,6 @@ static void ieee80211_restart_work(struct work_struct *work)
        /* wait for scan work complete */
        flush_workqueue(local->workqueue);
        flush_work(&local->sched_scan_stopped_work);
-       flush_work(&local->radar_detected_work);
 
        rtnl_lock();
        /* we might do interface manipulations, so need both */
@@ -811,8 +810,8 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len,
 
        INIT_WORK(&local->restart_work, ieee80211_restart_work);
 
-       INIT_WORK(&local->radar_detected_work,
-                 ieee80211_dfs_radar_detected_work);
+       wiphy_work_init(&local->radar_detected_work,
+                       ieee80211_dfs_radar_detected_work);
 
        INIT_WORK(&local->reconfig_filter, ieee80211_reconfig_filter);
        local->smps_mode = IEEE80211_SMPS_OFF;
@@ -1471,13 +1470,15 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
         */
        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();
 
        cancel_delayed_work_sync(&local->roc_work);
        cancel_work_sync(&local->restart_work);
        cancel_work_sync(&local->reconfig_filter);
        flush_work(&local->sched_scan_stopped_work);
-       flush_work(&local->radar_detected_work);
 
        ieee80211_clear_tx_pending(local);
        rate_control_deinitialize(local);

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 98806c359b1731ca3acef1ef8cd4d0dc10d878c7..114956ef17fc3406d01d84aec306ce3b686e2cb4 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -4069,7 +4069,8 @@ void ieee80211_dfs_cac_cancel(struct ieee80211_local *local)
        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 =
                container_of(work, struct ieee80211_local, radar_detected_work);
@@ -4087,9 +4088,7 @@ void ieee80211_dfs_radar_detected_work(struct work_struct *work)
        }
        mutex_unlock(&local->chanctx_mtx);
 
-       wiphy_lock(local->hw.wiphy);
        ieee80211_dfs_cac_cancel(local);
-       wiphy_unlock(local->hw.wiphy);
 
        if (num_chanctx > 1)
                /* XXX: multi-channel is not supported yet */
@@ -4104,7 +4103,7 @@ void ieee80211_radar_detected(struct ieee80211_hw *hw)
 
        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);