fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-06 12:00:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ndisc: don't update dad_counter for addresses in router config

Browse source 
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 8c6629b356)
(cherry picked from commit 036d1f56ea)
(cherry picked from commit 148c9d9b0c)
This commit is contained in:
Thomas Haller 2018-10-13 17:11:09 +02:00
parent cc16d89395
commit 2c47cf51b1
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ndisc/nm-ndisc.c
View file

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