v1->v2:
  * Patch 1 is new.
  * Patch 2:
    - Use correct OXM with each OpenFlow version.
    - Remove uncredited and unrelated tests from Jean Tourrilhes.
    - Fix behavior of "clear_actions" instruction.

Ben Pfaff (2):
  nx-match: Add support for multiple OXM field assignments for one
    field.
  flow: Support OF1.5+ (draft) actset_output field.

 NEWS                            |  1 +
 build-aux/extract-ofp-fields    | 31 +++++++--------
 include/openflow/openflow-1.0.h |  7 ++--
 lib/flow.c                      | 10 ++---
 lib/flow.h                      | 10 +++--
 lib/match.c                     | 15 +++++++-
 lib/match.h                     |  1 +
 lib/meta-flow.c                 | 29 +++++++++++---
 lib/meta-flow.h                 | 18 +++++++++
 lib/nx-match.c                  | 84 ++++++++++++++++-------------------------
 lib/odp-util.h                  |  2 +-
 lib/ofp-util.c                  |  5 ++-
 ofproto/ofproto-dpif-xlate.c    | 36 ++++++++++++++++--
 tests/ofproto-dpif.at           | 40 ++++++++++++++++++++
 tests/ofproto.at                |  3 +-
 tests/ovs-ofctl.at              | 41 +++++++++++++++++++-
 utilities/ovs-ofctl.8.in        | 10 +++++
 17 files changed, 246 insertions(+), 97 deletions(-)

-- 
2.1.0

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Reply via email to