diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-08-28 13:59:37 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-09-11 11:27:19 +0200 |
| commit | 766d2601a6e50b52c5dcc47dce6d64faa2cffb30 (patch) | |
| tree | f5990503dd00c741be9ac4c4591d1114f0692f78 /net/mac80211/util.c | |
| parent | wifi: mac80211: add more ops assertions (diff) | |
| download | linux-766d2601a6e50b52c5dcc47dce6d64faa2cffb30.tar.xz linux-766d2601a6e50b52c5dcc47dce6d64faa2cffb30.zip | |
wifi: mac80211: move DFS CAC work to wiphy work
Move the DFS CAC work over to hold the wiphy lock
there without worry about work cancellation.
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | net/mac80211/util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 6d8b73796dc5..ff99aee46656 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -4343,7 +4343,8 @@ void ieee80211_dfs_cac_cancel(struct ieee80211_local *local) * by the time it gets it, sdata->wdev.cac_started * will no longer be true */ - cancel_delayed_work(&sdata->deflink.dfs_cac_timer_work); + wiphy_delayed_work_cancel(local->hw.wiphy, + &sdata->deflink.dfs_cac_timer_work); if (sdata->wdev.cac_started) { chandef = sdata->vif.bss_conf.chandef; |