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 7EF57A055A for ; Thu, 27 Feb 2020 01:02:43 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 583DF1BF8D; Thu, 27 Feb 2020 01:02:43 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 5F3D11BF8D for ; Thu, 27 Feb 2020 01:02:42 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Feb 2020 16:02:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,490,1574150400"; d="scan'208";a="438623562" Received: from unknown (HELO dpdk6.bj.intel.com) ([172.16.182.243]) by fmsmga006.fm.intel.com with ESMTP; 26 Feb 2020 16:02:39 -0800 From: Wei Zhao To: qabuild@intel.com Cc: Wei Zhao , stable@dpdk.org Date: Thu, 27 Feb 2020 07:42:45 +0800 Message-Id: <1582760565-9174-1-git-send-email-wei.zhao1@intel.com> X-Mailer: git-send-email 2.7.5 Subject: [dpdk-stable] [DPDK] net/ixgbe: fix issue for change definitions of bool X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" We had better not to change code in base folder, that patch will introduce a bug for etag/etag_strip for x550 NIC. So change back to the aboriginal definition. Cc: stable@dpdk.org Fixes: ad43b7bce95b ("net/ixgbe: avoid multiple definitions of bool") Signed-off-by: Wei Zhao --- drivers/net/ixgbe/base/ixgbe_osdep.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h b/drivers/net/ixgbe/base/ixgbe_osdep.h index 844d1701f..19ce2d1c8 100644 --- a/drivers/net/ixgbe/base/ixgbe_osdep.h +++ b/drivers/net/ixgbe/base/ixgbe_osdep.h @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -84,6 +83,10 @@ typedef uint32_t u32; typedef int32_t s32; typedef uint64_t u64; +#ifndef __cplusplus +typedef int bool; +#endif + #define mb() rte_mb() #define wmb() rte_wmb() #define rmb() rte_rmb() -- 2.17.1