the boolean condition for sync_pbs_for_northd_changed_ovn_ports() is
meaningless as the funtion always returns true.
Fixes: b16121f96114 ("northd: Sync SB Port bindings NAT column in a separate
engine node.")
Co-Authored-by: Ales Musil <[email protected]>
Signed-off-by: Ales Musil <[email protected]>
Signed-off-by: Jacob Tanenbaum <[email protected]>
Acked-by: Ales Musil <[email protected]>
diff --git a/northd/en-sync-sb.c b/northd/en-sync-sb.c
index 65b88a371..198881e20 100644
--- a/northd/en-sync-sb.c
+++ b/northd/en-sync-sb.c
@@ -417,11 +417,8 @@ sync_to_sb_pb_northd_handler(struct engine_node *node,
void *data OVS_UNUSED)
struct ed_type_lr_stateful *lr_stateful_data =
engine_get_input_data("lr_stateful", node);
- if (!sync_pbs_for_northd_changed_ovn_ports(&nd->trk_data.trk_lsps,
- &lr_stateful_data->table)) {
- return EN_UNHANDLED;
- }
-
+ sync_pbs_for_northd_changed_ovn_ports(&nd->trk_data.trk_lsps,
+ &lr_stateful_data->table);
return EN_HANDLED_UPDATED;
}
diff --git a/northd/northd.c b/northd/northd.c
index 5eecb9bec..e6062979e 100644
--- a/northd/northd.c
+++ b/northd/northd.c
@@ -3925,7 +3925,7 @@ sync_pbs(struct ovsdb_idl_txn *ovnsb_idl_txn, struct hmap
*ls_ports,
/* Sync the SB Port bindings for the added and updated logical switch ports
* of the tracked northd engine data. */
-bool
+void
sync_pbs_for_northd_changed_ovn_ports(
struct tracked_ovn_ports *trk_ovn_ports,
const struct lr_stateful_table *lr_stateful_table)
@@ -3939,8 +3939,6 @@ sync_pbs_for_northd_changed_ovn_ports(
HMAPX_FOR_EACH (hmapx_node, &trk_ovn_ports->updated) {
sync_pb_for_lsp(hmapx_node->data, lr_stateful_table);
}
-
- return true;
}
static bool
diff --git a/northd/northd.h b/northd/northd.h
index 7dc261216..a9c971aed 100644
--- a/northd/northd.h
+++ b/northd/northd.h
@@ -988,7 +988,7 @@ struct lr_stateful_table;
void sync_pbs(struct ovsdb_idl_txn *, struct hmap *ls_ports,
struct hmap *lr_ports,
const struct lr_stateful_table *);
-bool sync_pbs_for_northd_changed_ovn_ports(
+void sync_pbs_for_northd_changed_ovn_ports(
struct tracked_ovn_ports *,
const struct lr_stateful_table *);
--
2.51.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
