From nobody Mon May 5 10:45:31 2025 X-Original-To: dev-commits-src-main@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 4ZrdTm7311z5vKGZ; Mon, 05 May 2025 10:45: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZrdTl5BhHz3bZ9; Mon, 05 May 2025 10:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746441931; 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=+tUeNpgBRURJMVnKbH75dgkUvrwWl/s/E1pXNYNnl4E=; b=eObPe28DPnIRs6ep1gBGRxLBlZ/H+YS1hJ+z/OLnFPHOcnwhrPo3GBX5U3Cf+LOH45BwtR a/palQtiIXIl7SEjZE9rNHcHrMOe1MjIDgBwTCCc42eu2xjb2cbP7Rpy3PuWHuMZQSjCkj chpZdM4E4v4xYykWy17sYyMLSddAAXJWuez9/jTqC/KnXt43vrk1zZjq0J/CIDPKOkbejA MTQDPzSWJgSCtKGyzwZpC5jIS71nJDKCT9EFqIWBlRiT8Bh8NE/7LiFstBV8gy5DNKyxDS 31LEl2mHRUvbYgl4pBhAXC6jfhP3MH/57Ucdp8t3uK8dmpgXJuFdNgKWstZW4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746441931; 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=+tUeNpgBRURJMVnKbH75dgkUvrwWl/s/E1pXNYNnl4E=; b=GBiTmGxyHI1pU83bVeL75kvlYcRU+/VirpgNRYaqO03j4xBs8MRKJff8sVZBSWurtK4mdF b1DegJwYL7r67y555YXQDbKzFX10HeRGCuWnrVaStJ8QBHPUF6yLwNoPxIGtrpjoQ+kJdV P++k/l58TyxVk3LZf3BYNuYvLiNltdqLLWfjOF48imvKww+3jsksIELHzRW1zApWHOyEg0 N/RzWpJYPbshEHeez5JCYYorxFUYbygUDUrVsSZWzRlLGuB6VfO1/e4qnrO2lDugnD06Tl prOtbfzFHLhci/zFwMr5a3ZvcBdTF7eWFn0kLFlgsQq+tyRJWLY/9xbeajcjBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746441931; a=rsa-sha256; cv=none; b=W2BTlLZ+kqQAaryKo78fyaY3WqTZUkcFEaWD5YtFVO4+sCbsRbXdpE8NA1qGrErL08XhyC fenVJz3BqtQKGOA51iDrzCvkE2QwdGNLq4Xb8YVC5H4NwkZRO0jiEeD8bHzqUYTkOoteOa kWSoQztbvDw1TxfGDyeHtniQXV4MfIJzWY6c7uatA2sO1YJ6eIkyCEVFi00jKhFuOL6mZH PvuJCrW253852DyKY+O+Ch0ZcXYL+Mb4TCATaN3vvj6dw4rwDeSLQhyRofvyVhHFeBU5Yk X3PMgXyA0fln4lUJqq9hQEHwxcodQMnp/sLckofoYVeZHx0W1Hpj3vKFhln+aQ== 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 4ZrdTl3szsz19QK; Mon, 05 May 2025 10:45:31 +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 545AjVIk050329; Mon, 5 May 2025 10:45:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 545AjV7D050326; Mon, 5 May 2025 10:45:31 GMT (envelope-from git) Date: Mon, 5 May 2025 10:45:31 GMT Message-Id: <202505051045.545AjV7D050326@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: 152e61976155 - main - bnxt: add guards around struct_group macros List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 152e6197615570e7a2f5f1c6c2ed00ecee9dd10c Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=152e6197615570e7a2f5f1c6c2ed00ecee9dd10c commit 152e6197615570e7a2f5f1c6c2ed00ecee9dd10c Author: Bjoern A. Zeeb AuthorDate: 2025-05-03 20:22:32 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-05 10:44:22 +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 MFC after: 3 days Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D50156 --- 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];