[ovs-dev] [PATCH v2.42 3/5] lib: Support pushing of MPLS LSE before or after VLAN tag

[Ben Pfaff]

On Fri, Oct 04, 2013 at 05:09:58PM +0900, Simon Horman wrote:
> From: Joe Stringer <joe at wand.net.nz>
> 
> This patch modifies the push_mpls behaviour to allow
> pushing of an MPLS LSE either before any VLAN tag that may be present.
> 
> Pushing the MPLS LSE before any VLAN tag that is present is the
> behaviour specified in OpenFlow 1.3.
> 
> Pushing the MPLS LSE after the any VLAN tag that is present is the
> behaviour specified in OpenFlow 1.1 and 1.2. This is the only behaviour
> that was supported prior to this patch.
> 
> When an push_mpls action has been inserted using OpenFlow 1.2 or earlier
> the behaviour of pushing the MPLS LSE before any VLAN tag that may be
> present is implemented by by inserting VLAN actions around the MPLS push
> action during odp translation; Pop VLAN tags before committing MPLS
> actions, and push the expected VLAN tag afterwards.
> 
> The trigger condition for the two different behaviours is the value of the
> mpls_before_vlan field of struct ofpact_push_mpls.  This field is set when
> parsing OpenFlow actions.
> 
> Signed-off-by: Joe Stringer <joe at wand.net.nz>
> Signed-off-by: Simon Horman <horms at verge.net.au>

I'm happy with this, I think.  It will need a trivial update if you take
my suggestion on patch 2.