diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-06-06 14:49:33 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-06-07 19:53:37 +0200 |
| commit | fe0af9fe54d0ff53aa49eef390c8962355b274e2 (patch) | |
| tree | f68ca87e7293685f701313adb2c1e43feacd6178 /net/wireless/core.c | |
| parent | c88d7178229b7b9482ab4cc0b781aef0f20c3dfb (diff) | |
| download | linux-stable-fe0af9fe54d0ff53aa49eef390c8962355b274e2.tar.gz linux-stable-fe0af9fe54d0ff53aa49eef390c8962355b274e2.tar.bz2 linux-stable-fe0af9fe54d0ff53aa49eef390c8962355b274e2.zip | |
wifi: cfg80211: move scan done work to wiphy work
Move the scan done work to the new wiphy work to
simplify the code a bit.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index f59624f008fb..fc449bea39a1 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -527,7 +527,7 @@ use_default_name: spin_lock_init(&rdev->bss_lock); INIT_LIST_HEAD(&rdev->bss_list); INIT_LIST_HEAD(&rdev->sched_scan_req_list); - INIT_WORK(&rdev->scan_done_wk, __cfg80211_scan_done); + wiphy_work_init(&rdev->scan_done_wk, __cfg80211_scan_done); INIT_DELAYED_WORK(&rdev->dfs_update_channels_wk, cfg80211_dfs_channels_update_work); #ifdef CONFIG_CFG80211_WEXT @@ -1141,7 +1141,6 @@ void wiphy_unregister(struct wiphy *wiphy) /* this has nothing to do now but make sure it's gone */ cancel_work_sync(&rdev->wiphy_work); - flush_work(&rdev->scan_done_wk); cancel_work_sync(&rdev->conn_work); flush_work(&rdev->event_work); cancel_delayed_work_sync(&rdev->dfs_update_channels_wk); |