From 3f814f08e50e6ffbe7d87c20dcc68bbc327cdaa4 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Fri, 23 Jan 2009 01:47:33 +0000
Subject: [dhcp] Clarify language surrounding ProxyDHCP

Remove the lazy assumption that ProxyDHCP == "DHCP with option 60 set
to PXEClient", and explicitly separate the notion of ProxyDHCP from
the notion of packets containing PXE options.
---
 src/include/gpxe/dhcp.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/include')

diff --git a/src/include/gpxe/dhcp.h b/src/include/gpxe/dhcp.h
index c45004cfc..66aa50ac3 100644
--- a/src/include/gpxe/dhcp.h
+++ b/src/include/gpxe/dhcp.h
@@ -25,8 +25,8 @@ struct dhcp_pxe_boot_menu_item;
 /** BOOTP/DHCP client port */
 #define BOOTPC_PORT 68
 
-/** ProxyDHCP server port */
-#define PROXYDHCP_PORT 4011
+/** PXE server port */
+#define PXE_PORT 4011
 
 /** Construct a tag value for an encapsulated option
  *
@@ -207,12 +207,12 @@ struct dhcp_pxe_boot_menu_item;
  *
  */
 
-/** Ignore ProxyDHCP
+/** Skip PXE DHCP protocol extensions such as ProxyDHCP
  *
  * If set to a non-zero value, gPXE will not wait for ProxyDHCP offers
- * and will ignore any ProxyDHCP offers that it receives.
+ * and will ignore any PXE-specific DHCP offers that it receives.
  */
-#define DHCP_EB_NO_PROXYDHCP DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xb0 )
+#define DHCP_EB_NO_PXEDHCP DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xb0 )
 
 /** Network device descriptor
  *
-- 
cgit v1.2.3-55-g7522