From nobody Fri Feb 27 02:29:17 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 4fMXMf2xrLz6T7R9 for ; Fri, 27 Feb 2026 02:29:18 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMXMd6Xd4z40HB for ; Fri, 27 Feb 2026 02:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772159357; 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=H3O2+1Wnahl8M8Gk3S80g3fqIohq5J4C+wxGQamm760=; b=Hioqxl7d7FkcJWqknInKOt7EY5frOlFkBp8UbRFLCcLE/FprQe2elynpzwSAhcBWdNG4nb 3aWFj2GMEtwVQvrjeptk6Wo2fmoIFp6zliSSkNn/WT22J2jxiBK68KMTkGlWV9KHzrcOA+ I4pQT487VC86jumaMC0Pe0ut6T44WLEBUZIcadsMxZahs5W/IHBRUaoaCyqzESs3+9sPYx mxkjeV+MTOVuhY8XSEZaApVqUX9zASKv4Bmu4ZU2TOOvqArFv8bBZKlgs/2BgEdv9C6Qff 36jC/dq183tRll0dsIN258smCJFdeeJnAL1TDoDLH3Oy0ejJGAhWDaSwSGti0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772159357; a=rsa-sha256; cv=none; b=sMB8udmjkftJGxgpBlw6xzdRDwWky+2aKy3+ssVLqr4CwxwPG+jDz6wsGvbUaOOZl6Ksht sP6MeBvkC1/0q2U+P/THvHaJl/dw8fd/kdIif/8vHG/QmfT+HxxJDmKfJ0ZEfnB5jO3Vwb rzTOkN/ZtLp8boia0NBZKZPoDC9cZb35Y0C6iYIih6MVT+c5znY7EfYlT2FH2G48pgEZ0t Buhhqo5jV5xIBSgr5akP8Ta/XReZYLTAvIUJvizLBlajO6jSszV+V88lKaEdrxiE008/dH F5sH4fmSL7/cpR4lCkKQzoQT8yWTJqxMNuBPptqYfc7eZVoiiIuvWejr93rIbQ== 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=1772159357; 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=H3O2+1Wnahl8M8Gk3S80g3fqIohq5J4C+wxGQamm760=; b=aLMxUmvR6XTcgM4VmUogoV4TL5kqgU3A/W/cq/CLyhHZVhGliQKZpWUm+qkOMROH0P25n3 kZYZCI1bjIT5WkNKUksav47CKkUd7AHX2otQeyT70bHXGcI6E1CIZ1r6+qmm8Jm7CNspg8 ZJ8i5iT5bDmaxgKbdJbSO6t6CG8feQ/YohDptR2JuGQ7KmvMQcegWvB4VRkegsO5i9LyNl Z/b3hb1i4ToobrwndMV6vs4nweKpzM0Da4E2ECQIVFEvkGDOXVr9k4qOGd9LUgkSLCLYdj SC9Eb+Fcqkxd6ifNEN7hLGJyYwEE+AGPuW7ukbUH6Cc915x2RS/RBIww7NOavw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMXMd65L9zy6r for ; Fri, 27 Feb 2026 02:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fd72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 02:29:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 23241046e071 - stable/15 - LinuxKPI: 802.11: rename enum ieee80211_tx_rate_flags and move file 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: 23241046e0715a324f06917078322900688f2e32 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 02:29:17 +0000 Message-Id: <69a1017d.1fd72.9f59f60@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=23241046e0715a324f06917078322900688f2e32 commit 23241046e0715a324f06917078322900688f2e32 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 22:47:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 22:57:55 +0000 LinuxKPI: 802.11: rename enum ieee80211_tx_rate_flags and move file What we used to call enum ieee80211_tx_rate_flags is now used as enum mac80211_rate_control_flags for the ieee80211_tx_rate.flags in rtw89(4). Rename the enum and move it to mac80211 as it seems to belong there. Sponsonred by: The FreeBSD Foundation (cherry picked from commit b2c90d106c66daf6dc7fb300c250b4ad0aa274f5) --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 12 ------------ sys/compat/linuxkpi/common/include/net/mac80211.h | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index c81ddf7d24b2..a9033581a315 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -480,18 +480,6 @@ enum ieee80211_tx_control_flags { IEEE80211_TX_CTRL_MLO_LINK = 0xF0000000, /* This is IEEE80211_LINK_UNSPECIFIED on the high bits. */ }; -enum ieee80211_tx_rate_flags { - /* XXX TODO .. right shift numbers */ - IEEE80211_TX_RC_40_MHZ_WIDTH = BIT(0), - IEEE80211_TX_RC_80_MHZ_WIDTH = BIT(1), - IEEE80211_TX_RC_160_MHZ_WIDTH = BIT(2), - IEEE80211_TX_RC_GREEN_FIELD = BIT(3), - IEEE80211_TX_RC_MCS = BIT(4), - IEEE80211_TX_RC_SHORT_GI = BIT(5), - IEEE80211_TX_RC_VHT_MCS = BIT(6), - IEEE80211_TX_RC_USE_SHORT_PREAMBLE = BIT(7), -}; - #define IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED -128 #define IEEE80211_HT_CTL_LEN 4 diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 6e2f3f2d8781..8d3d04c9afe5 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2025 The FreeBSD Foundation + * Copyright (c) 2020-2026 The FreeBSD Foundation * Copyright (c) 2020-2025 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from @@ -789,10 +789,21 @@ struct ieee80211_tx_queue_params { struct ieee80211_he_mu_edca_param_ac_rec mu_edca_param_rec; }; +enum mac80211_rate_control_flags { + IEEE80211_TX_RC_40_MHZ_WIDTH = BIT(0), + IEEE80211_TX_RC_80_MHZ_WIDTH = BIT(1), + IEEE80211_TX_RC_160_MHZ_WIDTH = BIT(2), + IEEE80211_TX_RC_GREEN_FIELD = BIT(3), + IEEE80211_TX_RC_MCS = BIT(4), + IEEE80211_TX_RC_SHORT_GI = BIT(5), + IEEE80211_TX_RC_VHT_MCS = BIT(6), + IEEE80211_TX_RC_USE_SHORT_PREAMBLE = BIT(7), +}; + struct ieee80211_tx_rate { uint8_t idx; uint16_t count:5, - flags:11; + flags:11; /* enum mac80211_rate_control_flags */ }; enum ieee80211_vif_driver_flags {