picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

network: drop unnecessary conditions 

sd_ipv4acd_stop() and sd_ipv4ll_stop() are idempotent.
This commit is contained in:
Yu Watanabe 2020-10-15 07:39:55 +09:00
parent c6a7531e0e
commit a391901eb2
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/networkd-address.c
View File

@ -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)

8
src/network/networkd-ipv4ll.c
View File

@ -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)

8
src/network/networkd-radv.c
View File

@ -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)