From: Michael Brown <mcb30@etherboot.org>
Date: Thu, 16 Mar 2006 17:31:29 +0000 (+0000)
Subject: Merge from Etherboot 5.4
X-Git-Tag: v0.9.3~1572
X-Git-Url: http://git.etherboot.org/people/lynusvaz/gpxe.git/commitdiff_plain/9c8a69b673149c209746732a0dc6c001083dba49?hp=9b320c1ca42100bede3f553b6646ca6391bedaa3

Merge from Etherboot 5.4
---

diff --git a/src/include/etherboot.h b/src/include/etherboot.h
index 83f117ef..b9546c04 100644
--- a/src/include/etherboot.h
+++ b/src/include/etherboot.h
@@ -159,7 +159,7 @@ struct arptable_t {
 	uint8_t node[6];
 } PACKED;
 
-#define	KERNEL_BUF	(BOOTP_DATA_ADDR->bootp_reply.bp_file)
+#define	KERNEL_BUF	(bootp_data.bootp_reply.bp_file)
 
 #define	FLOPPY_BOOT_LOCATION	0x7c00
 
@@ -282,6 +282,8 @@ External variables
 extern struct rom_info rom;
 extern char *hostname;
 extern int hostnamelen;
+extern unsigned char *addparam;
+extern int addparamlen;
 extern jmp_buf restart_etherboot;
 extern int url_port;
 extern struct arptable_t arptable[MAX_ARP];