Merge from Etherboot 5.4

This commit is contained in:
Michael Brown
2006-03-16 17:40:55 +00:00
5 changed files with 60 additions and 16 deletions

View File

@@ -99,7 +99,7 @@ PXENV_EXIT_t pxenv_get_cached_info ( struct s_PXENV_GET_CACHED_INFO
memcpy ( cached_info->bootfile, KERNEL_BUF,
sizeof(cached_info->bootfile) );
/* Copy DHCP vendor options */
memcpy ( &cached_info->vendor.d, BOOTP_DATA_ADDR->bootp_reply.bp_vend,
memcpy ( &cached_info->vendor.d, bootp_data.bootp_reply.bp_vend,
sizeof(cached_info->vendor.d) );
/* Copy to user-specified buffer, or set pointer to our buffer */