diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-06-06 15:49:31 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-06-07 20:53:29 +0300 |
| commit | 4b8d43f1137cb9f6e8bb3b77251ad9429ab7ef34 (patch) | |
| tree | 8175641a45bd3da5931eedd8daaf23d975fd0906 /net/mac80211/main.c | |
| parent | 87351d09261308472ddb6d700e182c34db4fce7a (diff) | |
| download | linux-4b8d43f1137cb9f6e8bb3b77251ad9429ab7ef34.tar.xz | |
wifi: mac80211: mlme: move disconnects to wiphy work
Move the beacon loss work that might cause a disconnect
and the CSA disconnect work to be wiphy work, so we hold
the wiphy lock for them.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 3db178b1d50c..24315d7b3126 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -364,7 +364,8 @@ static void ieee80211_restart_work(struct work_struct *work) * The exception is ieee80211_chswitch_done. * Then we can have a race... */ - cancel_work_sync(&sdata->u.mgd.csa_connection_drop_work); + wiphy_work_cancel(local->hw.wiphy, + &sdata->u.mgd.csa_connection_drop_work); if (sdata->vif.bss_conf.csa_active) { sdata_lock(sdata); ieee80211_sta_connection_lost(sdata, |