From nobody Sat Jul 01 17:10:16 2023 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 4Qtdwm4lnGz4l3Mq; Sat, 1 Jul 2023 17:10:16 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qtdwm3BLfz3hjD; Sat, 1 Jul 2023 17:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688231416; 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=C9NPNvhJIXk94dGYxE9cQF6BHsfTXVt8+TgJ1eyNXOQ=; b=Jb0Yt956eMvSIFYHVW4XW9hFUMpHigP70qE8iUh1HfUrvfmLPuQQ0j4S1yOdfwtp0huG/5 sSs+Vj7853fi54aqUDXLUZMn866jVkVMNSwMPy3yBw1Wsw++nikPZXcFhOkWswO/9eDL3p xNdeOPap7JKTdSa0YNc9v4nzH00GB98qb8kYoNYWZgen2J5v1gT7W4KVYDKLqPiQnZqRAj fJWy5LA7sO3sNX+c9kQEKAcMPB39xaY2kQeEwd3pe6xNhngTZ7lcxKvbahVfknmtDSQLMg lJgCdz/AwswYkReLo+mpylfzrlNUcoWiYL761n5DDc8e8NFZqNE1f7O0i9Gthw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688231416; 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=C9NPNvhJIXk94dGYxE9cQF6BHsfTXVt8+TgJ1eyNXOQ=; b=OPcVaI7YzbERbfH0LN9qr+lZ045RgOE3VDwXDednMpquOlZHWbV2PyXY+nlVWlqMceskp0 hSidActXBOWt84cZ8V7Bh6ElsX1MHXr/n4JIT65C84u4GpZSug8RXopH1iFxb8sbm4iEH0 I2HTbIZ5cQ/WqAYuUX3Ht4sN5FGKxAovo4meFfM4YqTBqrTxP8Jjh2ZsU1wfdvvDr1d2dg CJO+/T3GqIIBUZ1+fBnIazPZqTWhPsIJHKieePYqom5lbEfnLIUXuTpGLGXWaX6qaUrlkb YG/o2CkLfIvzAjTxik/TGVcQvpsRu23OP0t4v/0VGAW4mFW5pWzvJdEc53cvfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688231416; a=rsa-sha256; cv=none; b=orl5IPPkq+E+lRSaJcdGMvY7pi7B/rlEN7tzMNm8gNxho/Xdp+OZIgc50mZx1wPI+wioRv JpaSUBaZ5GWpsdOOxR6uSW0dbFKea8h59xFT8xvO/752a8ZNp0ZdiZtygx4PShl7SUuY3P pjmhtYm35fNrSxFcGOx4ovsRUM+0LpXPg7BxhomvDJ3YrmnqSDiGY7nqPcxT77Ba05Sbq7 RxQt04+xgQcJ6wg0M1pFYGuIMPVSv2e6fJa9zNaJfuP0HmvRCNuVDHKlR1L47gROL8vSV6 3xL0t+SsCeEeyldT7gS9luPXh5kvYPoaqZXx10FBpb05+C/XTCykeILJjgPJAA== 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 4Qtdwm24TBzZ3v; Sat, 1 Jul 2023 17:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 361HAGpN046218; Sat, 1 Jul 2023 17:10:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 361HAGto046211; Sat, 1 Jul 2023 17:10:16 GMT (envelope-from git) Date: Sat, 1 Jul 2023 17:10:16 GMT Message-Id: <202307011710.361HAGto046211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b75c387a668e - main - qlnxe: Remove #ifdef ECORE_PACKAGE 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b75c387a668e3c508d1cdc6e2aa7135aff1b7311 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b75c387a668e3c508d1cdc6e2aa7135aff1b7311 commit b75c387a668e3c508d1cdc6e2aa7135aff1b7311 Author: Mark O'Donovan AuthorDate: 2023-07-01 17:06:50 +0000 Commit: Warner Losh CommitDate: 2023-07-01 17:06:57 +0000 qlnxe: Remove #ifdef ECORE_PACKAGE I do not know why this is here but it blocks compilation. Removing it makes the builtin option the same as the module build Signed-off-by: Mark O'Donovan Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/779 --- sys/dev/qlnx/qlnxe/bcm_osal.h | 3 --- sys/modules/qlnx/qlnxe/Makefile | 1 - 2 files changed, 4 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/bcm_osal.h b/sys/dev/qlnx/qlnxe/bcm_osal.h index 07b0fe47ea36..3f7bb5234942 100644 --- a/sys/dev/qlnx/qlnxe/bcm_osal.h +++ b/sys/dev/qlnx/qlnxe/bcm_osal.h @@ -93,7 +93,6 @@ extern int qlnx_pf_vf_msg(void *p_hwfn, uint16_t relative_vf_id); extern void qlnx_vf_flr_update(void *p_hwfn); #define nothing do {} while(0) -#ifdef ECORE_PACKAGE /* Memory Types */ #define u8 uint8_t @@ -542,6 +541,4 @@ OSAL_CRC8(u8 * cdu_crc8_table, u8 * data_to_crc, int data_to_crc_len, u8 init_va #define OSAL_VF_FLR_UPDATE(p_hwfn) qlnx_vf_flr_update(p_hwfn) #define OSAL_IOV_VF_VPORT_STOP(p_hwfn, vf) -#endif /* #ifdef ECORE_PACKAGE */ - #endif /* #ifdef __BCM_OSAL_ECORE_PACKAGE */ diff --git a/sys/modules/qlnx/qlnxe/Makefile b/sys/modules/qlnx/qlnxe/Makefile index c0971e443ffd..d682192d18fc 100644 --- a/sys/modules/qlnx/qlnxe/Makefile +++ b/sys/modules/qlnx/qlnxe/Makefile @@ -65,7 +65,6 @@ SRCS+= ${LINUXKPI_GENSRCS} .include #CFLAGS += -DQLNX_DEBUG -CFLAGS += -DECORE_PACKAGE CFLAGS += -DCONFIG_ECORE_L2 CFLAGS += -DECORE_CONFIG_DIRECT_HWFN