[ovs-git] Open vSwitch: connmgr: Do not use OFPRR_METER_DELETE before OF1.4 (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  fa42f4f849eeb1d2ea0506ff56e286451d73faf2 (commit)
      from  290ad78a64faaca2895cc0c22532169a73b7009d (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 fa42f4f849eeb1d2ea0506ff56e286451d73faf2
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=fa42f4f849eeb1d2ea0506ff56e286451d73faf2
Author: Simon Horman <horms at verge.net.au>
		
connmgr: Do not use OFPRR_METER_DELETE before OF1.4
		
OFPRR_METER_DELETE was introduced in OF1.4 however meters were introduced
in OF1.3.

Regardless of the OF version when flows are deleted cause flows to be
deleted handle_delete_meter() calls delete_flows__() with
OFPRR_METER_DELETE as the reason.

In order to avoid sending OFPRR_METER_DELETE to controllers connected
using OF1.3 map OFPRR_METER_DELETE to OFPRR_DELETE which exists in that
version.

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


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

Summary of changes:
 lib/ofp-util.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Open vSwitch