aboutsummaryrefslogtreecommitdiff
path: root/sys/compat/linuxkpi/common/include/net
diff options
context:
space:
mode:
authorBjoern A. Zeeb <bz@FreeBSD.org>2022-05-20 18:37:27 +0000
committerBjoern A. Zeeb <bz@FreeBSD.org>2022-05-20 18:45:18 +0000
commit6cf748ad948897de636c972debf5733624f6fc20 (patch)
treed2cb6a522d2d00a4aef060286e5b8a9c3482e2d6 /sys/compat/linuxkpi/common/include/net
parentec3c225711ae7d5b8e71ed036aada09ef91149ec (diff)
downloadsrc-6cf748ad948897de636c972debf5733624f6fc20.tar.gz
src-6cf748ad948897de636c972debf5733624f6fc20.zip
LinuxKPI 802.11 / iwlwifi / rtw88 : re-factor ieee802211_sta for MLO
Working on an update for rtw88 baed on wireless-testing I ran into a build issue with struct ieee802211_sta. Some fields were factored out into their own struct apparently preparing for MLO (Multi Link Operation). In order to be able to update one driver we have to adjust both rtw88 and iwlwifi (and the ones still out-of-tree) now. This is mostly a sed-replace job and no functional changes are intended. Sponsored by: The FreeBSD Foundation MFC after: 3 days
Diffstat (limited to 'sys/compat/linuxkpi/common/include/net')
-rw-r--r--sys/compat/linuxkpi/common/include/net/mac80211.h22
1 files changed, 14 insertions, 8 deletions
diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h
index 7a8306919194..dcdad44665a3 100644
--- a/sys/compat/linuxkpi/common/include/net/mac80211.h
+++ b/sys/compat/linuxkpi/common/include/net/mac80211.h
@@ -558,24 +558,30 @@ struct ieee80211_sta_txpwr {
short power;
};
-#define IEEE80211_NUM_TIDS 16 /* net80211::WME_NUM_TID */
-struct ieee80211_sta {
- /* TODO FIXME */
- int max_amsdu_len, max_amsdu_subframes, max_rc_amsdu_len, max_sp;
- int mfp, rx_nss, smps_mode, tdls, tdls_initiator, uapsd_queues, wme;
- enum ieee80211_sta_rx_bw bandwidth;
+struct ieee80211_link_sta {
+ uint32_t supp_rates[NUM_NL80211_BANDS];
struct ieee80211_sta_ht_cap ht_cap;
struct ieee80211_sta_vht_cap vht_cap;
struct ieee80211_sta_he_cap he_cap;
struct ieee80211_sta_he_6ghz_capa he_6ghz_capa;
+ uint8_t rx_nss;
+ enum ieee80211_sta_rx_bw bandwidth;
+ struct ieee80211_sta_txpwr txpwr;
+};
+
+#define IEEE80211_NUM_TIDS 16 /* net80211::WME_NUM_TID */
+struct ieee80211_sta {
+ /* TODO FIXME */
+ int max_amsdu_len, max_amsdu_subframes, max_rc_amsdu_len, max_sp;
+ int mfp, smps_mode, tdls, tdls_initiator, uapsd_queues, wme;
struct ieee80211_txq *txq[IEEE80211_NUM_TIDS + 1]; /* iwlwifi: 8 and adds +1 to tid_data, net80211::IEEE80211_TID_SIZE */
struct ieee80211_sta_rates *rates; /* some rcu thing? */
- struct ieee80211_sta_txpwr txpwr;
uint32_t max_tid_amsdu_len[IEEE80211_NUM_TIDS];
- uint32_t supp_rates[NUM_NL80211_BANDS];
uint8_t addr[ETH_ALEN];
uint16_t aid;
+ struct ieee80211_link_sta deflink;
+
/* Must stay last. */
uint8_t drv_priv[0] __aligned(CACHE_LINE_SIZE);
};