From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9887EA00BE; Fri, 1 Nov 2019 07:02:45 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E84991D50B; Fri, 1 Nov 2019 07:02:44 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 96C511D483 for ; Fri, 1 Nov 2019 07:02:43 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xA160i8V014068; Thu, 31 Oct 2019 23:02:42 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=pfpt0818; bh=7JuZn8Ynm3+P3e+uKyps/VkzRa6hLaOpRIyFhegaMlo=; b=QlucA81NDnuC0F99mGhDmv6hfl20mgy2d/gi1nESW6Ql8IyMgFKtBgGrdQFF/i0SCPGE D5qHTqk9bDzFgzExikk39R7x1FTW+QSoMIc+hePlhUYJgZvSWJ5inlEW67YdpD+tnoD4 sApk9T9eEDRdwwxSclvvl3Z8qfoyN+goHoQFmDDUn6N8t8jZPstPtSL/Ml5PKbgqQE/j x2T8HRgSJHne+CG6WW8LNjsIkKQ/qjg5usEesYZIn3cPX8eZ6seORVMhL3BkmcnxFzd6 x4iDGpR5lo+TQa1Z4aisot4+0rcSON9ODThfGvkIqKUTDKo63XgaZxs66+8w2CfNl3aL lQ== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0b-0016f401.pphosted.com with ESMTP id 2vyxhy3nv4-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 31 Oct 2019 23:02:42 -0700 Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 31 Oct 2019 23:02:40 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Thu, 31 Oct 2019 23:02:40 -0700 Received: from irv1user08.caveonetworks.com (unknown [10.104.116.105]) by maili.marvell.com (Postfix) with ESMTP id 372BA3F703F; Thu, 31 Oct 2019 23:02:40 -0700 (PDT) Received: (from rmody@localhost) by irv1user08.caveonetworks.com (8.14.4/8.14.4/Submit) id xA162dma023335; Thu, 31 Oct 2019 23:02:39 -0700 X-Authentication-Warning: irv1user08.caveonetworks.com: rmody set sender to rmody@marvell.com using -f From: Rasesh Mody To: , , , CC: Rasesh Mody , Date: Thu, 31 Oct 2019 23:02:28 -0700 Message-ID: <20191101060228.23271-1-rmody@marvell.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,1.0.8 definitions=2019-10-31_08:2019-10-30,2019-10-31 signatures=0 Subject: [dpdk-dev] [PATCH] net/bnx2x: fix meson build failure X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use kernel headers for __le* types to avoid potential conflicts resulting in redefinition errors during Linux builds. Add check for BSD builds. Fixes: 38dff79ba736 ("net/bnx2x: update HSI") Signed-off-by: Rasesh Mody Tested-by: Dharmik Thakkar Tested-by: Gavin Hu --- drivers/net/bnx2x/bnx2x_osal.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/bnx2x/bnx2x_osal.h b/drivers/net/bnx2x/bnx2x_osal.h index 7cd293259..72e4b6d6b 100644 --- a/drivers/net/bnx2x/bnx2x_osal.h +++ b/drivers/net/bnx2x/bnx2x_osal.h @@ -8,7 +8,11 @@ #ifndef BNX2X_OSAL_H #define BNX2X_OSAL_H +#ifdef __FreeBSD__ #include +#else +#include +#endif #if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN #ifndef __LITTLE_ENDIAN @@ -22,8 +26,10 @@ #undef __LITTLE_ENDIAN #endif +#ifdef __FreeBSD__ #define __le16 uint16_t #define __le32 uint32_t #define __le64 uint64_t +#endif #endif /* BNX2X_OSAL_H */ -- 2.18.0