git: a23908728efc - main - LinuxKPI: 802.11: fix TKIP RX/TX MIC offsets

From: Bjoern A. Zeeb <bz_at_FreeBSD.org>
Date: Wed, 23 Apr 2025 16:25:23 UTC
The branch main has been updated by bz:

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

commit a23908728efce08cfd10b13ed34de1361d0a980f
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-04-16 08:18:24 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2025-04-23 16:24:21 +0000

    LinuxKPI: 802.11: fix TKIP RX/TX MIC offsets
    
    TKIP has a special key buffer.  While keylen only identifies the
    key length, the two MIC are appended.  The LinuxKPI offsets for
    these were unfortunately never set correct which lead to constant
    Micheal counter measures as the MIC never was correct when calculations
    were offloaded to firmware.  This is the first half of the fix.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      3 days
---
 sys/compat/linuxkpi/common/include/linux/nl80211.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/linux/nl80211.h b/sys/compat/linuxkpi/common/include/linux/nl80211.h
index b2a33a28b3a7..f3979d3a2abc 100644
--- a/sys/compat/linuxkpi/common/include/linux/nl80211.h
+++ b/sys/compat/linuxkpi/common/include/linux/nl80211.h
@@ -190,8 +190,6 @@ enum nl80211_tdls_operation {
 	NL80211_TDLS_ENABLE_LINK,
 	NL80211_TDLS_DISABLE_LINK,
 	NL80211_TDLS_DISCOVERY_REQ,
-	NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY,
-	NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY,
 };
 
 enum nl80211_cqm_rssi_threshold_event {
@@ -436,6 +434,9 @@ enum nl80211_hidden_ssid {
 	NL80211_HIDDEN_SSID_NOT_IN_USE,
 };
 
+#define	NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY	16
+#define	NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY	24
+
 #define	NL80211_KCK_LEN				16
 #define	NL80211_KCK_EXT_LEN			24
 #define	NL80211_KEK_LEN				16