From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 21 Aug 2024 01:47:09 +0000 (+0900)
Subject: network/ipv4acd: adjust comment and logging
X-Git-Tag: v257-rc1~665^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F34054%2Fhead;p=thirdparty%2Fsystemd.git

network/ipv4acd: adjust comment and logging
---

diff --git a/src/network/networkd-ipv4acd.c b/src/network/networkd-ipv4acd.c
index 6b1abc42e8d..4785b96f9f3 100644
--- a/src/network/networkd-ipv4acd.c
+++ b/src/network/networkd-ipv4acd.c
@@ -111,20 +111,20 @@ static int dhcp4_address_on_conflict(Link *link) {
         assert(link);
         assert(link->dhcp_client);
 
+        log_link_warning(link, "Dropping DHCPv4 lease, as an address conflict was detected.");
+
         r = sd_dhcp_client_send_decline(link->dhcp_client);
         if (r < 0)
                 log_link_warning_errno(link, r, "Failed to send DHCP DECLINE, ignoring: %m");
 
         if (!link->dhcp_lease)
-                /* Unlikely, but during probing the address, the lease may be lost. */
                 return 0;
 
-        log_link_warning(link, "Dropping DHCPv4 lease, as an address conflict was detected.");
         r = dhcp4_lease_lost(link);
         if (r < 0)
                 return log_link_warning_errno(link, r, "Failed to drop DHCPv4 lease: %m");
 
-        /* It is not necessary to call address_remove() here, as dhcp4_lease_lost() removes it. */
+        /* It is not necessary to call address_remove() here, as dhcp4_lease_lost() removes the address. */
         return 0;
 }