From e36d601c5e2b836ba52a8f71098e2d2aa6821268 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 7 May 2021 16:35:42 +0900 Subject: [PATCH] network: change order of dropping network configs As routes may requires nexthops and addresses, nexthops may requires addresses. --- src/network/networkd-link.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index ffaebbbf6d3..34359b2541c 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -2028,17 +2028,17 @@ static int link_drop_foreign_config(Link *link) { assert(link); assert(link->manager); - r = link_drop_foreign_addresses(link); + r = link_drop_foreign_routes(link); - k = link_drop_foreign_neighbors(link); + k = link_drop_foreign_nexthops(link); if (k < 0 && r >= 0) r = k; - k = link_drop_foreign_routes(link); + k = link_drop_foreign_addresses(link); if (k < 0 && r >= 0) r = k; - k = link_drop_foreign_nexthops(link); + k = link_drop_foreign_neighbors(link); if (k < 0 && r >= 0) r = k; @@ -2055,17 +2055,17 @@ static int link_drop_config(Link *link) { assert(link); assert(link->manager); - r = link_drop_addresses(link); + r = link_drop_routes(link); - k = link_drop_neighbors(link); + k = link_drop_nexthops(link); if (k < 0 && r >= 0) r = k; - k = link_drop_routes(link); + k = link_drop_addresses(link); if (k < 0 && r >= 0) r = k; - k = link_drop_nexthops(link); + k = link_drop_neighbors(link); if (k < 0 && r >= 0) r = k; -- 2.47.3