summaryrefslogtreecommitdiff
path: root/ovn
diff options
context:
space:
mode:
authormajopela@redhat.com <majopela@redhat.com>2017-07-18 14:55:00 +0000
committerRussell Bryant <russell@ovn.org>2017-07-18 22:37:11 -0400
commit9f08bb7471847b676d0828d9198bfc6123336292 (patch)
treef90f37fbacdaaca05fa62883fce8a1d9f92a54a7 /ovn
parent40b0fbd3c6272fb175e6a60fb911391db6e6e71f (diff)
downloadopenvswitch-9f08bb7471847b676d0828d9198bfc6123336292.tar.gz
ovn: l3ha fix bundle action generation
The bundle pointer wasn't properly re-pointed each time we added a new slave port to the openflow action. Signed-off-by: Miguel Angel Ajo <majopela@redhat.com> Signed-off-by: Russell Bryant <russell@ovn.org>
Diffstat (limited to 'ovn')
-rw-r--r--ovn/controller/physical.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c
index 1d0fe7fc9..719b020ce 100644
--- a/ovn/controller/physical.c
+++ b/ovn/controller/physical.c
@@ -695,16 +695,17 @@ consider_port_binding(enum mf_field_id mff_ovn_geneve,
}
ofpbuf_put(ofpacts_p, &tun->ofport,
sizeof tun->ofport);
+ bundle = ofpacts_p->header;
bundle->n_slaves++;
}
}
- ofpact_finish_BUNDLE(ofpacts_p, &bundle);
bundle->algorithm = NX_BD_ALG_ACTIVE_BACKUP;
/* Although ACTIVE_BACKUP bundle algorithm seems to ignore
* the next two fields, those are always set */
bundle->basis = 0;
bundle->fields = NX_HASH_FIELDS_ETH_SRC;
+ ofpact_finish_BUNDLE(ofpacts_p, &bundle);
}
ofctrl_add_flow(flow_table, OFTABLE_REMOTE_OUTPUT, 100, 0,
&match, ofpacts_p);