git: b75c387a668e - main - qlnxe: Remove #ifdef ECORE_PACKAGE

From: Warner Losh <imp_at_FreeBSD.org>
Date: Sat, 01 Jul 2023 17:10:16 UTC
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=b75c387a668e3c508d1cdc6e2aa7135aff1b7311

commit b75c387a668e3c508d1cdc6e2aa7135aff1b7311
Author:     Mark O'Donovan <shiftee@posteo.net>
AuthorDate: 2023-07-01 17:06:50 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
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 <shiftee@posteo.net>
    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 <bsd.kmod.mk>
 
 #CFLAGS += -DQLNX_DEBUG
-CFLAGS += -DECORE_PACKAGE
 CFLAGS += -DCONFIG_ECORE_L2
 CFLAGS += -DECORE_CONFIG_DIRECT_HWFN