From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F24EAC04AB3 for ; Wed, 29 May 2019 08:41:15 +0000 (UTC) Received: from dpdk.org (dpdk.org [92.243.14.124]) by mail.kernel.org (Postfix) with ESMTP id 8DCE62081C for ; Wed, 29 May 2019 08:41:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8DCE62081C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D82F21B94A; Wed, 29 May 2019 10:41:14 +0200 (CEST) Received: from mail-vs1-f68.google.com (mail-vs1-f68.google.com [209.85.217.68]) by dpdk.org (Postfix) with ESMTP id 447A41B944 for ; Wed, 29 May 2019 10:41:14 +0200 (CEST) Received: by mail-vs1-f68.google.com with SMTP id q64so1207285vsd.1 for ; Wed, 29 May 2019 01:41:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wyy/BDjo2+QxKCgoJexFTtaBpkNTXruc4ScFq2MlFC0=; b=o6BegT2Br8oicm1ioudl7Z7r3PLtknHRZk5UWsOptWAq2SEsNnc787SbX698dR9kll Gou+ShgieCIwSB2GLJdsVQtAsIeb97bA2yhdu3eXTc9DlVHZRaLpCnVExPuOasbZGGmd nBnn7zu+2bV04sNLdnVhAAMES0ymCiUG1AGzlp/ECUyvdPNT1izOJBvTps8ZWuM3v6KJ Pz6fjhG2Kk3f+ESNYBBb6Y61wxxOTPOnoQP66WfWa8AFVd0GKWguASiYxQ93ZrprymYu ZgKvC2hnpRQ3+2s3donKURvKrep4X7TI7lXv+6FlS1oNUuUi8ih6Y5ioMTAgin0VFS/z tZBw== X-Gm-Message-State: APjAAAV1h7NY9vLxz5cad4jhI9YKv9IfH3kMkI/LANBnqc/CCOYLnSgj FJ9bvtP2lmN2iuG3zmM4dq+0q7c1mFL0IQkuPeZR4w== X-Google-Smtp-Source: APXvYqzfPk+kYXuION+aM/B3JX3o7wJiURpdcx8CihZnMFrfzyAZghmCD59QpwiyBMCVeI06vnyeaY/yqL3M2YWXCjE= X-Received: by 2002:a67:f59a:: with SMTP id i26mr67858811vso.168.1559119273729; Wed, 29 May 2019 01:41:13 -0700 (PDT) MIME-Version: 1.0 References: <20190410083218.17531-1-olivier.matz@6wind.com> <20190521161315.25500-1-olivier.matz@6wind.com> <20190521161315.25500-12-olivier.matz@6wind.com> In-Reply-To: <20190521161315.25500-12-olivier.matz@6wind.com> From: David Marchand Date: Wed, 29 May 2019 10:41:03 +0200 Message-ID: To: Olivier Matz Cc: dev , Stephen Hemminger , "Yigit, Ferruh" Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [PATCH 11/15] net: add rte prefix to ip defines X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Tue, May 21, 2019 at 6:15 PM Olivier Matz 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