From nobody Wed Apr 22 21:09:00 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g1Bfj4bWzz6bLHR for ; Wed, 22 Apr 2026 21:09:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g1Bfh6vlrz3lvY for ; Wed, 22 Apr 2026 21:09:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776892141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JLPrmGPSrn+GZhWkKp9La9DAbLDjj4kuAMC32RZqMH4=; b=lRLtFK3SYB1x3MbYs13yyCkU5orYQNkJexHQWySEMmPGMmPkmuneRX0pXw1WN58bzMUOY7 wFOSClGhukZffUgwhzV2Ktl+pMNHRRPW3ki/Rkcyv8dBrwyzlrd1xcAZ8xfBbmLFSKQE3U DEyFBRjXMHk0RPuwfWg76sZXLMh9YIwI8CYk/IoeyCtDVhAtbB9LoUZ62YOdDWsuSbWmDM 32D0hVLP3SjPo4OM6mqASPtnxuuFK/OkZQtoLVF30Bv+GoVeKZke5P/rs4SPA///z7AeeF u3hQRKCLekesGWxTO5zylxk4vo998IZvniNzGmdoaxKt/2RDn8SZA8Y74GQw1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776892141; a=rsa-sha256; cv=none; b=dqbUpojwYDRdISLS8itpr73K4aYmNM7MHckOTDFl4dY4WoUF173WaqlSu1Js6FRGIiR/J1 za4Tdg9j8yOGg/JcHaFJPSpF9ms8tLBYpWc/yGr/1jiwAxGB9rmDwbAMbc9BlJqWQSg362 A7AMvs+e60n5Zx5oLBn79ilXDMEn06uICkuWcyHdaH6nO9GPEf4Kg/Ir6k0p1jLI2/XYvx FIGucJVjozv4166r1NDyZcoaBnjCSLtgpQuX6TiMERat9mXntQCcPhllq7mB5xKx1czf+V maw5AKm3nF394THaA9TZZZxlj2yLXuinW/T9lvTYqEJf3ZbS+hLhKJByK6F84g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776892141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JLPrmGPSrn+GZhWkKp9La9DAbLDjj4kuAMC32RZqMH4=; b=C6f3h7sIDfhgzetBeyJY9qATqBmA8yTIMe1PwLnb0DS/Imv0/eI1H/xyB9w19hBofZTgzt yfkcDATmzHDMtb4pwSLdCts4pNlhswjlWQgoc1tTivpSqEwKkr5SWS+vSxKJhCSODIl0ej Q8cgWZg4nNifg8gdR6WjYC/aTPh93M2jtHEAEXUy9uVocKyLopkefyf73Hr29UUW6aj+PL 8kgOsriR9aLTgOoan+3rNNFcWtDiWP+ocHSNo5jjL3Z4s/IMvVO8BTwcusof1xyQh15E2W d8/EcNCNlDGzws+3sDBswXIe6NkBQplIF2H5TQFFl+r48sOmMq4tz2v+qu9wGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1Bfh6R0hznm4 for ; Wed, 22 Apr 2026 21:09:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26a32 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 21:09:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 342a37387f31 - stable/15 - LinuxKPI: 802.11: set IEEE80211_MIN_ACTION_SIZE according to struct List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 342a37387f313ae691190d69f11400620521a268 Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 21:09:00 +0000 Message-Id: <69e938ec.26a32.45ef0f3a@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=342a37387f313ae691190d69f11400620521a268 commit 342a37387f313ae691190d69f11400620521a268 Author: Bjoern A. Zeeb AuthorDate: 2026-04-15 07:50:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-22 20:57:09 +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 (cherry picked from commit f252ce00898d17f4892534934b8097cd7ccb9e26) --- 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;