projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3336e94
)
network: make link_check_ready() return earlier if the link is not in 'configuring...
author
Yu Watanabe
<watanabe.yu+github@gmail.com>
Tue, 21 Jul 2020 21:07:42 +0000
(06:07 +0900)
committer
Yu Watanabe
<watanabe.yu+github@gmail.com>
Tue, 28 Jul 2020 17:05:05 +0000
(
02:05
+0900)
src/network/networkd-link.c
patch
|
blob
|
history
diff --git
a/src/network/networkd-link.c
b/src/network/networkd-link.c
index dd98bf26856802f9e4f3fd2ba51f250185cd81c0..15cfe39553753f735926cb2853bb14fe5737421f 100644
(file)
--- a/
src/network/networkd-link.c
+++ b/
src/network/networkd-link.c
@@
-1086,8
+1086,11
@@
void link_check_ready(Link *link) {
assert(link);
- if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) {
- log_link_debug(link, "%s(): link is in failed or linger state.", __func__);
+ if (link->state == LINK_STATE_CONFIGURED)
+ return;
+
+ if (link->state != LINK_STATE_CONFIGURING) {
+ log_link_debug(link, "%s(): link is in %s state.", __func__, link_state_to_string(link->state));
return;
}
@@
-1189,8
+1192,7
@@
void link_check_ready(Link *link) {
}
}
- if (link->state != LINK_STATE_CONFIGURED)
- link_enter_configured(link);
+ link_enter_configured(link);
return;
}