The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=afb48bd5751c9f9e7c2ca322910e6510d3f3b77e
commit afb48bd5751c9f9e7c2ca322910e6510d3f3b77e Author: Bjoern A. Zeeb <[email protected]> AuthorDate: 2022-10-31 22:24:08 +0000 Commit: Bjoern A. Zeeb <[email protected]> CommitDate: 2022-11-28 16:30:31 +0000 LinuxKPI: 802.11: update struct member types Update struct member types for ongoing work towards HT support. Sponsored by: The FreeBSD Foundation (cherry picked from commit 05e640dc9e13015735d25366fc0e088939f1e099) --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 4 ++-- sys/compat/linuxkpi/common/include/net/mac80211.h | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 7995f633256f..41fe6983eb4d 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -173,9 +173,9 @@ struct ieee80211_rate { }; struct ieee80211_sta_ht_cap { - /* TODO FIXME */ - int ampdu_density, ampdu_factor; bool ht_supported; + uint8_t ampdu_density; + uint8_t ampdu_factor; uint16_t cap; struct ieee80211_mcs_info mcs; }; diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index a7836df006d8..7f6d50de6b78 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -618,13 +618,16 @@ struct ieee80211_link_sta { #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; + int max_amsdu_len, max_amsdu_subframes, max_rc_amsdu_len; + int mfp, smps_mode, tdls, tdls_initiator; 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? */ uint32_t max_tid_amsdu_len[IEEE80211_NUM_TIDS]; uint8_t addr[ETH_ALEN]; uint16_t aid; + bool wme; + uint8_t max_sp; + uint8_t uapsd_queues; struct ieee80211_link_sta deflink;
