git: a39492485637 - main - LinuxKPI: 802.11: correct struct linuxkpi_ieee80211_channel

The branch main has been updated by bz:

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

commit a394924856373b5228f542360618cfed8e334504
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-06-22 07:31:05 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2025-08-24 10:26:39 +0000

    LinuxKPI: 802.11: correct struct linuxkpi_ieee80211_channel
    
    Some of the annotations were not quite right.  Also various fields had
    not been typed properly.  Correct the types of field members and
    given the change also re-sort.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      3 days
---
 sys/compat/linuxkpi/common/include/net/cfg80211.h | 25 ++++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h
index b79dd003a677..239b4a5ae7b8 100644
--- a/sys/compat/linuxkpi/common/include/net/cfg80211.h
+++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h
@@ -128,19 +128,24 @@ struct ieee80211_txrx_stypes {
 	uint16_t	rx;
 };
 
-/* XXX net80211 has an ieee80211_channel as well. */
+/*
+ * net80211 has an ieee80211_channel as well; we use the linuxkpi_ version
+ * interally in LinuxKPI and re-define ieee80211_channel for the drivers
+ * at the end of the file.
+ */
 struct linuxkpi_ieee80211_channel {
-	/* TODO FIXME */
-	uint32_t				hw_value;	/* ic_ieee */
-	uint32_t				center_freq;	/* ic_freq */
-	enum ieee80211_channel_flags		flags;		/* ic_flags */
+	uint32_t				center_freq;
+	uint16_t				hw_value;
+	enum ieee80211_channel_flags		flags;
 	enum nl80211_band			band;
-	int8_t					max_power;	/* ic_maxpower */
 	bool					beacon_found;
-	int     max_antenna_gain, max_reg_power;
-	int     orig_flags;
-	int	dfs_cac_ms, dfs_state;
-	int	orig_mpwr;
+	enum nl80211_dfs_state			dfs_state;
+	unsigned int				dfs_cac_ms;
+	int					max_antenna_gain;
+	int					max_power;
+	int					max_reg_power;
+	uint32_t				orig_flags;
+	int					orig_mpwr;
 };
 
 struct cfg80211_bitrate_mask {