From 036d1f56ea3321056237251cda66e412f7826e7b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 13 Oct 2018 17:11:09 +0200 Subject: [PATCH] ndisc: don't update dad_counter for addresses in router config I am not sure, we ever call complete_address() for router-configurations. Maybe not, so the dad-counter is never incremented and does not matter either. If we however do, then we certainly want to preserve the DAD counter when the address is already tracked. (cherry picked from commit 8c6629b356039e2b2bbb87574755dad298cb0615) --- src/ndisc/nm-ndisc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ndisc/nm-ndisc.c b/src/ndisc/nm-ndisc.c index 684fd78b4b..1dd8398c75 100644 --- a/src/ndisc/nm-ndisc.c +++ b/src/ndisc/nm-ndisc.c @@ -507,11 +507,9 @@ nm_ndisc_add_address (NMNDisc *ndisc, } if ( get_expiry (existing) == get_expiry (new) - && get_expiry_preferred (existing) == get_expiry_preferred (new) - && existing->dad_counter == new->dad_counter) + && get_expiry_preferred (existing) == get_expiry_preferred (new)) return FALSE; - existing->dad_counter = new->dad_counter; existing->timestamp = new->timestamp; existing->lifetime = new->lifetime; existing->preferred = new->preferred;