chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
672682a
)
networkd: link - correctly skip state ENSLAVING when no vlans configured
author
Tom Gundersen
<teg@jklm.no>
Mon, 10 Feb 2014 22:01:47 +0000
(23:01 +0100)
committer
Tom Gundersen
<teg@jklm.no>
Mon, 10 Feb 2014 22:01:47 +0000
(23:01 +0100)
This fixes a regression introduced in
672682a6b
src/network/networkd-link.c
patch
|
blob
|
history
diff --git
a/src/network/networkd-link.c
b/src/network/networkd-link.c
index 5e763069f3622367e430a662c62a9cac45fc3f4f..39c61d8d08bd3fc116c2ef3144f520ebd99aee71 100644
(file)
--- a/
src/network/networkd-link.c
+++ b/
src/network/networkd-link.c
@@
-876,7
+876,8
@@
static int link_enter_enslave(Link *link) {
link->state = LINK_STATE_ENSLAVING;
link->state = LINK_STATE_ENSLAVING;
- if (!link->network->bridge && !link->network->bond && !link->network->vlans)
+ if (!link->network->bridge && !link->network->bond &&
+ hashmap_isempty(link->network->vlans))
return link_enslaved(link);
if (link->network->bridge) {
return link_enslaved(link);
if (link->network->bridge) {