From nobody Sun Aug 24 14:38:56 2025 X-Original-To: dev-commits-src-all@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 4c8xPs67vYz65XJ5; Sun, 24 Aug 2025 14:38:57 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c8xPr4h0Dz3Wl7; Sun, 24 Aug 2025 14:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046336; 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=E7Z60HU1oxi+cjR8Hps0S0M2t/YrEKWn2WxSacrwRv4=; b=k8nbhw7demX1bGWdIGyvVbfeBgTttVygmxCpUVlXP/7Zn9DBITwisDwCmhbUREoM2lH8IX sYH86HZyF1KGBB98ZiiWF5Hy1ky0O1W2kUnxkZnYTf5HHaflTQEFekuqRewyTqVYQ9FC4u rsAB4ifVwTi+/Ht3ZFibf/nupAEmQvQ6zE8sJOra3tzAC9by+QM+zxVnbi2R+d4xFEvix2 t2DTyefckVYFSK+97dGfY1/+RA6cocgINQll6f9B4uGOWN7W5W8VO1fj01TfGnn6g+DR2e +Lc0F/vihlsar29WhSG4457Blni5yIOOQHjHwDSlHqfOEYJSNq9QS3SrNTj/7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756046336; 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=E7Z60HU1oxi+cjR8Hps0S0M2t/YrEKWn2WxSacrwRv4=; b=lmTQrMT7hPoXneixB++pFtgDaV/GOUiR4yjFd8LQm0ZCA4oompp4ooB+mgXSQf8h5EgeOa sgnkK/+gNCyd4WccwRuXJuX5DpXFZm97cj9oDXIsrfDwe9Kf1+P8SrOeY1Y2HtJ1O83q5U 3tctAvJj4F9c+7/xdC91I8NrFNHxYZ7Muq6H9BVW6mCL2pXE7LUKeFTXAN0Z050DZHhH+u OFUjOKdpnYuIUqk5JwKaIewzC9MiivQ9lk+9WMs64wrLG/4Z6LhFGY/M8T570uW1puatfq Menzx9Rzj0ccLSRRS/Fl9kFnOnrWxHoNk2L7weMiG2e71uaxm8lC27nDB5XigQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756046336; a=rsa-sha256; cv=none; b=gA5+xq4TTdChY+LgvrUz4QjFxAD2pfyiePpxMIGaLHLmQXhfhAh4bKVtVdsy/2RXkITQpk BwLtDzhniO11ZSdmw5OAELC0EB/d+YAWOdWtaQsoXpO0PiIUKrINe+TMj7BvGOvFajV2Iu 7Rjo9gSANiCmnLGj4MMJ71MBNFxy7KvD6O0YnkIVtOEEXqx/CYqW0f85Xek0n/7n6PtWOm DGEtjJNVgVsflEyxxOCj+Q6h0z0SklBBglRji4o2BIBNnxf18BXbVcZyYGSrglUTw1/swy kShK967mgd+TIuoJvLNQyzvPq62p7PRvkiicb+SnXWsPxHOid9QZA/iStiECXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c8xPr3kwTz168N; Sun, 24 Aug 2025 14:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57OEcu2K040634; Sun, 24 Aug 2025 14:38:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57OEcuUS040631; Sun, 24 Aug 2025 14:38:56 GMT (envelope-from git) Date: Sun, 24 Aug 2025 14:38:56 GMT Message-Id: <202508241438.57OEcuUS040631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a39492485637 - main - LinuxKPI: 802.11: correct struct linuxkpi_ieee80211_channel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: a394924856373b5228f542360618cfed8e334504 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a394924856373b5228f542360618cfed8e334504 commit a394924856373b5228f542360618cfed8e334504 Author: Bjoern A. Zeeb AuthorDate: 2025-06-22 07:31:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-24 10:26:39 +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 MFC after: 3 days --- 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 {