From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 14 Oct 2020 22:39:55 +0000 (+0900)
Subject: network: drop unnecessary conditions
X-Git-Tag: v247-rc1~28^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a391901eb2184413fa10a37f1635bf2092ac7b8e;p=thirdparty%2Fsystemd.git

network: drop unnecessary conditions

sd_ipv4acd_stop() and sd_ipv4ll_stop() are idempotent.
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index d006199ab0b..0b269a1ba1e 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -1402,11 +1402,9 @@ static int ipv4_dad_update_mac_one(Address *address) {
 
         running = sd_ipv4acd_is_running(address->acd);
 
-        if (running) {
-                r = sd_ipv4acd_stop(address->acd);
-                if (r < 0)
-                        return r;
-        }
+        r = sd_ipv4acd_stop(address->acd);
+        if (r < 0)
+                return r;
 
         r = sd_ipv4acd_set_mac(address->acd, &address->link->mac);
         if (r < 0)
diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c
index 03f29e3b667..3be395e1ada 100644
--- a/src/network/networkd-ipv4ll.c
+++ b/src/network/networkd-ipv4ll.c
@@ -207,11 +207,9 @@ int ipv4ll_update_mac(Link *link) {
 
         restart = sd_ipv4ll_is_running(link->ipv4ll) > 0;
 
-        if (restart) {
-                r = sd_ipv4ll_stop(link->ipv4ll);
-                if (r < 0)
-                        return r;
-        }
+        r = sd_ipv4ll_stop(link->ipv4ll);
+        if (r < 0)
+                return r;
 
         r = sd_ipv4ll_set_mac(link->ipv4ll, &link->mac);
         if (r < 0)
diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c
index 1167f2865f6..bb80e91b6c1 100644
--- a/src/network/networkd-radv.c
+++ b/src/network/networkd-radv.c
@@ -697,11 +697,9 @@ int radv_update_mac(Link *link) {
 
         restart = sd_radv_is_running(link->radv);
 
-        if (restart) {
-                r = sd_radv_stop(link->radv);
-                if (r < 0)
-                        return r;
-        }
+        r = sd_radv_stop(link->radv);
+        if (r < 0)
+                return r;
 
         r = sd_radv_set_mac(link->radv, &link->mac);
         if (r < 0)