diff options
| author | Chris Down <chris@chrisdown.name> | 2019-05-03 23:01:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-03 23:01:28 -0400 |
| commit | 6450ee3f8c841dce72d8d5b986813bf2cf7dbdf8 (patch) | |
| tree | da98d7d453653d9f396cd204c1791a8591855369 | |
| parent | b6adba159c89b1919c2f21fc42fc6fef3301e696 (diff) | |
| parent | b9ea3d2e47b3741f3f46ba9c5e19640136933b71 (diff) | |
| download | systemd-6450ee3f8c841dce72d8d5b986813bf2cf7dbdf8.tar.gz | |
Merge pull request #12466 from yuwata/network-fix-issue-12452
network: fix assertion when link get carrier
| -rw-r--r-- | src/network/networkd-link.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 3e22efb92a..c56b4dfceb 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -3734,7 +3734,7 @@ int link_ipv6ll_gained(Link *link, const struct in6_addr *address) { link->ipv6ll_address = *address; link_check_ready(link); - if (!IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_UNMANAGED, LINK_STATE_FAILED)) { + if (IN_SET(link->state, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED)) { r = link_acquire_ipv6_conf(link); if (r < 0) { link_enter_failed(link); @@ -3750,7 +3750,7 @@ static int link_carrier_gained(Link *link) { assert(link); - if (!IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_UNMANAGED, LINK_STATE_FAILED)) { + if (IN_SET(link->state, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED)) { r = link_acquire_conf(link); if (r < 0) { link_enter_failed(link); |