[dpdk-dev] [PATCH 11/15] net: add rte prefix to ip defines

[David Marchand]

On Tue, May 21, 2019 at 6:15 PM Olivier Matz <olivier.matz at 6wind.com> wrote:

>
> diff --git a/drivers/net/tap/tap_bpf_program.c
> b/drivers/net/tap/tap_bpf_program.c
> index 2b1dba15b..531569b12 100644
> --- a/drivers/net/tap/tap_bpf_program.c
> +++ b/drivers/net/tap/tap_bpf_program.c
> @@ -19,7 +19,7 @@
>  #include "tap_rss.h"
>
>  /** Create IPv4 address */
> -#define IPv4(a, b, c, d) ((__u32)(((a) & 0xff) << 24) | \
> +#define RTE_IPv4(a, b, c, d) ((__u32)(((a) & 0xff) << 24) | \
>                 (((b) & 0xff) << 16) | \
>                 (((c) & 0xff) << 8)  | \
>                 ((d) & 0xff))
> @@ -157,11 +157,11 @@ rss_l3_l4(struct __sk_buff *skb)
>                 __u8 *src_dst_addr = data + off + offsetof(struct iphdr,
> saddr);
>                 __u8 *src_dst_port = data + off + sizeof(struct iphdr);
>                 struct ipv4_l3_l4_tuple v4_tuple = {
> -                       .src_addr = IPv4(*(src_dst_addr + 0),
> +                       .src_addr = RTE_IPv4(*(src_dst_addr + 0),
>                                         *(src_dst_addr + 1),
>                                         *(src_dst_addr + 2),
>                                         *(src_dst_addr + 3)),
> -                       .dst_addr = IPv4(*(src_dst_addr + 4),
> +                       .dst_addr = RTE_IPv4(*(src_dst_addr + 4),
>                                         *(src_dst_addr + 5),
>                                         *(src_dst_addr + 6),
>                                         *(src_dst_addr + 7)),
>
>
Idem patch 3.

-- 
David Marchand