Hi, This series implements basic MPLS actions and matches based on the kernel datapath work by Leo Alterman.
Some limitations in the scope of this series are described in the changelog entry for the last patch in the series. The key differences between this series and the previous version (v2.1) are: * Squashed changes to kernel-datapath into first patch of series * Non-trivial rebase on top of master Git and diffstat information is provided below to aid review. ---------------------------------------------------------------- The following changes since commit 1d446463ea3707ee609ea45f0cd2714aa7f5bfc6: ofproto-dpif: Avoid zeroing tunnel info in handle_miss_upcalls(). (2012-10-04 16:57:54 -0700) are available in the git repository at: git://github.com/horms/openvswitch.git devel/mpls for you to fetch changes up to 1af93db1f2efaf1591510f86419b3517e34aa2e2: User-Space MPLS actions and matches (2012-10-09 16:07:15 +0900) ---------------------------------------------------------------- Simon Horman (4): datapath: Add basic MPLS support to kernel user-space datapath: Add basic MPLS support to kernel nx-match: Do not check pre-requisites for load actions User-Space MPLS actions and matches datapath/actions.c | 81 +++++++++ datapath/datapath.c | 61 +++++++ datapath/datapath.h | 8 + datapath/flow.c | 30 ++++ datapath/flow.h | 7 + datapath/vport.c | 2 + include/linux/openvswitch.h | 32 ++++ include/openflow/nicira-ext.h | 84 +++++++++ include/openflow/openflow-1.2.h | 2 + lib/autopath.c | 6 +- lib/autopath.h | 3 +- lib/bundle.c | 7 +- lib/bundle.h | 3 +- lib/dpif-netdev.c | 13 ++ lib/flow.c | 120 ++++++++++++- lib/flow.h | 14 +- lib/learn.c | 10 +- lib/learn.h | 2 +- lib/match.c | 69 +++++++- lib/match.h | 6 + lib/meta-flow.c | 138 ++++++++++++++- lib/meta-flow.h | 13 +- lib/multipath.c | 7 +- lib/multipath.h | 3 +- lib/nx-match.c | 38 ++++- lib/nx-match.h | 6 +- lib/odp-util.c | 194 ++++++++++++++++++++- lib/ofp-actions.c | 107 ++++++++++-- lib/ofp-actions.h | 20 ++- lib/ofp-parse.c | 14 ++ lib/ofp-print.c | 4 + lib/ofp-util.c | 28 ++- lib/ofp-util.def | 4 + lib/ofpbuf.c | 8 +- lib/ofpbuf.h | 1 + lib/packets.c | 356 +++++++++++++++++++++++++++++++++++++++ lib/packets.h | 88 ++++++++++ ofproto/ofproto-dpif.c | 96 ++++++++++- ofproto/ofproto.c | 4 +- tests/automake.mk | 5 + tests/odp.at | 16 +- tests/ofp-print.at | 6 +- tests/ofproto-dpif.at | 141 +++++++++++++--- tests/ofproto.at | 12 +- tests/test-mpls.c | 288 +++++++++++++++++++++++++++++++ utilities/ovs-dpctl.c | 18 +- utilities/ovs-ofctl.8.in | 21 +++ 47 files changed, 2064 insertions(+), 132 deletions(-) create mode 100644 tests/test-mpls.c _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev