Re: [dpdk-dev] [PATCH 03/15] net: add rte prefix to ether structures

[David Marchand <david.marchand@redhat.com>]

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