[ovs-git] [ovn-org/ovn] dadae4: ofctrl.c: Only merge actions for conjunctive flows.

[Dumitru Ceara]

  Branch: refs/heads/master
  Home:   https://github.com/ovn-org/ovn
  Commit: dadae4f800ccb1f2759378f0bd804dd002e31605
      https://github.com/ovn-org/ovn/commit/dadae4f800ccb1f2759378f0bd804dd002e31605
  Author: Dumitru Ceara <dceara at redhat.com>
  Date:   2020-10-12 (Mon, 12 Oct 2020)

  Changed paths:
    M controller/ofctrl.c

  Log Message:
  -----------
  ofctrl.c: Only merge actions for conjunctive flows.

In ofctrl_add_or_append_flow() when merging flow actions make sure we only
do that for conjunctive flows.  All other actions can not be merged with
action "conjunction".

CC: Mark Michelson <mmichels at redhat.com>
Fixes: e659bab31a91 ("Combine conjunctions with identical matches into one flow.")
Signed-off-by: Dumitru Ceara <dceara at redhat.com>
Signed-off-by: Han Zhou <hzhou at ovn.org>