From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 6 Nov 2024 18:02:54 +0000 (+0900)
Subject: network: drop static configs later
X-Git-Tag: v257-rc2~41^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8da735cebb14936c529a46a04635472c9bcbe84;p=thirdparty%2Fsystemd.git

network: drop static configs later

Follow-up for dd6d53a8dc58c5e6e310b09ba7f7a22600a87ba9.

Unnecessary static configs will be anyway dropped later in
link_configure() -> link_drop_unmanaged_config(). Hence, even if we are
reconfiguring an interface cleanly, it is not necessary to drop static
configs here.
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 990203b528b..72765eebd8f 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1397,13 +1397,6 @@ int link_reconfigure_impl(Link *link, LinkReconfigurationFlag flags) {
         /* Dropping old .network file */
 
         if (FLAGS_SET(flags, LINK_RECONFIGURE_CLEANLY)) {
-                /* Remove all static configurations. Note, dynamic configurations are dropped by
-                 * link_stop_engines(), and foreign configurations will be removed later by
-                 * link_configure() -> link_drop_unmanaged_config(). */
-                r = link_drop_static_config(link);
-                if (r < 0)
-                        return r;
-
                 /* Stop DHCP client and friends, and drop dynamic configurations like DHCP address. */
                 r = link_stop_engines(link, /* may_keep_dhcp = */ false);
                 if (r < 0)