Thanks, Ales. On 3/5/26 20:40, Ales Musil wrote:
On Wed, Mar 4, 2026 at 10:16 AM Jun Gu <[email protected]> wrote:Fixes: 98822b9 ("controller: Remove ovn-ofctrl-wait-before-clear option.") Signed-off-by: Jun Gu <[email protected]> --- controller/ofctrl.c | 4 ---- controller/ofctrl.h | 1 - controller/ovn-controller.c | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/controller/ofctrl.c b/controller/ofctrl.c index 9f3ce0368..847d23bac 100644 --- a/controller/ofctrl.c +++ b/controller/ofctrl.c @@ -787,7 +787,6 @@ ofctrl_get_mf_field_id(void) */ bool ofctrl_run(const char *conn_target, int probe_interval, - const struct ovsrec_open_vswitch_table *ovs_table, struct shash *pending_ct_zones, struct tracked_acl_ids *tracked_acl_ids) { @@ -814,9 +813,6 @@ ofctrl_run(const char *conn_target, int probe_interval, } } } - const struct ovsrec_open_vswitch *cfg = - ovsrec_open_vswitch_table_first(ovs_table); - ovs_assert(cfg); bool progress = true; for (int i = 0; progress && i < 50; i++) { diff --git a/controller/ofctrl.h b/controller/ofctrl.h index abd2ff1c9..0f618435a 100644 --- a/controller/ofctrl.h +++ b/controller/ofctrl.h @@ -54,7 +54,6 @@ struct ovn_desired_flow_table { void ofctrl_init(struct ovn_extend_table *group_table, struct ovn_extend_table *meter_table); bool ofctrl_run(const char *conn_target, int probe_interval, - const struct ovsrec_open_vswitch_table *ovs_table, struct shash *pending_ct_zones, struct tracked_acl_ids *tracked_acl_ids); enum mf_field_id ofctrl_get_mf_field_id(void); diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c index 2d9b3e033..194bb6ca8 100644 --- a/controller/ovn-controller.c +++ b/controller/ovn-controller.c @@ -7613,7 +7613,7 @@ main(int argc, char *argv[]) if (br_int) { ct_zones_data = engine_get_data(&en_ct_zones); if (ofctrl_run(br_int_remote.target, - br_int_remote.probe_interval, ovs_table, + br_int_remote.probe_interval, ct_zones_data ? &ct_zones_data->ctx.pending : NULL, tracked_acl_ids)) { -- 2.34.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-devThank you Jun, I fixed the 0-day robot complaint and merged this into main. I didn't backport it because it has no real functional impact. Regards, Ales
_______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
