On Thu, Jun 04, 2026 at 03:33:16PM -0400, Jacob Tanenbaum wrote: > The datapath argument passed to re_nl_sync_routes() is never used so it > should be removed. > > Signed-off-by: Jacob Tanenbaum <[email protected]> > > diff --git a/controller/route-exchange-netlink.c > b/controller/route-exchange-netlink.c > index 1fb41008c..a9fd1f58a 100644 > --- a/controller/route-exchange-netlink.c > +++ b/controller/route-exchange-netlink.c > @@ -200,7 +200,6 @@ re_nl_delete_route(uint32_t table_id, const struct > advertise_route_entry *re) > } > > struct route_msg_handle_data { > - const struct sbrec_datapath_binding *db; > struct hmapx *routes_to_advertise; > struct vector *learned_routes; > struct vector *stale_routes; > @@ -246,7 +245,6 @@ handle_route_msg(const struct route_table_msg *msg, > } > struct re_nl_received_route_node rr; > rr = (struct re_nl_received_route_node) { > - .db = handle_data->db, > .prefix = rd->rta_dst, > .plen = rd->rtm_dst_len, > .nexthop = nexthop->addr, > @@ -322,8 +320,7 @@ re_nl_encode_nexthop(struct ofpbuf *request, bool > dst_is_ipv4, > > int > re_nl_sync_routes(uint32_t table_id, const struct hmap *routes, > - struct vector *learned_routes, > - const struct sbrec_datapath_binding *db) > + struct vector *learned_routes) > { > struct hmapx routes_to_advertise = > HMAPX_INITIALIZER(&routes_to_advertise); > struct vector stale_routes = > @@ -342,7 +339,6 @@ re_nl_sync_routes(uint32_t table_id, const struct hmap > *routes, > .routes_to_advertise = &routes_to_advertise, > .learned_routes = learned_routes, > .stale_routes = &stale_routes, > - .db = db, > }; > route_table_dump_one_table(table_id, handle_route_msg, &data); > > diff --git a/controller/route-exchange-netlink.h > b/controller/route-exchange-netlink.h > index 8ba8a1039..f79ae05db 100644 > --- a/controller/route-exchange-netlink.h > +++ b/controller/route-exchange-netlink.h > @@ -42,7 +42,6 @@ struct vector; > struct advertise_route_entry; > > struct re_nl_received_route_node { > - const struct sbrec_datapath_binding *db; > struct in6_addr prefix; > unsigned int plen; > struct in6_addr nexthop; > @@ -61,8 +60,7 @@ void re_route_format(struct ds *, uint32_t table_id, > const struct in6_addr *nexthop, int err); > > int re_nl_sync_routes(uint32_t table_id, const struct hmap *routes, > - struct vector *learned_routes, > - const struct sbrec_datapath_binding *db); > + struct vector *learned_routes); > > int re_nl_cleanup_routes(uint32_t table_id); > > diff --git a/controller/route-exchange.c b/controller/route-exchange.c > index 82727f4e4..08e44e4f6 100644 > --- a/controller/route-exchange.c > +++ b/controller/route-exchange.c > @@ -296,7 +296,7 @@ route_exchange_run(const struct route_exchange_ctx_in > *r_ctx_in, > VECTOR_EMPTY_INITIALIZER(struct re_nl_received_route_node); > > error = re_nl_sync_routes(table_id, &ad->routes, > - &received_routes, ad->db); > + &received_routes); > SET_ROUTE_EXCHANGE_NL_STATUS(error); > > sb_sync_learned_routes(&received_routes, ad->db, > diff --git a/tests/test-ovn-netlink.c b/tests/test-ovn-netlink.c > index bea269b5e..84de2bd63 100644 > --- a/tests/test-ovn-netlink.c > +++ b/tests/test-ovn-netlink.c > @@ -232,7 +232,7 @@ test_route_sync(struct ovs_cmdl_context *ctx) > } > > ovs_assert(re_nl_sync_routes(table_id, &routes_to_advertise, > - &received_routes, NULL) == 0); > + &received_routes) == 0); > > struct ds msg = DS_EMPTY_INITIALIZER; > > -- > 2.54.0 >
LGTM. Acked-by: Mairtin O'Loingsigh [email protected] _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
