From 0c0585ca25e28112fdd679ca37cd361c20901a02 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 15 Feb 2021 03:29:55 +0900 Subject: [PATCH] network: enumerate nexthops before routes Preparation for the later commits. Routes may have RTA_NH_ID attribute. To resolve the nexthop ID, all nexthops must be enumerated earlier. --- src/network/networkd-manager.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index debd9f1ecc..70c5c30b30 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -1099,6 +1099,10 @@ int manager_enumerate(Manager *m) { if (r < 0) return log_error_errno(r, "Could not enumerate neighbors: %m"); + r = manager_enumerate_nexthop(m); + if (r < 0) + return log_error_errno(r, "Could not enumerate nexthop rules: %m"); + r = manager_enumerate_routes(m); if (r < 0) return log_error_errno(r, "Could not enumerate routes: %m"); @@ -1107,10 +1111,6 @@ int manager_enumerate(Manager *m) { if (r < 0) return log_error_errno(r, "Could not enumerate routing policy rules: %m"); - r = manager_enumerate_nexthop(m); - if (r < 0) - return log_error_errno(r, "Could not enumerate nexthop rules: %m"); - return 0; } -- 2.25.1