From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
	by dpdk.space (Postfix) with ESMTP id 9CC80A0465
	for <public@inbox.dpdk.org>; Wed, 29 May 2019 10:39:22 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
	by dpdk.org (Postfix) with ESMTP id 4E4541B944;
	Wed, 29 May 2019 10:39:22 +0200 (CEST)
Received: from mail-vs1-f67.google.com (mail-vs1-f67.google.com
 [209.85.217.67]) by dpdk.org (Postfix) with ESMTP id 024784F91
 for <dev@dpdk.org>; Wed, 29 May 2019 10:39:21 +0200 (CEST)
Received: by mail-vs1-f67.google.com with SMTP id l125so1145066vsl.13
 for <dev@dpdk.org>; Wed, 29 May 2019 01:39:20 -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=/1fMNkjEFiMoysFXWWP1RReptkbqFP8DDZRoqmghYM4=;
 b=TlA9vMYgoUKxZ9ixRnmNTNYHjHZFns1CLK5muRYnF9eh9QZMBShC/uhahokfDOOlL4
 j9aXlKKWIFedev9ZLzexW5QDMjDZKnE/O6+j1g+i8uwnkS534E8wFK2paTi2qJHRH5si
 OIioICaIc+sMt0slAskcwSqyO5qzMBuEVljBariIzz/o8phMvj9S4tHn6gCZZa+/BV0P
 FXx1jXvJTaLrMTDknjmyj1/EqLHILvlG7p1vvykdw//1RNn2v0ekfpnTO0Z039Vq9qj2
 vzp6XN1xyaTvImkSUNONfkHwoLXvfvj9iyHuZjjRxoOOi3Ak1hij1YPH9ejF9yE7PQix
 0Mrw==
X-Gm-Message-State: APjAAAUrIQjRd76HGpFrl5l1Q/QM0tyiT/xBE+hWXi7HYrvpD5kLLeFZ
 Vq918X56LDl3y2/VOFHDjeie3hbr4Ym1QPq61mgiyg==
X-Google-Smtp-Source: APXvYqyrxurddG8U3QYzl1qy590mCEd0oJtfnUtbU60kTm2dA5LOSzLaNyAiQxWff8mBgIkVSlK6febJPgHFdNfmlMQ=
X-Received: by 2002:a67:ef45:: with SMTP id k5mr55195807vsr.105.1559119160313; 
 Wed, 29 May 2019 01:39:20 -0700 (PDT)
MIME-Version: 1.0
References: <20190410083218.17531-1-olivier.matz@6wind.com>
 <20190521161315.25500-1-olivier.matz@6wind.com>
 <20190521161315.25500-4-olivier.matz@6wind.com>
In-Reply-To: <20190521161315.25500-4-olivier.matz@6wind.com>
From: David Marchand <david.marchand@redhat.com>
Date: Wed, 29 May 2019 10:39:08 +0200
Message-ID: <CAJFAV8w3PS0JP2LQtAvuDFtUbG2K96yYRozOzgOedaf_P27MDw@mail.gmail.com>
To: Olivier Matz <olivier.matz@6wind.com>
Cc: dev <dev@dpdk.org>, Stephen Hemminger <stephen@networkplumber.org>, 
 "Yigit, Ferruh" <ferruh.yigit@intel.com>
Content-Type: text/plain; charset="UTF-8"
X-Content-Filtered-By: Mailman/MimeDel 2.1.15
Subject: Re: [dpdk-dev] [PATCH 03/15] net: add rte prefix to ether structures
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

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

> diff --git a/drivers/net/tap/tap_bpf_program.c
> b/drivers/net/tap/tap_bpf_program.c
> index 532e8838f..2b1dba15b 100644
> --- a/drivers/net/tap/tap_bpf_program.c
> +++ b/drivers/net/tap/tap_bpf_program.c
> @@ -37,7 +37,7 @@
>  #define KEY_IDX                        0
>  #define BPF_MAP_ID_KEY 1
>
> -struct vlan_hdr {
> +struct rte_vlan_hdr {
>         __be16 proto;
>         __be16 tci;
>  };
> @@ -141,12 +141,12 @@ rss_l3_l4(struct __sk_buff *skb)
>
>         /* Get correct proto for 802.1ad */
>         if (skb->vlan_present && skb->vlan_proto == htons(ETH_P_8021AD)) {
> -               if (data + ETH_ALEN * 2 + sizeof(struct vlan_hdr) +
> +               if (data + ETH_ALEN * 2 + sizeof(struct rte_vlan_hdr) +
>                     sizeof(proto) > data_end)
>                         return TC_ACT_OK;
>                 proto = *(__u16 *)(data + ETH_ALEN * 2 +
> -                                  sizeof(struct vlan_hdr));
> -               off += sizeof(struct vlan_hdr);
> +                                  sizeof(struct rte_vlan_hdr));
> +               off += sizeof(struct rte_vlan_hdr);
>         }
>
>         if (proto == htons(ETH_P_IP)) {
>
>
I think this part should have been skipped.
But I am not able to compile the bpf program before this patch anyway.


-- 
David Marchand