git: a3baca22d0b7 - main - LinuxKPI: 802.11: fix types and whitespace

The branch main has been updated by bz:

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

commit a3baca22d0b7789a040a60f389e3c132b6e1755b
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2023-01-31 13:39:04 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2023-01-31 13:39:04 +0000

    LinuxKPI: 802.11: fix types and whitespace
    
    Correct struct member types, fix whitespace, and remove superfluous
    return statements in void functions.
    
    No functional changes.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      3 days
---
 sys/compat/linuxkpi/common/include/net/cfg80211.h | 11 ++++++-----
 sys/compat/linuxkpi/common/include/net/mac80211.h |  6 ------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h
index 55a74227a338..8b73dc1abe3f 100644
--- a/sys/compat/linuxkpi/common/include/net/cfg80211.h
+++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2020-2021 The FreeBSD Foundation
+ * Copyright (c) 2020-2023 The FreeBSD Foundation
  * Copyright (c) 2021-2022 Bjoern A. Zeeb
  *
  * This software was developed by Björn Zeeb under sponsorship from
@@ -265,9 +265,8 @@ struct cfg80211_roam_info {
 };
 
 struct cfg80211_bss_ies {
-		/* XXX TODO, type is best guess. Fix if more info. */
 	uint8_t				*data;
-	int				len;
+	size_t				len;
 };
 
 struct cfg80211_bss {
@@ -937,6 +936,7 @@ struct iface_combination_params {
 struct regulatory_request {
 		/* XXX TODO */
 	uint8_t					alpha2[2];
+	enum environment_cap			country_ie_env;
 	int	initiator, dfs_region;
 	int	user_reg_hint_type;
 };
@@ -1029,8 +1029,9 @@ struct wiphy {
 	uint32_t				rts_threshold;
 	uint32_t				frag_threshold;
 	struct tid_config_support		tid_config_support;
+	uint8_t					available_antennas_rx;
+	uint8_t					available_antennas_tx;
 
-	int	available_antennas_rx, available_antennas_tx;
 	int	features, hw_version;
 	int	interface_modes, max_match_sets, max_remain_on_channel_duration, max_scan_ssids, max_sched_scan_ie_len, max_sched_scan_plan_interval, max_sched_scan_plan_iterations, max_sched_scan_plans, max_sched_scan_reqs, max_sched_scan_ssids;
 	int	num_iftype_ext_capab;
@@ -1200,7 +1201,7 @@ cfg80211_get_bss(struct wiphy *wiphy, struct linuxkpi_ieee80211_channel *chan,
 {
 
 	return (linuxkpi_cfg80211_get_bss(wiphy, chan, bssid, ssid, ssid_len,
-	   bss_type, privacy));
+	    bss_type, privacy));
 }
 
 static inline void
diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h
index d548b9bb956f..caf9be89281e 100644
--- a/sys/compat/linuxkpi/common/include/net/mac80211.h
+++ b/sys/compat/linuxkpi/common/include/net/mac80211.h
@@ -2394,7 +2394,6 @@ static __inline void
 ieee80211_resume_disconnect(struct ieee80211_vif *vif)
 {
         TODO();
-        return;
 }
 
 static __inline int
@@ -2410,7 +2409,6 @@ ieee80211_get_tkip_p1k_iv(struct ieee80211_key_conf *key,
     uint32_t iv32, uint16_t *p1k)
 {
         TODO();
-        return;
 }
 
 static __inline struct ieee80211_key_conf *
@@ -2426,14 +2424,12 @@ ieee80211_gtk_rekey_notify(struct ieee80211_vif *vif, const uint8_t *bssid,
     const uint8_t *replay_ctr, gfp_t gfp)
 {
         TODO();
-        return;
 }
 
 static __inline void
 ieee80211_remove_key(struct ieee80211_key_conf *key)
 {
         TODO();
-        return;
 }
 
 static __inline void
@@ -2441,7 +2437,6 @@ ieee80211_set_key_rx_seq(struct ieee80211_key_conf *key, int tid,
     struct ieee80211_key_seq *seq)
 {
         TODO();
-        return;
 }
 
 static __inline void
@@ -2449,7 +2444,6 @@ ieee80211_report_wowlan_wakeup(struct ieee80211_vif *vif,
     struct cfg80211_wowlan_wakeup *wakeup, gfp_t gfp)
 {
         TODO();
-        return;
 }
 
 static __inline void