From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 7DDBCDE0 for ; Tue, 9 Dec 2014 18:34:07 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 09 Dec 2014 09:30:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,546,1413270000"; d="scan'208";a="621102592" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga001.jf.intel.com with ESMTP; 09 Dec 2014 09:32:26 -0800 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id sB9HWQpZ013625; Tue, 9 Dec 2014 17:32:26 GMT Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id sB9HWPIV024505; Tue, 9 Dec 2014 17:32:25 GMT Received: (from mbkavana@localhost) by sivswdev01.ir.intel.com with id sB9HWPos024501; Tue, 9 Dec 2014 17:32:25 GMT From: Mark Kavanagh To: dev@dpdk.org Date: Tue, 9 Dec 2014 17:32:08 +0000 Message-Id: <1418146328-24354-2-git-send-email-mark.b.kavanagh@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1418146328-24354-1-git-send-email-mark.b.kavanagh@intel.com> References: <1418146328-24354-1-git-send-email-mark.b.kavanagh@intel.com> Subject: [dpdk-dev] [PATCH] rte_eth_ctrl: rename rte_eth_fdir_flow.ip6_flow 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: Tue, 09 Dec 2014 17:34:08 -0000 The name of the rte_eth_fdir_flow's rte_eth_ipv6_flow attribute, 'ip6_flow', clashes with a macro defined in /usr/include/netinet/ip6.h, such that when DPDK is linked with an application that uses the afforementioned header, the macro is expanded within the DPDK struct, causing a compilation error. Rename the relevant attribute in DPDK to resolve this. Signed-off-by: Mark Kavanagh --- app/test-pmd/cmdline.c | 4 ++-- lib/librte_ether/rte_eth_ctrl.h | 2 +- lib/librte_pmd_i40e/i40e_fdir.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index f79ea3e..882a5a2 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -8261,9 +8261,9 @@ cmd_flow_director_filter_parsed(void *parsed_result, case RTE_ETH_FLOW_TYPE_UDPV6: case RTE_ETH_FLOW_TYPE_TCPV6: IPV6_ADDR_TO_ARRAY(res->ip_dst, - entry.input.flow.ip6_flow.dst_ip); + entry.input.flow.ipv6_flow.dst_ip); IPV6_ADDR_TO_ARRAY(res->ip_src, - entry.input.flow.ip6_flow.src_ip); + entry.input.flow.ipv6_flow.src_ip); /* need convert to big endian. */ entry.input.flow.udp6_flow.dst_port = rte_cpu_to_be_16(res->port_dst); diff --git a/lib/librte_ether/rte_eth_ctrl.h b/lib/librte_ether/rte_eth_ctrl.h index 7088d8d..5d9c387 100644 --- a/lib/librte_ether/rte_eth_ctrl.h +++ b/lib/librte_ether/rte_eth_ctrl.h @@ -275,7 +275,7 @@ union rte_eth_fdir_flow { struct rte_eth_udpv6_flow udp6_flow; struct rte_eth_tcpv6_flow tcp6_flow; struct rte_eth_sctpv6_flow sctp6_flow; - struct rte_eth_ipv6_flow ip6_flow; + struct rte_eth_ipv6_flow ipv6_flow; }; /** diff --git a/lib/librte_pmd_i40e/i40e_fdir.c b/lib/librte_pmd_i40e/i40e_fdir.c index ad38803..68511c8 100644 --- a/lib/librte_pmd_i40e/i40e_fdir.c +++ b/lib/librte_pmd_i40e/i40e_fdir.c @@ -749,10 +749,10 @@ i40e_fdir_fill_eth_ip_head(const struct rte_eth_fdir_input *fdir_input, * to the expected received packets. */ rte_memcpy(&(ip6->src_addr), - &(fdir_input->flow.ip6_flow.dst_ip), + &(fdir_input->flow.ipv6_flow.dst_ip), IPV6_ADDR_LEN); rte_memcpy(&(ip6->dst_addr), - &(fdir_input->flow.ip6_flow.src_ip), + &(fdir_input->flow.ipv6_flow.src_ip), IPV6_ADDR_LEN); ip6->proto = next_proto[fdir_input->flow_type]; break; -- 1.9.3