[ovs-git] Open vSwitch: ofp-actions: Distinguish OF1.1/1.2 push_mpls from OF1.3+. (master)

[dev at openvswitch.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  a7a2d006baae4152d338bd0bb4de1687084b1b07 (commit)
      from  ad9ca2fc4ab3f2380a9034a8c276b49cf58411fe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a7a2d006baae4152d338bd0bb4de1687084b1b07
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=a7a2d006baae4152d338bd0bb4de1687084b1b07
Author: Joe Stringer <joe at wand.net.nz>
		
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 at wand.net.nz>
Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


-----------------------------------------------------------------------

Summary of changes:
 lib/ofp-actions.c     |   91 ++++++++++++++++++++++++++++++++++++++++++-------
 lib/ofp-actions.h     |   16 +++++++++
 lib/ofp-print.c       |    2 +-
 lib/ofp-util.c        |   24 +++++++------
 lib/ofp-util.h        |    2 +-
 utilities/ovs-ofctl.c |    8 ++---
 6 files changed, 115 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
Open vSwitch