From ea121d8f252010ee796a0d6b6bb383c893c4ce55 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 24 Jul 2020 07:18:39 +0900 Subject: [PATCH] network: update address infomation even if link is in failed or linger state As the link may be reconfigured later. If we do not update the address information, then its setup state or operstate may not be updated correctly. --- src/network/networkd-address.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 747acfe6c5..b09d75e615 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -355,11 +355,8 @@ int address_update( int r; assert(address); + assert(address->link); assert(cinfo); - assert_return(address->link, 1); - - if (IN_SET(address->link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) - return 1; ready = address_is_ready(address); @@ -367,6 +364,9 @@ int address_update( address->scope = scope; address->cinfo = *cinfo; + if (IN_SET(address->link->state, LINK_STATE_FAILED, LINK_STATE_LINGER)) + return 0; + link_update_operstate(address->link, true); link_check_ready(address->link);