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

Merge pull request #12466 from yuwata/network-fix-issue-12452

Browse source 
network: fix assertion when link get carrier
This commit is contained in:
Chris Down 2019-05-03 23:01:28 -04:00 committed by GitHub
parent b6adba159c b9ea3d2e47
commit 6450ee3f8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/network/networkd-link.c
View file

@ -3734,7 +3734,7 @@ int link_ipv6ll_gained(Link *link, const struct in6_addr *address) {
link->ipv6ll_address = *address; link->ipv6ll_address = *address;
link_check_ready(link); 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); r = link_acquire_ipv6_conf(link);
if (r < 0) { if (r < 0) {
link_enter_failed(link); link_enter_failed(link);
@ -3750,7 +3750,7 @@ static int link_carrier_gained(Link *link) {
assert(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); r = link_acquire_conf(link);
if (r < 0) { if (r < 0) {
link_enter_failed(link); link_enter_failed(link);