From: Roy Marples <roy@marples.name>
Date: Tue, 13 Dec 2016 20:39:30 +0000 (+0000)
Subject: Don't start arping if there is no configuration for it.
X-Git-Tag: v7.0.0-beta1~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ebdae0ceb7ca77bb082ba17854d52a2a22ee3d7;p=thirdparty%2Fdhcpcd.git

Don't start arping if there is no configuration for it.
---

diff --git a/dhcp.c b/dhcp.c
index 02950f81..9e7e5a07 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -2024,7 +2024,7 @@ dhcp_arp_probed(struct arp_state *astate)
 	state = D_STATE(ifp);
 	ifo = ifp->options;
 #ifdef ARPING
-	if (state->arping_index < ifo->arping_len) {
+	if (ifo->arping_len && state->arping_index < ifo->arping_len) {
 		/* We didn't find a profile for this
 		 * address or hwaddr, so move to the next
 		 * arping profile */
@@ -3529,7 +3529,7 @@ dhcp_start1(void *arg)
 	state->offer_len = 0;
 
 #ifdef ARPING
-	if (state->arping_index < ifo->arping_len) {
+	if (ifo->arping_len && state->arping_index < ifo->arping_len) {
 		struct arp_state *astate;
 
 		astate = arp_new(ifp, NULL);