[ovs-git] Open vSwitch: match: Correct formatting of MPLS (master)

dev at openvswitch.org dev at openvswitch.org
Wed Apr 24 17:22:36 UTC 2013

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  392c30bac2f017d65768e8b0f89bdf54aa196bf4 (commit)
      from  1ab9712b8936d175457121a4812a087ba9fa87fb (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 392c30bac2f017d65768e8b0f89bdf54aa196bf4
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=392c30bac2f017d65768e8b0f89bdf54aa196bf4
Author: Simon Horman <horms at verge.net.au>
match: Correct formatting of MPLS
1. mpls or mplsm should be included in the formatted match  instead of
   dl_type=0xXXXX if the dl_type of the match is ETH_TYPE_MPLS or
   ETH_TYPE_MPLS_MCAST respectively. This is consistent with the treatment
   of other dl_types in match_format().

2. Add formatting of MPLS TTL to match_format().
   The format is mpls_ttl=YY.

3. Set the mpls_lse mask of a match to all 1's if
   the dl_type of the flow is ETH_TYPE_MPLS or ETH_TYPE_MPLS_MCAST.
   This will cause mpls_label=LLLL,mpls_tc=W,mpls_ttl=YY,mpls_bos=Z to
   be included with the match is formatted.

4. mpls(label:LLLL,tc:W,ttl:TT,bos:Z) and
   mplsm(label:LLLL,tc:W,ttl:TT,bos:Z) should not be included
   in a formatted match as this is not consistent with the
   formatting of other match elements.

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


Summary of changes:
 lib/match.c           |   30 ++++++++-----------------
 tests/ofproto-dpif.at |   56 ++++++++++++++++++++++++------------------------
 2 files changed, 38 insertions(+), 48 deletions(-)

Open vSwitch

More information about the git mailing list