From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 23 May 2016 16:07:51 +0000 (+0200)
Subject: ipv4acd: in case the state engine is reused, reset n_conflict timer to 0
X-Git-Tag: v231~247^2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d63458452dabeb59665c316693df07e90b9a9395;p=thirdparty%2Fsystemd.git

ipv4acd: in case the state engine is reused, reset n_conflict timer to 0
---

diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c
index 12003fb796c..99505181a47 100644
--- a/src/libsystemd-network/sd-ipv4acd.c
+++ b/src/libsystemd-network/sd-ipv4acd.c
@@ -507,6 +507,7 @@ int sd_ipv4acd_start(sd_ipv4acd *ll) {
         safe_close(ll->fd);
         ll->fd = r;
         ll->defend_window = 0;
+        ll->n_conflict = 0;
 
         r = sd_event_add_io(ll->event, &ll->receive_message_event_source, ll->fd, EPOLLIN, ipv4acd_on_packet, ll);
         if (r < 0)