From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <thomas.monjalon@6wind.com>
Received: from mail-we0-f171.google.com (mail-we0-f171.google.com
 [74.125.82.171]) by dpdk.org (Postfix) with ESMTP id 29C2547D2
 for <dev@dpdk.org>; Mon, 23 Jun 2014 22:57:37 +0200 (CEST)
Received: by mail-we0-f171.google.com with SMTP id q58so7801795wes.30
 for <dev@dpdk.org>; Mon, 23 Jun 2014 13:57:55 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20130820;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:organization
 :user-agent:in-reply-to:references:mime-version
 :content-transfer-encoding:content-type;
 bh=YcMP6tN+49vx1yfastV6PWq6sBR1tchRjRS/zN8SuGU=;
 b=GiKWkgtWOoDuC/0AtX+BH5kPbLepc9PquXHEFrGD5VVbjRDQqWSAfkF7aaaHUdaa37
 wFR6QkLVDvQHUIKgryzPIWxa3KLjHQq8AcIbg/Zj3j6nNYvwuXGHT3RAJb5dWqbnci+3
 VHLOt2Il2BmqW93EMgt7Nq4nVpr2vo/DBHRChOfN+t9CNhY01VVLK2dJDVtc7XlXExjV
 m8HVkH4IqhU7uspIohqS/DnHWq4rFGEWMzlpSLnAmtOqG2gn8xuY28JQc8Z0pkh+PDlf
 LK0SLEIiURScvEg3mSYuOr8xCUZNHAtUeb6nLwF9mvShvPLSlrJVUxY06rY/1c4qCo/E
 ABDw==
X-Gm-Message-State: ALoCoQlnAsrP7J9bjnuNPLDsk+dAVSxqWbPNjw6vMeh/OpkOEw/zBoU3+ox2DebvgiMZyz78qMZo
X-Received: by 10.180.210.134 with SMTP id mu6mr24550333wic.18.1403557075337; 
 Mon, 23 Jun 2014 13:57:55 -0700 (PDT)
Received: from xps13.localnet (136-92-190-109.dsl.ovh.fr. [109.190.92.136])
 by mx.google.com with ESMTPSA id o3sm36682635wiz.24.2014.06.23.13.57.53
 for <multiple recipients>
 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Mon, 23 Jun 2014 13:57:54 -0700 (PDT)
From: Thomas Monjalon <thomas.monjalon@6wind.com>
To: Helin Zhang <helin.zhang@intel.com>
Date: Mon, 23 Jun 2014 22:57:51 +0200
Message-ID: <1779532.Cv7FcTlULd@xps13>
Organization: 6WIND
User-Agent: KMail/4.13.1 (Linux/3.14.6-1-ARCH; KDE/4.13.1; x86_64; ; )
In-Reply-To: <1402494218-9203-1-git-send-email-helin.zhang@intel.com>
References: <1402494218-9203-1-git-send-email-helin.zhang@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v2] kni: fix compile errors on Oracle
	Linux6.4 and RHEL6.5
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: Mon, 23 Jun 2014 20:57:37 -0000

> The compile errors are copied as follows. The fixes came from
> Linux drivers of ixgbe-3.21.2 and igb-5.1.2 with modifications.
> The idea is to use self-defined functions no matter they have
> already been defined somewhere or not.
> 
> * Oracle Linux6.4
> lib/librte_eal/linuxapp/kni/ethtool/ixgbe/kcompat.h:3111:
> error: redefinition of 'ether_addr_equal'
> include/linux/etherdevice.h:180: note: previous definition
> of 'ether_addr_equal' was here
> * RHEL6.5
> lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h:3597:
> error: redefinition of 'mmd_eee_cap_to_ethtool_sup_t'
> include/linux/mdio.h:387: note: previous definition of
> 'mmd_eee_cap_to_ethtool_sup_t' was here
> lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h:3625:
> error: redefinition of 'mmd_eee_adv_to_ethtool_adv_t'
> include/linux/mdio.h:415: note: previous definition of
> 'mmd_eee_adv_to_ethtool_adv_t' was here
> lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h:3653:
> error: redefinition of 'ethtool_adv_to_mmd_eee_adv_t'
> include/linux/mdio.h:443: note: previous definition of
> 'ethtool_adv_to_mmd_eee_adv_t' was here
> 
> Signed-off-by: HELIN ZHANG <helin.zhang@intel.com>
> Acked-by: Cunming Liang <cunming.liang@intel.com>
> Tested-by: Waterman Cao <waterman.cao@intel.com>

Applied for version 1.7.0.

Thanks
-- 
Thomas