From: Neil Horman <nhorman@tuxdriver.com>
To: Mark Kavanagh <mark.b.kavanagh@intel.com>
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH] rte_eth_ctrl: rename rte_eth_fdir_flow.ip6_flow
Date: Tue, 9 Dec 2014 13:45:05 -0500 [thread overview]
Message-ID: <20141209184505.GG28871@hmsreliant.think-freely.org> (raw)
In-Reply-To: <1418146328-24354-2-git-send-email-mark.b.kavanagh@intel.com>
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 <mark.b.kavanagh@intel.com>
> ---
> 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 <nhorman@tuxdriver.com>
next prev parent reply other threads:[~2014-12-09 18:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-09 17:32 Mark Kavanagh
2014-12-09 17:32 ` Mark Kavanagh
2014-12-09 18:45 ` Neil Horman [this message]
2014-12-11 0:57 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141209184505.GG28871@hmsreliant.think-freely.org \
--to=nhorman@tuxdriver.com \
--cc=dev@dpdk.org \
--cc=mark.b.kavanagh@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).