From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.tuxdriver.com (charlotte.tuxdriver.com [70.61.120.58]) by dpdk.org (Postfix) with ESMTP id BFFF52A9 for ; Tue, 9 Dec 2014 19:45:27 +0100 (CET) Received: from hmsreliant.think-freely.org ([2001:470:8:a08:7aac:c0ff:fec2:933b] helo=localhost) by smtp.tuxdriver.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1XyPmZ-0001Vi-Q4; Tue, 09 Dec 2014 13:45:21 -0500 Date: Tue, 9 Dec 2014 13:45:05 -0500 From: Neil Horman To: Mark Kavanagh Message-ID: <20141209184505.GG28871@hmsreliant.think-freely.org> References: <1418146328-24354-1-git-send-email-mark.b.kavanagh@intel.com> <1418146328-24354-2-git-send-email-mark.b.kavanagh@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1418146328-24354-2-git-send-email-mark.b.kavanagh@intel.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Score: -2.9 (--) X-Spam-Status: No Cc: dev@dpdk.org Subject: Re: [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 18:45:28 -0000 On Tue, Dec 09, 2014 at 05:32:08PM +0000, Mark Kavanagh wrote: > 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 > > Acked-by: Neil Horman