From nobody Fri Jan 16 19:40:32 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 4dt9Dw47QXz6Nl9Y for ; Fri, 16 Jan 2026 19:40:32 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dt9Dw1Gvrz3wYw for ; Fri, 16 Jan 2026 19:40:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592432; 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=ccLgWONNuL8NRli8itwtNFnwlqjTE+1UjFpdCCcDfso=; b=KWmLGHhshdVKOLfBhwGZr7+gqIL31Zp3Nfg0C/K8sYNSc0qrQfhbv5p1d0TcihnKrv3v1P oVj4t5Z29AdAUbwWOOe1Pe5FbvFi4FUp8IL5UuNoILXRLKXRODb0GSuuaXfKFsBbHsKVlk sZTENGbeCtu7TAO4kUggIth6Pez5mXL1ipWexeCNwtTEDcK50W7cY1JoKJXFyn5LFGHKTN xM6/SElW//Bc2JaKrrcMOnQ5awx4vICRiC9cdBBYzU4whG1XAWdrIjtnbZgL3jgklsb0vl QYLu6HfUBu5/CPo27PKbu2ffdf3vfy83Xk/NZxVnDGUn95HraIThV8F/uqdTXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592432; 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=ccLgWONNuL8NRli8itwtNFnwlqjTE+1UjFpdCCcDfso=; b=omb/+8uugzqt+bVk5LNbWIVj1eZymSfZZHSK0wIksak6IOHsNSvDMm9S6537QjllhRHLLt rF7Mx6OAsuBMfZ/+K4mN8H1n9MG9s05UviXN4IoT/jJKhwv3Fn0ctoSyM/nBkBz2BCzbdD Z+xkfrCCuyKEUqtPGaQlE+jpjm92iA595/m7ew0vdJGGR7jkJ2q3y8RIqvOLSEx3P02qxo lnglo1RzOMCTZXd5COKgKZTtFgZwhDW0I+i4c0ZvWMCkWSPOLYlBi3hZd1fxuyiqsltjIA sTNE3XLzY/b5SePrRg4N+qTSSszezXvpjkI+MJ1mS512dvZwB9vGnAA2w9cxwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768592432; a=rsa-sha256; cv=none; b=HPH7qd17oN6sOTE3yNucKzGRdOtaDLO9hK7zVEPQddric0p3hSnw1xi2C2u8cBdig13Ahl ulr1s0FbRUnimPV3LNimNHeDi0CHQr09PvTfzD44vrFLTbP/Sp6ssnga4ORAR17o5jmOfj Kz/LtVHmz80BuTExxzI8k7mvexn7/Y6yKB4z1nhsjVbCqqLn3sTkqSjsbIo/W6YNYYzeHP Ic4EJ9BMjxIIn1WD0xB+/iQGLPKG+5lXc+ASwOg4kguhRbNPdk5gcd95dpXyRRK4dIOzDr DeNEGr/MX3OGcwYu4iOJvFOjSpGMK1Bl5SWGde/hag4TmmpsaX8aPXaEZvcSwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dt9Dw0t5PzC6Y for ; Fri, 16 Jan 2026 19:40:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id dbd3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Jan 2026 19:40:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 7937d7fe644d - stable/14 - LinuxKPI: 802.11: correct struct linuxkpi_ieee80211_channel 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/14 X-Git-Reftype: branch X-Git-Commit: 7937d7fe644d7f55f563b65c349637c7acde0e25 Auto-Submitted: auto-generated Date: Fri, 16 Jan 2026 19:40:32 +0000 Message-Id: <696a9430.dbd3.1534f92b@gitrepo.freebsd.org> The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7937d7fe644d7f55f563b65c349637c7acde0e25 commit 7937d7fe644d7f55f563b65c349637c7acde0e25 Author: Bjoern A. Zeeb AuthorDate: 2025-06-22 07:31:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-16 19:37:43 +0000 LinuxKPI: 802.11: correct struct linuxkpi_ieee80211_channel Some of the annotations were not quite right. Also various fields had not been typed properly. Correct the types of field members and given the change also re-sort. Sponsored by: The FreeBSD Foundation (cherry picked from commit a394924856373b5228f542360618cfed8e334504) --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 25 ++++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index b79dd003a677..239b4a5ae7b8 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -128,19 +128,24 @@ struct ieee80211_txrx_stypes { uint16_t rx; }; -/* XXX net80211 has an ieee80211_channel as well. */ +/* + * net80211 has an ieee80211_channel as well; we use the linuxkpi_ version + * interally in LinuxKPI and re-define ieee80211_channel for the drivers + * at the end of the file. + */ struct linuxkpi_ieee80211_channel { - /* TODO FIXME */ - uint32_t hw_value; /* ic_ieee */ - uint32_t center_freq; /* ic_freq */ - enum ieee80211_channel_flags flags; /* ic_flags */ + uint32_t center_freq; + uint16_t hw_value; + enum ieee80211_channel_flags flags; enum nl80211_band band; - int8_t max_power; /* ic_maxpower */ bool beacon_found; - int max_antenna_gain, max_reg_power; - int orig_flags; - int dfs_cac_ms, dfs_state; - int orig_mpwr; + enum nl80211_dfs_state dfs_state; + unsigned int dfs_cac_ms; + int max_antenna_gain; + int max_power; + int max_reg_power; + uint32_t orig_flags; + int orig_mpwr; }; struct cfg80211_bitrate_mask {