[ovs-git] [openvswitch/ovs] 06a80f: ofproto-dpif-upcall: Don't delete modified ukeys.

[GitHub]

  Branch: refs/heads/branch-2.5
  Home:   https://github.com/openvswitch/ovs
  Commit: 06a80fcdd93cdc07f6349429eb966a49e230b599
      https://github.com/openvswitch/ovs/commit/06a80fcdd93cdc07f6349429eb966a49e230b599
  Author: Joe Stringer <joe at ovn.org>
  Date:   2016-01-07 (Thu, 07 Jan 2016)

  Changed paths:
    M ofproto/ofproto-dpif-upcall.c

  Log Message:
  -----------
  ofproto-dpif-upcall: Don't delete modified ukeys.

If revalidation returns the result UKEY_DELETE, then both the ukey and
its corresponding flow should be deleted. However, if revalidation
returns UKEY_MODIFY, the ukey itself should be modified in-place and
should not be deleted.

Fix this by only applying the ukey deletion to ukeys whose datapath
operations delete a flow.

This may fix statistics accounting issues in rare cases involving
OpenFlow rule modification where actions are updated but flows remain
the same.

Found by inspection.

Signed-off-by: Joe Stringer <joe at ovn.org>
Acked-by: Jarno Rajahalme <jarno at ovn.org>