git: 7b9d08676f33 - stable/14 - LinuxKPI: 802.11: more fields moved from vif to bss_conf

The branch stable/14 has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=7b9d08676f3396f404501c959c4c0a95e3098ff4

commit 7b9d08676f3396f404501c959c4c0a95e3098ff4
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-04-08 01:04:49 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2025-04-18 14:36:00 +0000

    LinuxKPI: 802.11: more fields moved from vif to bss_conf
    
    csa_active, color_change_active, mu_mimo_owner also moved from
    vif to bss_conf; we already have the fields in bss_conf (adjust type
    for one) so all we have to do is remove the old relics in vif.
    
    Sponsored by:   The FreeBSD Foundation
    Tested by:      Oleksandr Kryvulia (shuriku shurik.kiev.ua)
    Tested by:      Oleg Nauman (oleg.nauman gmail.com) [rtw88]
    Differential Revision: https://reviews.freebsd.org/D49734
    
    (cherry picked from commit 5321cf2b15d7bff1b01182cfc4897ac978c63fe7)
---
 sys/compat/linuxkpi/common/include/net/mac80211.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h
index 016143874564..8856eee8c696 100644
--- a/sys/compat/linuxkpi/common/include/net/mac80211.h
+++ b/sys/compat/linuxkpi/common/include/net/mac80211.h
@@ -343,6 +343,7 @@ struct ieee80211_bss_conf {
 	bool					eht_support;
 	bool					csa_active;
 	bool					mu_mimo_owner;
+	bool					color_change_active;
 	uint32_t				sync_device_ts;
 	uint64_t				sync_tsf;
 	uint16_t				beacon_int;
@@ -363,7 +364,6 @@ struct ieee80211_bss_conf {
 	int		twt_requester, uora_exists, uora_ocw_range;
 	int		assoc_capability, enable_beacon, hidden_ssid, ibss_joined, twt_protected;
 	int		twt_responder, unsol_bcast_probe_resp_interval;
-	int		color_change_active;
 };
 
 struct ieee80211_channel_switch {
@@ -831,9 +831,8 @@ struct ieee80211_vif_cfg {
 struct ieee80211_vif {
 	/* TODO FIXME */
 	enum nl80211_iftype		type;
-	int		csa_active, mu_mimo_owner;
 	int		cab_queue;
-	int     color_change_active, offload_flags;
+	int		offload_flags;
 	enum ieee80211_vif_driver_flags	driver_flags;
 	bool				p2p;
 	bool				probe_req_reg;