Always insert MPLS labels after VLAN tags.
authorBen Pfaff <blp@nicira.com>
Tue, 4 Feb 2014 20:39:37 +0000 (12:39 -0800)
committerBen Pfaff <blp@nicira.com>
Fri, 7 Feb 2014 01:13:46 +0000 (17:13 -0800)
commit269dc90a0a090f2b40e55b4572ac5edeb1684b7d
tree399abd9b0872d21364a087f858c298b407435440
parent0070679ff7209cb29398a16c15569cb86d49834c
Always insert MPLS labels after VLAN tags.

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@nicira.com>
Acked-by: Simon Horman <horms@verge.net.au>
include/linux/openvswitch.h
lib/odp-util.c
lib/ofp-actions.c
lib/ofp-actions.h
ofproto/ofproto-dpif-xlate.c