From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 7 May 2021 07:35:42 +0000 (+0900)
Subject: network: change order of dropping network configs
X-Git-Tag: v249-rc1~240^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e36d601c5e2b836ba52a8f71098e2d2aa6821268;p=thirdparty%2Fsystemd.git

network: change order of dropping network configs

As routes may requires nexthops and addresses, nexthops may requires
addresses.
---

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;