From 94643d7e43d2f93c3b94e9b57d99e7cf27846470 Mon Sep 17 00:00:00 2001 From: Jan Vaclav Date: Thu, 9 Nov 2023 13:24:34 +0100 Subject: [PATCH] ndisc: remove redundant DAD logging The log message here is not needed anymore, as the conflict is already logged by nm-device. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1787 --- src/core/ndisc/nm-ndisc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/core/ndisc/nm-ndisc.c b/src/core/ndisc/nm-ndisc.c index 20dd21212..c8f7ed0c0 100644 --- a/src/core/ndisc/nm-ndisc.c +++ b/src/core/ndisc/nm-ndisc.c @@ -1293,10 +1293,8 @@ nm_ndisc_dad_failed(NMNDisc *ndisc, GArray *addresses, gboolean emit_changed_sig NMNDiscAddress *item = &nm_g_array_index(rdata->addresses, NMNDiscAddress, j); if (IN6_ARE_ADDR_EQUAL(&item->address, addr)) { - char sbuf[NM_INET_ADDRSTRLEN]; - - _LOGI("DAD failed for discovered address %s", nm_inet6_ntop(addr, sbuf)); changed = TRUE; + if (!complete_address(ndisc, item)) { g_array_remove_index(rdata->addresses, j); continue;