From b3abf25e3c77abaa6e45c918fe7d1da22e78d850 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Wed, 21 Nov 2007 22:10:04 +0000
Subject: Allow DHCP server to instruct gPXE to ignore ProxyDHCP (which will
 also avoid waiting for ProxyDHCP offers).

Also reduce the ProxyDHCP timeout, because it's already irritating me.
---
 src/include/gpxe/dhcp.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/include')

diff --git a/src/include/gpxe/dhcp.h b/src/include/gpxe/dhcp.h
index c99dd576f..9a9ba7484 100644
--- a/src/include/gpxe/dhcp.h
+++ b/src/include/gpxe/dhcp.h
@@ -183,6 +183,13 @@ struct job_interface;
  *
  */
 
+/** Ignore ProxyDHCP
+ *
+ * If set to a non-zero value, gPXE will not wait for ProxyDHCP offers
+ * and will ignore any ProxyDHCP offers that it receives.
+ */
+#define DHCP_EB_NO_PROXYDHCP DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xb0 )
+
 /** Network device descriptor
  *
  * Byte 0 is the bus type ID; remaining bytes depend on the bus type.
@@ -514,7 +521,7 @@ dhcpopt_put ( struct dhcp_option_block *options ) {
 }
 
 /** Maximum time that we will wait for ProxyDHCP offers */
-#define PROXYDHCP_WAIT_TIME ( TICKS_PER_SEC * 2 )
+#define PROXYDHCP_WAIT_TIME ( TICKS_PER_SEC * 1 )
 
 extern struct list_head dhcp_option_blocks;
 
-- 
cgit v1.2.3-55-g7522