From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 28 Oct 2020 05:22:09 +0000 (+0900)
Subject: network: drop dhcp4_init()
X-Git-Tag: v248-rc1~628^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5360b089e1f2a18e6ea79eea1c63171e86809c8c;p=thirdparty%2Fsystemd.git

network: drop dhcp4_init()

It is now called by only dhcp4_configure(). Let's merge them.
---

diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index eba6c3e16bd..a605a9c7d60 100644
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -1309,25 +1309,6 @@ static int dhcp4_set_request_address(Link *link) {
         return sd_dhcp_client_set_request_address(link->dhcp_client, &a->in_addr.in);
 }
 
-static int dhcp4_init(Link *link) {
-        int r;
-
-        assert(link);
-
-        if (link->dhcp_client)
-                return 0;
-
-        r = sd_dhcp_client_new(&link->dhcp_client, link->network->dhcp_anonymize);
-        if (r < 0)
-                return r;
-
-        r = sd_dhcp_client_attach_event(link->dhcp_client, link->manager->event, 0);
-        if (r < 0)
-                return r;
-
-        return 0;
-}
-
 int dhcp4_configure(Link *link) {
         sd_dhcp_option *send_option;
         void *request_options;
@@ -1343,9 +1324,15 @@ int dhcp4_configure(Link *link) {
         if (r < 0)
                 return r;
 
-        r = dhcp4_init(link);
-        if (r < 0)
-                return log_link_error_errno(link, r, "DHCP4 CLIENT: Failed to initialize DHCP4 client: %m");
+        if (!link->dhcp_client) {
+                r = sd_dhcp_client_new(&link->dhcp_client, link->network->dhcp_anonymize);
+                if (r < 0)
+                        return log_link_error_errno(link, r, "DHCP4 CLIENT: Failed to allocate DHCP4 client: %m");
+
+                r = sd_dhcp_client_attach_event(link->dhcp_client, link->manager->event, 0);
+                if (r < 0)
+                        return log_link_error_errno(link, r, "DHCP4 CLIENT: Failed to attach event to DHCP4 client: %m");
+        }
 
         r = sd_dhcp_client_set_mac(link->dhcp_client,
                                    (const uint8_t *) &link->mac,