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

networkd: link - don't react to successfull link up 

Avoid having two code-paths racing with eacother to do the same thing. The change
of flags will be detected in the normal way, so only use the link_up_handler
to detect if the 'up' failed and in that case fail the link.
This commit is contained in:
Tom Gundersen 2014-04-22 19:36:40 +02:00
parent 124fa2c601
commit 45ad2c1328
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1242,14 +1242,15 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
return 1;
r = sd_rtnl_message_get_errno(m);
if (r >= 0)
link_update_flags(link, link->flags | IFF_UP);
else
if (r < 0) {
log_struct_link(LOG_WARNING, link,
"MESSAGE=%s: could not bring up interface: %s",
link->ifname, strerror(-r),
"ERRNO=%d", -r,
NULL);
link_enter_failed(link);
}
return 1;
}
@ -1446,6 +1447,7 @@ static int link_configure(Link *link) {
if (link->network->ipv4ll) {
uint8_t seed[8];
r = sd_ipv4ll_new(&link->ipv4ll);
if (r < 0)
return r;