This is a rebase of the series due to recent changes in lib/ofp-actions.c.

Jarno Rajahalme (6):
  utilities/ovs-ofctl: Fix meter requests.
  ovs-ofctl: Fix a typo in documentation.
  ofproto: Check actions also for packet outs and traces.
  dpif: Meter framework.
  lib/odp, ofproto xlate: Meter execution support.
  dpif-netdev: Simple DROP meter implementation.

 datapath/linux/compat/include/linux/openvswitch.h |    3 +
 lib/dpif-linux.c                                  |   40 ++
 lib/dpif-netdev.c                                 |  402 ++++++++++++++++++++-
 lib/dpif-provider.h                               |   28 ++
 lib/dpif.c                                        |  130 ++++++-
 lib/dpif.h                                        |   11 +
 lib/netdev-bsd.c                                  |    5 -
 lib/netdev-dpdk.c                                 |   14 +-
 lib/netdev-dummy.c                                |    8 +-
 lib/netdev-linux.c                                |    8 +-
 lib/netdev-provider.h                             |    4 +
 lib/odp-execute.c                                 |   60 +--
 lib/odp-execute.h                                 |   14 +-
 lib/odp-util.c                                    |   14 +
 lib/ofp-actions.c                                 |    1 +
 lib/ofp-actions.h                                 |    1 +
 ofproto/ofproto-dpif-xlate.c                      |   11 +-
 ofproto/ofproto-dpif.c                            |   95 +++--
 ofproto/ofproto-provider.h                        |    4 +-
 ofproto/ofproto.c                                 |   67 ++--
 tests/dpif-netdev.at                              |  105 ++++++
 utilities/ovs-ofctl.8.in                          |    2 +-
 utilities/ovs-ofctl.c                             |    6 +-
 23 files changed, 892 insertions(+), 141 deletions(-)

-- 
1.7.10.4

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

Reply via email to