From b87ffa9b5ad4f7aca5b49f1314f4f48ecd6478aa Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 5 Jan 2024 05:30:43 +0900 Subject: [PATCH] network/route: use nexthop_is_ready() --- src/network/networkd-route.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index 72dbf9ed067..abaea4e6c3f 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -1277,20 +1277,14 @@ static int route_is_ready_to_configure(const Route *route, Link *link) { struct nexthop_grp *nhg; NextHop *nh; - if (nexthop_get_by_id(link->manager, route->nexthop_id, &nh) < 0) - return false; - - if (!nexthop_exists(nh)) - return false; + r = nexthop_is_ready(link->manager, route->nexthop_id, &nh); + if (r <= 0) + return r; HASHMAP_FOREACH(nhg, nh->group) { - NextHop *g; - - if (nexthop_get_by_id(link->manager, nhg->id, &g) < 0) - return false; - - if (!nexthop_exists(g)) - return false; + r = nexthop_is_ready(link->manager, nhg->id, NULL); + if (r <= 0) + return r; } } -- 2.47.3