From 555891fe8d2b3f6ad5ecf22017521f0f1262dca3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 2 May 2022 13:10:24 +0200 Subject: [PATCH] platform: simplify loop for IPv6 addresses in nm_platform_ip_address_sync() (cherry picked from commit 9b930cd96275869bab573ab9bc60febb8d3371ce) --- src/libnm-platform/nm-platform.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libnm-platform/nm-platform.c b/src/libnm-platform/nm-platform.c index 806466b51e..84345b3c91 100644 --- a/src/libnm-platform/nm-platform.c +++ b/src/libnm-platform/nm-platform.c @@ -4326,7 +4326,6 @@ nm_platform_ip_address_sync(NMPlatform *self, } if (!delete_remaining_addrs) { - delete_remaining_addrs = TRUE; while (i_know > 0) { const NMPlatformIP6Address *know_addr = NMP_OBJECT_CAST_IP6_ADDRESS(known_addresses->pdata[--i_know]); @@ -4341,14 +4340,14 @@ nm_platform_ip_address_sync(NMPlatform *self, if (IN6_ARE_ADDR_EQUAL(&plat_addr->address, &know_addr->address)) { /* we have a match. Mark address as handled. */ - delete_remaining_addrs = FALSE; goto next_plat; } - /* plat_address has no match. Now delete_remaining_addrs is TRUE and we will - * delete all the remaining addresses with cur_scope. */ + /* "plat_address" has no match. "delete_remaining_addrs" will be set to TRUE and we will + * delete all the remaining addresses with "cur_scope". */ break; } + delete_remaining_addrs = TRUE; } g_hash_table_add(_plat_addrs_to_delete_ensure(&plat_addrs_to_delete),