diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-11-13 15:05:58 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-11-13 15:05:58 +0100 |
| commit | a56a2048f9592acc4934b9ce15d71bc7e1df1a17 (patch) | |
| tree | d1eeb3feb4373761c85ba79ede20cce10db8c9f0 /src/network | |
| parent | 3098562c9236fe0bd3e7d950b6c53907304d277f (diff) | |
networkd: check explicit state rather than link->network
When deserializing we can now have an attached network without the various clients yet
having been configured. Hence, don't misused the link->network as a check to determine
if a link is ready to be used, but check the state explicitly.
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/networkd-link.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index c37532bb73..a415035887 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -506,9 +506,6 @@ static int link_stop_clients(Link *link) { assert(link->manager); assert(link->manager->event); - if (!link->network) - return 0; - if (link->dhcp_client) { k = sd_dhcp_client_stop(link->dhcp_client); if (k < 0) @@ -2485,7 +2482,7 @@ int link_ipv6ll_gained(Link *link) { link->ipv6ll_address = true; link_check_ready(link); - if (link->network) { + if (!IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_PENDING, LINK_STATE_UNMANAGED, LINK_STATE_FAILED)) { r = link_acquire_ipv6_conf(link); if (r < 0) { link_enter_failed(link); @@ -2501,7 +2498,7 @@ static int link_carrier_gained(Link *link) { assert(link); - if (link->network) { + if (!IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_PENDING, LINK_STATE_UNMANAGED, LINK_STATE_FAILED)) { r = link_acquire_conf(link); if (r < 0) { link_enter_failed(link); |