[ovs-git] Open vSwitch: Remove mpls_depth field from flow (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  b0a17866c3145fd35e844e1b66c499c55ecf6f1d (commit)
      from  e15653c927a9aed6bf0e88b0ea49a665c7131e5d (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 b0a17866c3145fd35e844e1b66c499c55ecf6f1d
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=b0a17866c3145fd35e844e1b66c499c55ecf6f1d
Author: Simon Horman <horms at verge.net.au>
		
Remove mpls_depth field from flow
		
Rather than tracking the MPLS depth as a field in the
flow, which is an entirely poor place for it, just track
the delta to the MPLS depth during translation.

This logic was developed while implementing recirculation
and intended to be used to detect when recirculation should
occur. This variant of the patch uses the logic to determine
if processing of actions should stop due to an MPLS
action which cannot be translated (without recirculation).

A side-effect of this patch is that it resolves a bug
whereby ovs-vswitchd will abort due to to an assertion
on eth_type_mpls(ctx->xin->flow.dl_type) in compose_mpls_pop_action(()
if the actions of a flow include pop_mpls twice without
a push_mpls in between.

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Ben Pfaff <blp at nicira.com>


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

Summary of changes:
 lib/flow.c                   |    7 +--
 lib/flow.h                   |    8 ++-
 lib/match.c                  |    2 +-
 lib/nx-match.c               |    2 +-
 lib/odp-util.c               |   48 +++++++-----------
 lib/odp-util.h               |    4 +-
 lib/ofp-util.c               |    3 +-
 ofproto/ofproto-dpif-xlate.c |  114 ++++++++++++++++++++++++++++++++++--------
 tests/ofproto-dpif.at        |   22 ++++++++
 tests/test-bundle.c          |    2 -
 tests/test-multipath.c       |    2 -
 utilities/ovs-dpctl.c        |    2 +-
 utilities/ovs-ofctl.8.in     |   16 +++---
 13 files changed, 152 insertions(+), 80 deletions(-)


hooks/post-receive
-- 
Open vSwitch