From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <olivier.matz@6wind.com>
Received: from mail.droids-corp.org (zoll.droids-corp.org [94.23.50.67])
 by dpdk.org (Postfix) with ESMTP id DC19358F4
 for <dev@dpdk.org>; Sun,  8 Feb 2015 21:01:00 +0100 (CET)
Received: from was59-1-82-226-113-214.fbx.proxad.net ([82.226.113.214]
 helo=[192.168.0.10])
 by mail.droids-corp.org with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128)
 (Exim 4.80) (envelope-from <olivier.matz@6wind.com>)
 id 1YKY5x-0005Pn-8U; Sun, 08 Feb 2015 21:04:48 +0100
Message-ID: <54D7C06F.2090206@6wind.com>
Date: Sun, 08 Feb 2015 21:00:47 +0100
From: Olivier MATZ <olivier.matz@6wind.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
 rv:31.0) Gecko/20100101 Icedove/31.3.0
MIME-Version: 1.0
To: Cunming Liang <cunming.liang@intel.com>, dev@dpdk.org
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>
In-Reply-To: <1422842559-13617-10-git-send-email-cunming.liang@intel.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
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 <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 20:01:01 -0000

Hi,

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 <cunming.liang@intel.com>
> ---
>  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
> 

Is the issue caused by a change you've made previously in the patch
series?

Wouldn't it be better to rename the macros in enic instead of doing
#undef?

Regards,
Olivier