Index: etherboot-5.4.3/src/core/nic.c
===================================================================
--- etherboot-5.4.3.orig/src/core/nic.c	2008-07-31 12:32:12.000000000 -0700
+++ etherboot-5.4.3/src/core/nic.c	2008-07-31 12:32:16.000000000 -0700
@@ -93,7 +93,7 @@
 static const unsigned char dhcpdiscover[] = {
 	RFC2132_MSG_TYPE,1,DHCPDISCOVER,
 	RFC2132_MAX_SIZE,2,	/* request as much as we can */
-	ETH_MAX_MTU / 256, ETH_MAX_MTU % 256,
+	1260 / 256, 1260 % 256,
 #ifdef PXE_DHCP_STRICT
 	RFC3679_PXE_CLIENT_UUID,RFC3679_PXE_CLIENT_UUID_LENGTH,RFC3679_PXE_CLIENT_UUID_DEFAULT,
 	RFC3679_PXE_CLIENT_ARCH,RFC3679_PXE_CLIENT_ARCH_LENGTH,RFC3679_PXE_CLIENT_ARCH_IAX86PC,
@@ -151,7 +151,7 @@
 	RFC2132_SRV_ID,4,0,0,0,0,
 	RFC2132_REQ_ADDR,4,0,0,0,0,
 	RFC2132_MAX_SIZE,2,	/* request as much as we can */
-	ETH_MAX_MTU / 256, ETH_MAX_MTU % 256,
+	1260 / 256, 1260 % 256,
 #ifdef PXE_DHCP_STRICT
 	RFC3679_PXE_CLIENT_UUID,RFC3679_PXE_CLIENT_UUID_LENGTH,RFC3679_PXE_CLIENT_UUID_DEFAULT,
 	RFC3679_PXE_CLIENT_ARCH,RFC3679_PXE_CLIENT_ARCH_LENGTH,RFC3679_PXE_CLIENT_ARCH_IAX86PC,
@@ -236,7 +236,7 @@
 static const unsigned char proxydhcprequest [] = {
 	RFC2132_MSG_TYPE,1,DHCPREQUEST,
 	RFC2132_MAX_SIZE,2,	/* request as much as we can */
-	ETH_MAX_MTU / 256, ETH_MAX_MTU % 256,
+	1260 / 256, 1260 % 256,
 #ifdef	PXE_DHCP_STRICT
 	RFC3679_PXE_CLIENT_UUID,RFC3679_PXE_CLIENT_UUID_LENGTH,RFC3679_PXE_CLIENT_UUID_DEFAULT,
 	RFC3679_PXE_CLIENT_ARCH,RFC3679_PXE_CLIENT_ARCH_LENGTH,RFC3679_PXE_CLIENT_ARCH_IAX86PC,
@@ -1344,6 +1344,8 @@
 				/* Construct the ProxyDHCPREQUEST packet */
 				memcpy(ip.bp.bp_vend, rfc1533_cookie, sizeof rfc1533_cookie);
 				memcpy(ip.bp.bp_vend + sizeof rfc1533_cookie, proxydhcprequest, sizeof proxydhcprequest);
+				bp_vend = ip.bp.bp_vend + sizeof rfc1533_cookie + sizeof proxydhcprequest;
+				*bp_vend++ = RFC1533_END;
 				for (reqretry = 0; reqretry < MAX_BOOTP_RETRIES; ) {
 					printf ( "\nSending ProxyDHCP request to %@...", arptable[ARP_PROXYDHCP].ipaddr.s_addr);
 					udp_transmit(arptable[ARP_PROXYDHCP].ipaddr.s_addr, BOOTP_CLIENT, PROXYDHCP_SERVER,
