From: Roy Marples <roy@marples.name>
Date: Mon, 3 Oct 2016 16:42:55 +0000 (+0000)
Subject: Don't re-enter the discover phase on receipt of an invalid offer if we are already... 
X-Git-Tag: v6.11.4~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fccb8e04e2e5c73048f4532bb55b91082e4f5d73;p=thirdparty%2Fdhcpcd.git

Don't re-enter the discover phase on receipt of an invalid offer if we are already in the discover phase.
---

diff --git a/dhcp6.c b/dhcp6.c
index 1042939e..b00ae334 100644
--- a/dhcp6.c
+++ b/dhcp6.c
@@ -2923,7 +2923,8 @@ dhcp6_handledata(void *arg)
 				/* PD doesn't use CONFIRM, so REBIND could
 				 * throw up an invalid prefix if we
 				 * changed link */
-				if (dhcp6_hasprefixdelegation(ifp))
+				if (state->state != DH6S_DISCOVER &&
+				    dhcp6_hasprefixdelegation(ifp))
 					dhcp6_startdiscover(ifp);
 #endif
 				return;