On Mon, Jun 10, 2019 at 4:44 PM Yifeng Sun <[email protected]> wrote:
>
> From: Michał Mirosław <[email protected]>
>
> Upstream commit:
> commit 9df46aefafa6dee81a27c2a9d8ba360abd8c5fe3
> Author: Michał Mirosław <[email protected]>
> Date: Thu Nov 8 18:44:50 2018 +0100
>
> OVS: remove use of VLAN_TAG_PRESENT
>
> This is a minimal change to allow removing of VLAN_TAG_PRESENT.
> It leaves OVS unable to use CFI bit, as fixing this would need
> a deeper surgery involving userspace interface.
>
> Signed-off-by: Michał Mirosław <[email protected]>
> Signed-off-by: David S. Miller <[email protected]>
This backport actually contains the other upstream patch 6083e28aa02d
("OVS: remove VLAN_TAG_PRESENT - fixup"). Can we update the commit
message for reference?
Other than that, this patch LGTM. Thanks Yifeng!
Acked-by: Yi-Hung Wei <[email protected]>
> --- a/datapath/linux/compat/include/linux/if_vlan.h
> +++ b/datapath/linux/compat/include/linux/if_vlan.h
> @@ -53,6 +53,25 @@ static inline struct sk_buff
> *rpl_vlan_insert_tag_set_proto(struct sk_buff *skb,
> }
> #endif
>
> +#ifndef HAVE_VLAN_HWACCEL_CLEAR_TAG
> +/**
> + * __vlan_hwaccel_clear_tag - clear hardware accelerated VLAN info
> + * @skb: skbuff to clear
> + *
> + * Clears the VLAN information from @skb
> + */
> +#define __vlan_hwaccel_clear_tag rpl_vlan_hwaccel_clear_tag
> +static inline void rpl_vlan_hwaccel_clear_tag(struct sk_buff *skb)
> +{
> +#ifdef HAVE_SKBUFF_VLAN_PRESENT
> + skb->vlan_present = 0;
This is very minor. In datapath code, we do not expand tab to be
consisent with the other kernel code. Can we replace eight space to a
tab here?
> +#else
> + skb->vlan_tci = 0;
> + skb->vlan_proto = 0;
> +#endif
> +}
> +#endif
> +
> #ifndef HAVE_VLAN_HWACCEL_PUSH_INSIDE
>
> /*
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
