On 2019/04/15 23:21, Yuya Kusakabe wrote:
> skb_reorder_vlan_header() should move XDP meta data with ethernet header
> if XDP meta data exists.
>
> Fixes: de8f3a83b0a0 ("bpf: add meta pointer for direct access")
> Signed-off-by: Yuya Kusakabe <yuya.kusak...@gmail.com>
> Signed-off-by: Takeru Hayasaka <taketar...@gmail.com>
> Co-developed-by: Takeru Hayasaka <taketar...@gmail.com>
> ---
...
> @@ -5095,6 +5096,13 @@ static struct sk_buff *skb_reorder_vlan_header(struct
> sk_buff *skb)
> memmove(skb_mac_header(skb) + VLAN_HLEN, skb_mac_header(skb),
> mac_len - VLAN_HLEN - ETH_TLEN);
> }
> +
> + meta_len = skb_metadata_len(skb);
> + if (meta_len) {
> + meta = skb_metadata_end(skb) - meta_len;
> + memmove(meta + VLAN_HLEN, meta, meta_len);
> + };
You still have extra trailing semicolon.
> +
> skb->mac_header += VLAN_HLEN;
> return skb;
> }
>
--
Toshiaki Makita
