The branch main has been updated by bz:
URL:
https://cgit.FreeBSD.org/src/commit/?id=63a327b954a38ecd46934a2911321f3ea3d500b3
commit 63a327b954a38ecd46934a2911321f3ea3d500b3
Author: Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2024-06-07 23:57:04 +0000
Commit: Bjoern A. Zeeb <b...@freebsd.org>
CommitDate: 2024-06-07 23:57:04 +0000
LinuxKPI: 802.11: use net80211 IEEE80211_HTCAP_* definitions
Rather than using the values and leaving net80211 names in a comment
define the LinuxKPI IEEE80211_HT_CAP_* to the net80211 IEEE80211_HTCAP_*
names. That way errors like the one fixed in 3e0915b7b685 are less
likely to happen.
Sponsored by: The FreeBSD Foundation
MFC after: 3 days
---
.../linuxkpi/common/include/linux/ieee80211.h | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h
b/sys/compat/linuxkpi/common/include/linux/ieee80211.h
index 0fd90e921c77..aa1a0a4f3c5f 100644
--- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h
+++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h
@@ -254,20 +254,20 @@ enum ieee80211_ac_numbers {
#define IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL 0xf
-/* XXX net80211 calls these IEEE80211_HTCAP_* */
-#define IEEE80211_HT_CAP_LDPC_CODING 0x0001 /*
IEEE80211_HTCAP_LDPC */
-#define IEEE80211_HT_CAP_SUP_WIDTH_20_40 0x0002 /*
IEEE80211_HTCAP_CHWIDTH40 */
-#define IEEE80211_HT_CAP_SM_PS 0x000c /*
IEEE80211_HTCAP_SMPS */
+/* Define the LinuxKPI names directly to the net80211 ones. */
+#define IEEE80211_HT_CAP_LDPC_CODING IEEE80211_HTCAP_LDPC
+#define IEEE80211_HT_CAP_SUP_WIDTH_20_40
IEEE80211_HTCAP_CHWIDTH40
+#define IEEE80211_HT_CAP_SM_PS IEEE80211_HTCAP_SMPS
#define IEEE80211_HT_CAP_SM_PS_SHIFT 2
-#define IEEE80211_HT_CAP_GRN_FLD 0x0010 /*
IEEE80211_HTCAP_GREENFIELD */
-#define IEEE80211_HT_CAP_SGI_20 0x0020 /*
IEEE80211_HTCAP_SHORTGI20 */
-#define IEEE80211_HT_CAP_SGI_40 0x0040 /*
IEEE80211_HTCAP_SHORTGI40 */
-#define IEEE80211_HT_CAP_TX_STBC 0x0080 /*
IEEE80211_HTCAP_TXSTBC */
-#define IEEE80211_HT_CAP_RX_STBC 0x0300 /*
IEEE80211_HTCAP_RXSTBC */
-#define IEEE80211_HT_CAP_RX_STBC_SHIFT 8 /*
IEEE80211_HTCAP_RXSTBC_S */
-#define IEEE80211_HT_CAP_MAX_AMSDU 0x0800 /*
IEEE80211_HTCAP_MAXAMSDU */
-#define IEEE80211_HT_CAP_DSSSCCK40 0x1000 /*
IEEE80211_HTCAP_DSSSCCK40 */
-#define IEEE80211_HT_CAP_LSIG_TXOP_PROT 0x8000 /*
IEEE80211_HTCAP_LSIGTXOPPROT */
+#define IEEE80211_HT_CAP_GRN_FLD
IEEE80211_HTCAP_GREENFIELD
+#define IEEE80211_HT_CAP_SGI_20
IEEE80211_HTCAP_SHORTGI20
+#define IEEE80211_HT_CAP_SGI_40
IEEE80211_HTCAP_SHORTGI40
+#define IEEE80211_HT_CAP_TX_STBC IEEE80211_HTCAP_TXSTBC
+#define IEEE80211_HT_CAP_RX_STBC IEEE80211_HTCAP_RXSTBC
+#define IEEE80211_HT_CAP_RX_STBC_SHIFT IEEE80211_HTCAP_RXSTBC_S
+#define IEEE80211_HT_CAP_MAX_AMSDU IEEE80211_HTCAP_MAXAMSDU
+#define IEEE80211_HT_CAP_DSSSCCK40
IEEE80211_HTCAP_DSSSCCK40
+#define IEEE80211_HT_CAP_LSIG_TXOP_PROT
IEEE80211_HTCAP_LSIGTXOPPROT
#define IEEE80211_HT_MCS_TX_DEFINED 0x0001
#define IEEE80211_HT_MCS_TX_RX_DIFF 0x0002
