Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Apr 2026 12:00:14 +0000
From:      Bjoern A. Zeeb <bz@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: f252ce00898d - main - LinuxKPI: 802.11: set IEEE80211_MIN_ACTION_SIZE according to struct
Message-ID:  <69e3724e.3bb2b.348c89ec@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by bz:

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

commit f252ce00898d17f4892534934b8097cd7ccb9e26
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2026-04-15 07:50:35 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2026-04-18 12:00:00 +0000

    LinuxKPI: 802.11: set IEEE80211_MIN_ACTION_SIZE according to struct
    
    IEEE80211_MIN_ACTION_SIZE came up in the mt76 vendor subtree merge
    as one of the non-mechanical changes which made me look.
    Rather than (incorrectly) hand counting the offset from the beginning
    of a frame, use the offset from the beginning of struct ieee80211_mgmt.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      3 days
---
 sys/compat/linuxkpi/common/include/linux/ieee80211.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h
index d1eba94a3ad8..b8f29560f200 100644
--- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h
+++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h
@@ -100,8 +100,6 @@ struct ieee80211_mmie_16 {
 
 #define	IEEE80211_MAX_RTS_THRESHOLD		2346	/* net80211::IEEE80211_RTS_MAX */
 
-#define	IEEE80211_MIN_ACTION_SIZE		23	/* ? */
-
 /* Wi-Fi Peer-to-Peer (P2P) Technical Specification */
 #define	IEEE80211_P2P_OPPPS_CTWINDOW_MASK	0x7f
 #define	IEEE80211_P2P_OPPPS_ENABLE_BIT		BIT(7)
@@ -622,6 +620,8 @@ struct ieee80211_mgmt {
 	} u;
 } __packed __aligned(2);
 
+#define	IEEE80211_MIN_ACTION_SIZE	offsetof(struct ieee80211_mgmt, u.action.u)
+
 struct ieee80211_cts {		/* net80211::ieee80211_frame_cts */
         __le16		frame_control;
         __le16		duration;


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e3724e.3bb2b.348c89ec>