]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #19939 from yuwata/network-dhcp-client-use-request-queue
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 10 Aug 2021 10:44:14 +0000 (19:44 +0900)
committerGitHub <noreply@github.com>
Tue, 10 Aug 2021 10:44:14 +0000 (19:44 +0900)
network: use request queue to configure DHCP clients

1  2 
src/network/networkd-link.c
src/network/networkd-manager.c

index 8900534cd675aea36208b32dee7cd8b68098dda1,92fab92553d81b2801ede34a95739cd66cabe90c..6855189bcc3b2bf998b28be49408a95a7f73c438
@@@ -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);
Simple merge