diff options
| author | David S. Miller <davem@davemloft.net> | 2024-10-25 10:44:41 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-10-25 10:44:41 +0100 |
| commit | e31a8219fbfcf9dc65ba1e1c10cade12b6754e00 (patch) | |
| tree | 2f238eb1a773ad54f0bedf5cd4ef6dd7e9edc294 /net/mac80211/ieee80211_i.h | |
| parent | d44cd8226449114780a8554fd253c7e3d171a0a6 (diff) | |
| parent | a940b3a1ad0f5bab139fd710dd433aec4eeaea85 (diff) | |
| download | linux-e31a8219fbfcf9dc65ba1e1c10cade12b6754e00.tar.gz linux-e31a8219fbfcf9dc65ba1e1c10cade12b6754e00.tar.bz2 linux-e31a8219fbfcf9dc65ba1e1c10cade12b6754e00.zip | |
Merge tag 'wireless-2024-10-21' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless
wireless fixes for v6.12-rc5
The first set of wireless fixes for v6.12. We have been busy and have
not been able to send this earlier, so there are more fixes than
usual. The fixes are all over, both in stack and in drivers, but
nothing special really standing out.
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 4f0390918b60..04fec7e516cf 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1053,7 +1053,7 @@ struct ieee80211_link_data { } csa; struct wiphy_work color_change_finalize_work; - struct delayed_work color_collision_detect_work; + struct wiphy_delayed_work color_collision_detect_work; u64 color_bitmap; /* context reservation -- protected with wiphy mutex */ @@ -2005,7 +2005,8 @@ int ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev, /* color change handling */ void ieee80211_color_change_finalize_work(struct wiphy *wiphy, struct wiphy_work *work); -void ieee80211_color_collision_detection_work(struct work_struct *work); +void ieee80211_color_collision_detection_work(struct wiphy *wiphy, + struct wiphy_work *work); /* interface handling */ #define MAC80211_SUPPORTED_FEATURES_TX (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | \ |