From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id ADBB92C7A for ; Mon, 9 Feb 2015 14:50:43 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 09 Feb 2015 05:43:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="451998677" Received: from pgsmsx108.gar.corp.intel.com ([10.221.44.103]) by FMSMGA003.fm.intel.com with ESMTP; 09 Feb 2015 05:36:10 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by PGSMSX108.gar.corp.intel.com (10.221.44.103) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 9 Feb 2015 21:50:39 +0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.62]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.192]) with mapi id 14.03.0195.001; Mon, 9 Feb 2015 21:50:40 +0800 From: "Liang, Cunming" To: Olivier MATZ , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH v4 09/17] enic: fix re-define freebsd compile complain Thread-Index: AQHQPoxqxC9e9MABU0KNM/VFHuJO75zmsKaAgAGwvHA= Date: Mon, 9 Feb 2015 13:50:39 +0000 Message-ID: References: <1422491072-5114-1-git-send-email-cunming.liang@intel.com> <1422842559-13617-1-git-send-email-cunming.liang@intel.com> <1422842559-13617-10-git-send-email-cunming.liang@intel.com> <54D7C06F.2090206@6wind.com> In-Reply-To: <54D7C06F.2090206@6wind.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v4 09/17] enic: fix re-define freebsd compile complain X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Feb 2015 13:50:44 -0000 > -----Original Message----- > From: Olivier MATZ [mailto:olivier.matz@6wind.com] > Sent: Monday, February 09, 2015 4:01 AM > To: Liang, Cunming; dev@dpdk.org > Subject: Re: [dpdk-dev] [PATCH v4 09/17] enic: fix re-define freebsd comp= ile > complain >=20 > Hi, >=20 > On 02/02/2015 03:02 AM, Cunming Liang wrote: > > Some macro already been defined by freebsd 'sys/param.h'. > > > > Signed-off-by: Cunming Liang > > --- > > lib/librte_pmd_enic/enic.h | 1 + > > lib/librte_pmd_enic/enic_compat.h | 1 + > > 2 files changed, 2 insertions(+) > > > > diff --git a/lib/librte_pmd_enic/enic.h b/lib/librte_pmd_enic/enic.h > > index c43417c..189c3b9 100644 > > --- a/lib/librte_pmd_enic/enic.h > > +++ b/lib/librte_pmd_enic/enic.h > > @@ -66,6 +66,7 @@ > > #define ENIC_CALC_IP_CKSUM 1 > > #define ENIC_CALC_TCP_UDP_CKSUM 2 > > #define ENIC_MAX_MTU 9000 > > +#undef PAGE_SIZE > > #define PAGE_SIZE 4096 > > #define PAGE_ROUND_UP(x) \ > > ((((unsigned long)(x)) + PAGE_SIZE-1) & (~(PAGE_SIZE-1))) > > diff --git a/lib/librte_pmd_enic/enic_compat.h > b/lib/librte_pmd_enic/enic_compat.h > > index b1af838..b84c766 100644 > > --- a/lib/librte_pmd_enic/enic_compat.h > > +++ b/lib/librte_pmd_enic/enic_compat.h > > @@ -67,6 +67,7 @@ > > #define pr_warn(y, args...) dev_warning(0, y, ##args) > > #define BUG() pr_err("BUG at %s:%d", __func__, __LINE__) > > > > +#undef ALIGN > > #define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1) > > #define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask)) > > #define udelay usleep > > >=20 > Is the issue caused by a change you've made previously in the patch > series? [LCM] Yes, caused by [01/17] which include in freebsdapp. >=20 > Wouldn't it be better to rename the macros in enic instead of doing > #undef? [LCM] Agree, will do it. >=20 > Regards, > Olivier