[ovs-dev] [PATCH] Always insert MPLS labels after VLAN tags.

Simon Horman horms at verge.net.au
Wed Feb 5 00:45:03 UTC 2014


On Tue, Feb 04, 2014 at 12:39:37PM -0800, Ben Pfaff wrote:
> OpenFlow 1.1 and 1.2 always inserted MPLS labels after VLAN tags.
> OpenFlow 1.3 and 1.4 insert MPLS labels before VLAN tags.
> OpenFlow 1.3.4 and 1.5, both in preparation, recognize that the change in
> 1.3 was an error and revert it.  This commit implements that reversion
> in Open vSwitch.
> 
> EXT-457.
> Signed-off-by: Ben Pfaff <blp at nicira.com>

Thanks Ben,

I wasn't aware of this revision and it certainly simplifies things a lot.
I have run this through some tests that I have been carrying locally
that exercise VLAN and MPLS combinations and I am happy to say that it
passes. I will post them shortly as "MPLS + VLAN tests".

In the mean time

Acked-by: Simon Horman <horms at verge.net.au>

> ---
>  include/linux/openvswitch.h  |    8 ++++----
>  lib/odp-util.c               |    4 ----
>  lib/ofp-actions.c            |   15 ++++-----------
>  lib/ofp-actions.h            |   16 +---------------
>  ofproto/ofproto-dpif-xlate.c |    7 -------
>  5 files changed, 9 insertions(+), 41 deletions(-)



More information about the dev mailing list