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.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c8a69b673149c209746732a0dc6c001083dba49;p=thirdparty%2Fipxe.git

Merge from Etherboot 5.4
---

9c8a69b673149c209746732a0dc6c001083dba49
diff --cc src/include/etherboot.h
index 83f117efd,e61a711ff..b9546c043
--- a/src/include/etherboot.h
+++ b/src/include/etherboot.h
@@@ -159,7 -145,12 +159,7 @@@ struct arptable_t 
  	uint8_t node[6];
  } PACKED;
  
 -struct igmptable_t {
 -	in_addr group;
 -	unsigned long time;
 -} 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 -288,6 +282,8 @@@ External variable
  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];