From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 10 Aug 2021 10:44:14 +0000 (+0900)
Subject: Merge pull request #19939 from yuwata/network-dhcp-client-use-request-queue
X-Git-Tag: v250-rc1~856
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8fd992027344f6b7de4b5a1b448fb58f1550050a;p=thirdparty%2Fsystemd.git

Merge pull request #19939 from yuwata/network-dhcp-client-use-request-queue

network: use request queue to configure DHCP clients
---

8fd992027344f6b7de4b5a1b448fb58f1550050a
diff --cc src/network/networkd-link.c
index 8900534cd67,92fab92553d..6855189bcc3
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@@ -1266,13 -1256,14 +1266,12 @@@ static int link_reconfigure_impl(Link *
          link_free_carrier_maps(link);
          link_free_engines(link);
          link->network = network_unref(link->network);
-         link_unref(set_remove(link->manager->links_requesting_uuid, link));
  
 +        if (!network) {
 +                link_set_state(link, LINK_STATE_UNMANAGED);
 +                return 0;
 +        }
 +
          /* Then, apply new .network file */
          link->network = network_ref(network);
          link_update_operstate(link, true);