network: drop old dhcp6 addresses or routes after new ones are configured

Fixes the issue similar to #20050 but for DHCP6.
This commit is contained in:
Yu Watanabe
2021-07-02 20:19:17 +09:00
parent fe139e8ef9
commit e95ec7cd1e

View File

@@ -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))