From nobody Thu May 15 09:52:58 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 4ZylrV3W65z5w3xV; Thu, 15 May 2025 09:52:58 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZylrV2LFCz49nJ; Thu, 15 May 2025 09:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747302778; 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=EWjTHPy2ksnO2C+ndbrOWCgwpklzHFculdAqkDFXeFA=; b=o5ZIt/Vu4KcWjCG2ajSWkbggD8E7cgk41Y50FCVjpNxWX3X4tAxmuPucPbCmPcHAGdGO49 Fe4Fz/fj2SwHi818XtcKzucUzDZ5Zjqf5TtPYD87jClT9cfdlorS1VLBjir1g32rOY/Ya+ Wo+5hah8twoWwbp27xMThlLcC4IVfUD3kOGg5x0ly2SftKMzLopPw4Sn0+ImkmU1a5A5Lq WnIz00RV3RJHF3RK4H0kOkKhjXM+u172W5E1qjIsMvfPZsqy0AFofUtn+KB4TtkxrzXR4c U1Osig4iLWRgTU4VTc3ry+zCANfaeXprx5xPiej22tKS+vR2InyJytDKo0IsSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747302778; 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=EWjTHPy2ksnO2C+ndbrOWCgwpklzHFculdAqkDFXeFA=; b=TNqTYqvvkDYm/rtqUR2ns9aqUQvWC2gmQ5IvpDd7uABroGY2QwMmc1u1nKGERV+vA6stnt fJYF6DtEGb9y6OnU7rtZfNkw7+joDu1d8WUg5xiU+gyPQRlzcq8lu89ad6sjUZeQGp7TDL VS/WDXvL90toryGxdNTz2rwsSu/eA4j251dbchxeg4EOgOeUYhcCKIqbsX7CzsM0VVt2lk FKZsYQJXpsgeXeu3kyPIR2KZVuef5Dzf/RfKc5m0xOECEZjI7im2W7ZBgLQ9O1BVBIXK6D PHxLs3DOQZl6NHo5AEPRiAwSo9kIOcOEehBfctG9HwzJzH7CKA/Fs8MIxeus1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747302778; a=rsa-sha256; cv=none; b=Dj8dxdsKCel1J8Dp/g5QDeUF7TiauRWv9cPkcV/+tUX/OnTzNAikGswp9s0RBgJdyCDBuQ cE3hL4z9VOqkXFcxhBoJUcw3ENObtCab7RxVROsDHsxRNSanJgHXyDjDLJP1SRxVFGwJHr phqIL2e5rKqlX3taTXXWQ+7wPmmLAtYxHo1KvtmeYMGyieUvmFNUXoJAtzGIYM28+5D+C8 Q8kVcp8MdUwkt+lTzgRJ5Esp6LIELOlEG7Y0XtpzBaCmORQRWAwYeoSh4k6Q8YAPHKRXRz Ex8HuoxDnG8l2Ae1JEuwM0ftGt2iOUGRRNqB3BOomYRGKr135vksBsOBOM9Hxg== 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 4ZylrV1mkCz1Bkh; Thu, 15 May 2025 09:52:58 +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 54F9qwdJ050702; Thu, 15 May 2025 09:52:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54F9qwku050699; Thu, 15 May 2025 09:52:58 GMT (envelope-from git) Date: Thu, 15 May 2025 09:52:58 GMT Message-Id: <202505150952.54F9qwku050699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 1fcc3d6dd5c5 - stable/14 - bnxt: add guards around struct_group macros 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1fcc3d6dd5c559ac6328f57d44ff11211d56088d Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1fcc3d6dd5c559ac6328f57d44ff11211d56088d commit 1fcc3d6dd5c559ac6328f57d44ff11211d56088d Author: Bjoern A. Zeeb AuthorDate: 2025-05-03 20:22:32 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-15 09:50:55 +0000 bnxt: add guards around struct_group macros The header file might be included after linux/stddef.h or others are included and the macros would be re-defined. Sponsored by: The FreeBSD Foundation Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D50156 (cherry picked from commit 152e6197615570e7a2f5f1c6c2ed00ecee9dd10c) --- sys/dev/bnxt/bnxt_en/bnxt_dcb.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/bnxt/bnxt_en/bnxt_dcb.h b/sys/dev/bnxt/bnxt_en/bnxt_dcb.h index 293f1b85dad5..fa68401583ca 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_dcb.h +++ b/sys/dev/bnxt/bnxt_en/bnxt_dcb.h @@ -40,13 +40,17 @@ #define BNXT_DCB_CAP_DCBX_VER_IEEE 0x08 #define BNXT_DCB_CAP_DCBX_STATIC 0x10 +#ifndef __struct_group #define __struct_group(TAG, NAME, ATTRS, MEMBERS...) \ union { \ struct { MEMBERS } ATTRS; \ struct TAG { MEMBERS } ATTRS NAME; \ } +#endif +#ifndef struct_group_attr #define struct_group_attr(NAME, ATTRS, MEMBERS...) \ __struct_group(/* no tag */, NAME, ATTRS, MEMBERS) +#endif struct bnxt_cos2bw_cfg { uint8_t pad[3];