summaryrefslogtreecommitdiff
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2023-06-06 15:49:29 +0300
committerJohannes Berg <johannes.berg@intel.com>2023-06-07 20:53:24 +0300
commitec3252bff7b60fd2ee1a51a11054c54d63435ed2 (patch)
tree53d712c80cdf057904ee8f4b11b10a5d8e417cdf /net/mac80211/ieee80211_i.h
parent1444f58931ef5227532cf5436bb55c1dd511d9a2 (diff)
downloadlinux-ec3252bff7b60fd2ee1a51a11054c54d63435ed2.tar.xz
wifi: mac80211: use wiphy work for channel switch
Channel switch obviously must be handled per link, and we have a (potential) deadlock when canceling that work. Use the new delayed wiphy work to handle this instead and get rid of the explicit timer that way too. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 0ecb725f5307..b39a923cdd0e 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -918,8 +918,7 @@ struct ieee80211_link_data_managed {
bool csa_waiting_bcn;
bool csa_ignored_same_chan;
- struct timer_list chswitch_timer;
- struct work_struct chswitch_work;
+ struct wiphy_delayed_work chswitch_work;
struct wiphy_work request_smps_work;
bool beacon_crc_valid;