ofp-actions: Distinguish OF1.1/1.2 push_mpls from OF1.3+.
authorJoe Stringer <joe@wand.net.nz>
Thu, 17 Oct 2013 01:15:08 +0000 (10:15 +0900)
committerBen Pfaff <blp@nicira.com>
Mon, 21 Oct 2013 20:12:37 +0000 (13:12 -0700)
commita7a2d006baae4152d338bd0bb4de1687084b1b07
tree2d129f11ca7675cece4e7fcc96d905c9f0001a9e
parentad9ca2fc4ab3f2380a9034a8c276b49cf58411fe
ofp-actions: Distinguish OF1.1/1.2 push_mpls from OF1.3+.

In OpenFlow 1.1 and 1.2, the push_mpls action pushes the MPLS label after
any existing VLAN tag.  In OpenFlow 1.3, it pushes the label before any
existing VLAN tag.  Until now, the action parser didn't distinguish these
cases.  This commit adds support.  Nothing yet actually changes the
behavior of push_mpls.

enum ofpact_mpls_position contributed by Ben Pfaff.

Signed-off-by: Joe Stringer <joe@wand.net.nz>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
lib/ofp-actions.c
lib/ofp-actions.h
lib/ofp-print.c
lib/ofp-util.c
lib/ofp-util.h
utilities/ovs-ofctl.c