From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 4 Jan 2024 20:30:43 +0000 (+0900)
Subject: network/route: use nexthop_is_ready()
X-Git-Tag: v256-rc1~1258^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b87ffa9b5ad4f7aca5b49f1314f4f48ecd6478aa;p=thirdparty%2Fsystemd.git

network/route: use nexthop_is_ready()
---

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;
                 }
         }