wifi: cfg80211: move sched scan stop to wiphy work

This work can now trivially be converted, it behaves
identical either way.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/core.c b/net/wireless/core.c
index ca585e9..f59624f 100644 (file)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -365,7 +365,8 @@ static void cfg80211_destroy_iface_wk(struct work_struct *work)
        rtnl_unlock();
 }
 
-static void cfg80211_sched_scan_stop_wk(struct work_struct *work)
+static void cfg80211_sched_scan_stop_wk(struct wiphy *wiphy,
+                                       struct wiphy_work *work)
 {
        struct cfg80211_registered_device *rdev;
        struct cfg80211_sched_scan_request *req, *tmp;
@@ -373,12 +374,10 @@ static void cfg80211_sched_scan_stop_wk(struct work_struct *work)
        rdev = container_of(work, struct cfg80211_registered_device,
                           sched_scan_stop_wk);
 
-       wiphy_lock(&rdev->wiphy);
        list_for_each_entry_safe(req, tmp, &rdev->sched_scan_req_list, list) {
                if (req->nl_owner_dead)
                        cfg80211_stop_sched_scan_req(rdev, req, false);
        }
-       wiphy_unlock(&rdev->wiphy);
 }
 
 static void cfg80211_propagate_radar_detect_wk(struct work_struct *work)
@@ -541,7 +540,7 @@ use_default_name:
        device_enable_async_suspend(&rdev->wiphy.dev);
 
        INIT_WORK(&rdev->destroy_work, cfg80211_destroy_iface_wk);
-       INIT_WORK(&rdev->sched_scan_stop_wk, cfg80211_sched_scan_stop_wk);
+       wiphy_work_init(&rdev->sched_scan_stop_wk, cfg80211_sched_scan_stop_wk);
        INIT_WORK(&rdev->sched_scan_res_wk, cfg80211_sched_scan_results_wk);
        INIT_WORK(&rdev->propagate_radar_detect_wk,
                  cfg80211_propagate_radar_detect_wk);
@@ -1148,7 +1147,6 @@ void wiphy_unregister(struct wiphy *wiphy)
        cancel_delayed_work_sync(&rdev->dfs_update_channels_wk);
        cancel_delayed_work_sync(&rdev->background_cac_done_wk);
        flush_work(&rdev->destroy_work);
-       flush_work(&rdev->sched_scan_stop_wk);
        flush_work(&rdev->propagate_radar_detect_wk);
        flush_work(&rdev->propagate_cac_done_wk);
        flush_work(&rdev->mgmt_registrations_update_wk);

diff --git a/net/wireless/core.h b/net/wireless/core.h
index 435060d..468957a 100644 (file)
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -95,7 +95,7 @@ struct cfg80211_registered_device {
        struct cfg80211_coalesce *coalesce;
 
        struct work_struct destroy_work;
-       struct work_struct sched_scan_stop_wk;
+       struct wiphy_work sched_scan_stop_wk;
        struct work_struct sched_scan_res_wk;
 
        struct cfg80211_chan_def radar_chandef;

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index a52bd73..772671b 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -19777,7 +19777,8 @@ static int nl80211_netlink_notify(struct notifier_block * nb,
                                        list) {
                        if (sched_scan_req->owner_nlportid == notify->portid) {
                                sched_scan_req->nl_owner_dead = true;
-                               schedule_work(&rdev->sched_scan_stop_wk);
+                               wiphy_work_queue(&rdev->wiphy,
+                                                &rdev->sched_scan_stop_wk);
                        }
                }