From: Michael Brown <mcb30@etherboot.org>
Date: Wed, 13 Aug 2008 20:51:53 +0000 (+0100)
Subject: [dhcp] Do not restrict minimum retry time for ProxyDHCPREQUEST
X-Git-Tag: v0.9.4~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1d0f6ed2e8ad7c04615db405cffb3eec4ae139a;p=thirdparty%2Fipxe.git

[dhcp] Do not restrict minimum retry time for ProxyDHCPREQUEST

The ProxyDHCPREQUEST is a unicast packet, so the first request will
almost always be lost due to not having the IP address in the ARP
cache.  If the minimum retry time is set to one second (as per commit
ff2b6a5), then ProxyDHCP will time out and give up before managing to
successfully transmit a request.

The DHCP timers need to be reworked anyway, so this mild hack is
acceptable for now.
---

diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c
index 149bdfb58..5fcd56ea4 100644
--- a/src/net/udp/dhcp.c
+++ b/src/net/udp/dhcp.c
@@ -818,6 +818,7 @@ static void dhcp_rx_dhcpack ( struct dhcp_session *dhcp,
 
 	/* If we have a ProxyDHCPOFFER, transition to PROXYDHCPREQUEST */
 	if ( dhcp->proxydhcpoffer ) {
+		dhcp->timer.min_timeout = 0;
 		dhcp_set_state ( dhcp, DHCP_STATE_PROXYREQUEST );
 		return;
 	}