]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: change order of dropping network configs
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 7 May 2021 07:35:42 +0000 (16:35 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 12 May 2021 02:26:06 +0000 (11:26 +0900)
As routes may requires nexthops and addresses, nexthops may requires
addresses.

src/network/networkd-link.c

index ffaebbbf6d34abe089fa7650c40a7675fc10f044..34359b2541ceb0678abb0ae51c42dfa806aadf1e 100644 (file)
@@ -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;