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 <[email protected]> Signed-off-by: Russell Bryant <[email protected]>
zhuomingliang · Jul 19, 2017 · 9f08bb7 · 9f08bb7
1 parent 40b0fbd
commit 9f08bb7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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);