git: 38a7e400656f - stable/13 - LinuxKPI: 802.11: correct HE_MAC_CAP3 values

From: Bjoern A. Zeeb <bz_at_FreeBSD.org>
Date: Mon, 26 Jun 2023 12:09:03 UTC
The branch stable/13 has been updated by bz:

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

commit 38a7e400656f305389a76b4a1d2971b60ff7193c
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2023-06-10 22:56:03 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2023-06-26 09:25:53 +0000

    LinuxKPI: 802.11: correct HE_MAC_CAP3 values
    
    While we had assigned dummy values so far to HE, correct the HW_MAC_CAP3
    values to avoid compile time errors of drivers when shifting values out
    of range.
    
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit 51117ed11640e40e877872065ea039e9f97a9cd0)
---
 sys/compat/linuxkpi/common/include/net/cfg80211.h | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h
index 8b73dc1abe3f..250f07ee0669 100644
--- a/sys/compat/linuxkpi/common/include/net/cfg80211.h
+++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h
@@ -614,15 +614,14 @@ struct linuxkpi_ieee80211_regdomain {
 #define	IEEE80211_HE_MAC_CAP2_MU_CASCADING		0x40
 #define	IEEE80211_HE_MAC_CAP2_TRS			0x80
 
-#define	IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2	0x1
-#define	IEEE80211_HE_MAC_CAP3_OMI_CONTROL		0x2
-#define	IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_1	0x10
-#define	IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2	0x20
-#define	IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3	0x40
-#define	IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK	0x70
+#define	IEEE80211_HE_MAC_CAP3_OMI_CONTROL		0x02
+#define	IEEE80211_HE_MAC_CAP3_OFDMA_RA			0x04
+#define	IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_1	0x08
+#define	IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2	0x10
+#define	IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3	0x18
+#define	IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK	0x18
+#define	IEEE80211_HE_MAC_CAP3_FLEX_TWT_SCHED		0x40
 #define	IEEE80211_HE_MAC_CAP3_RX_CTRL_FRAME_TO_MULTIBSS	0x80
-#define	IEEE80211_HE_MAC_CAP3_FLEX_TWT_SCHED		0x80
-#define	IEEE80211_HE_MAC_CAP3_OFDMA_RA			0x80
 
 #define	IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU		0x1
 #define	IEEE80211_HE_MAC_CAP4_BQR			0x2