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

networkd-link: link_configure(); factor out link_configure_can() into separate function

Browse source
This commit is contained in:
Marc Kleine-Budde 2018-05-30 11:47:23 +02:00
parent c07b23ca7e
commit 93ea77505e
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/network/networkd-link.c
View file

@ -2599,6 +2599,20 @@ static int link_update_lldp(Link *link) {
return r; return r;
} }
static int link_configure_can(Link *link) {
int r;
if (!(link->flags & IFF_UP)) {
r = link_up_can(link);
if (r < 0) {
link_enter_failed(link);
return r;
}
}
return 0;
}
static int link_configure(Link *link) { static int link_configure(Link *link) {
int r; int r;
@ -2606,18 +2620,8 @@ static int link_configure(Link *link) {
assert(link->network); assert(link->network);
assert(link->state == LINK_STATE_PENDING); assert(link->state == LINK_STATE_PENDING);
if (streq_ptr(link->kind, "vcan")) { if (streq_ptr(link->kind, "vcan"))
return link_configure_can(link);
if (!(link->flags & IFF_UP)) {
r = link_up_can(link);
if (r < 0) {
link_enter_failed(link);
return r;
}
}
return 0;
}
/* Drop foreign config, but ignore loopback or critical devices. /* Drop foreign config, but ignore loopback or critical devices.
* We do not want to remove loopback address or addresses used for root NFS. */ * We do not want to remove loopback address or addresses used for root NFS. */