network: simplify the condition about ipv4ll is enabled or not

diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index c4024499f1daebb479d97d20b19eae770db5ae67..74c40559a7539de4d437b80e834fd2e9b33556a5 100644 (file)
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -1052,9 +1052,7 @@ static int dhcp4_handler(sd_dhcp_client *client, int event, void *userdata) {
 
         switch (event) {
                 case SD_DHCP_CLIENT_EVENT_STOP:
-                        if (link_ipv4ll_enabled(link)) {
-                                assert(link->ipv4ll);
-
+                        if (link->ipv4ll) {
                                 log_link_debug(link, "DHCP client is stopped. Acquiring IPv4 link-local address");
 
                                 r = sd_ipv4ll_start(link->ipv4ll);
@@ -1141,16 +1139,12 @@ static int dhcp4_handler(sd_dhcp_client *client, int event, void *userdata) {
                         break;
 
                 case SD_DHCP_CLIENT_EVENT_TRANSIENT_FAILURE:
-                        if (link_ipv4ll_enabled(link)) {
-                                assert(link->ipv4ll);
-
-                                if (!sd_ipv4ll_is_running(link->ipv4ll)) {
-                                        log_link_debug(link, "Problems acquiring DHCP lease, acquiring IPv4 link-local address");
+                        if (link->ipv4ll && !sd_ipv4ll_is_running(link->ipv4ll)) {
+                                log_link_debug(link, "Problems acquiring DHCP lease, acquiring IPv4 link-local address");
 
-                                        r = sd_ipv4ll_start(link->ipv4ll);
-                                        if (r < 0)
-                                                return log_link_warning_errno(link, r, "Could not acquire IPv4 link-local address: %m");
-                                }
+                                r = sd_ipv4ll_start(link->ipv4ll);
+                                if (r < 0)
+                                        return log_link_warning_errno(link, r, "Could not acquire IPv4 link-local address: %m");
                         }
                         break;
 

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index fc47d33cbbb0303ba23bf98d464775cc9a087808..d122af4d5919a4179e249e54e5184414c3019d58 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1207,9 +1207,7 @@ static int link_acquire_ipv4_conf(Link *link) {
                 if (r < 0)
                         return log_link_warning_errno(link, r, "Could not acquire DHCPv4 lease: %m");
 
-        } else if (link_ipv4ll_enabled(link)) {
-                assert(link->ipv4ll);
-
+        } else if (link->ipv4ll) {
                 log_link_debug(link, "Acquiring IPv4 link-local address");
 
                 r = sd_ipv4ll_start(link->ipv4ll);