From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 30 Nov 2022 01:21:50 +0000 (+0900)
Subject: network: address: always update link state when an address is removed
X-Git-Tag: v253-rc1~397^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaad20e0e1066ae9efa51251ecfa1c30a14dd323;p=thirdparty%2Fsystemd.git

network: address: always update link state when an address is removed

The removed address might be in the tentative state.
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 107f19fd154..e6db72f4f46 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -504,13 +504,11 @@ static int address_update(Address *address) {
 
 static int address_drop(Address *address) {
         Link *link;
-        bool ready;
         int r;
 
         assert(address);
         assert(address->link);
 
-        ready = address_is_ready(address);
         link = address->link;
 
         r = address_set_masquerade(address, false);
@@ -522,11 +520,8 @@ static int address_drop(Address *address) {
         if (address->state == 0)
                 address_free(address);
 
-        link_update_operstate(link, true);
-
-        if (link && !ready)
-                link_check_ready(link);
-
+        link_update_operstate(link, /* also_update_master = */ true);
+        link_check_ready(link);
         return 0;
 }