From e95ec7cd1e363e1d55f59787c1e85f8f6c97e86c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 2 Jul 2021 20:19:17 +0900 Subject: [PATCH] network: drop old dhcp6 addresses or routes after new ones are configured Fixes the issue similar to #20050 but for DHCP6. --- src/network/networkd-dhcp6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index e850e595e37..2b72b618fc5 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -145,7 +145,7 @@ static int dhcp6_pd_remove_old(Link *link, bool force) { assert(link); assert(link->manager); - if (!force && (link->dhcp6_pd_address_messages != 0 || link->dhcp6_pd_route_messages != 0)) + if (!force && (link->dhcp6_pd_address_messages > 0 || link->dhcp6_pd_route_messages > 0)) return 0; if (set_isempty(link->dhcp6_pd_addresses_old) && set_isempty(link->dhcp6_pd_routes_old)) @@ -740,7 +740,7 @@ static int dhcp6_remove_old(Link *link, bool force) { assert(link); - if (!force && (!link->dhcp6_address_configured || !link->dhcp6_route_configured)) + if (!force && (link->dhcp6_address_messages > 0 || link->dhcp6_route_messages > 0)) return 0; if (set_isempty(link->dhcp6_addresses_old) && set_isempty(link->dhcp6_routes_old)) -- 2.47.3