Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 18 Jan 2023 16:24:58 GMT
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 5ba6ef0ac529 - stable/13 - LinuxKPI; 802.11: update mac80211.h structures and fields
Message-ID:  <202301181624.30IGOwai038141@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by bz:

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

commit 5ba6ef0ac52986ec9861b9aa0a908ca50011d668
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2022-12-31 02:15:28 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2023-01-18 13:26:07 +0000

    LinuxKPI; 802.11: update mac80211.h structures and fields
    
    Cleanup some fields and structures and add new ones.
    
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit c990500bf1028d55cdd370037c78ea808956e0fc)
---
 sys/compat/linuxkpi/common/include/net/mac80211.h | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h
index 75f2dac02be2..22b00726a727 100644
--- a/sys/compat/linuxkpi/common/include/net/mac80211.h
+++ b/sys/compat/linuxkpi/common/include/net/mac80211.h
@@ -224,6 +224,10 @@ struct ieee80211_chanctx_conf {
 	uint8_t					drv_priv[0] __aligned(CACHE_LINE_SIZE);
 };
 
+struct ieee80211_rate_status {
+	struct rate_info			rate_idx;
+};
+
 #define	WLAN_MEMBERSHIP_LEN			(8)
 #define	WLAN_USER_POSITION_LEN			(16)
 
@@ -557,15 +561,12 @@ struct ieee80211_rx_status {
 	uint8_t				rate_idx;
 };
 
-struct ieee80211_tx_rate_status {
-};
-
 struct ieee80211_tx_status {
 	struct ieee80211_sta		*sta;
 	struct ieee80211_tx_info	*info;
 
 	u8				n_rates;
-	struct ieee80211_tx_rate_status	*rates;
+	struct ieee80211_rate_status	*rates;
 
 	struct sk_buff			*skb;
 	struct list_head		*free_list;
@@ -609,6 +610,11 @@ struct ieee80211_sta_txpwr {
 	short				power;
 };
 
+struct ieee80211_sta_agg {
+	/* XXX TODO */
+	int max_amsdu_len;
+};
+
 struct ieee80211_link_sta {
 	uint32_t				supp_rates[NUM_NL80211_BANDS];
 	struct ieee80211_sta_ht_cap		ht_cap;
@@ -617,6 +623,8 @@ struct ieee80211_link_sta {
 	struct ieee80211_sta_he_6ghz_capa	he_6ghz_capa;
 	uint8_t					rx_nss;
 	enum ieee80211_sta_rx_bw		bandwidth;
+	enum ieee80211_smps_mode		smps_mode;
+	struct ieee80211_sta_agg		agg;
 	struct ieee80211_sta_txpwr		txpwr;
 };
 
@@ -682,6 +690,7 @@ enum ieee80211_vif_driver_flags {
 struct ieee80211_vif_cfg {
 	uint16_t				aid;
 	bool					assoc;
+	bool					ps;
 	int					arp_addr_cnt;
 	uint32_t				arp_addr_list[IEEE80211_BSS_ARP_ADDR_LIST_LEN];		/* big endian */
 };



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301181624.30IGOwai038141>