From ee4206a8a76c6d73c014f2261d4e7a1e093a40a8 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 23 Mar 2008 21:58:05 +0000 Subject: [DHCP] Fix up fake-packet creation as used by PXENV_GET_CACHED_INFO Add dedicated functions create_dhcpdiscover(), create_dhcpack() and create_proxydhcpack() for use by external code such as the PXE preboot code. Register ProxyDHCP options under the global scope "proxydhcp". Unregister previously-acquired DHCP and ProxyDHCP settings when DHCP succeeds. --- src/arch/i386/image/nbi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/arch') diff --git a/src/arch/i386/image/nbi.c b/src/arch/i386/image/nbi.c index d167755ef..79dc8d1a1 100644 --- a/src/arch/i386/image/nbi.c +++ b/src/arch/i386/image/nbi.c @@ -390,7 +390,6 @@ static struct net_device * guess_boot_netdev ( void ) { * @ret rc Return status code */ static int nbi_prepare_dhcp ( struct image *image ) { - struct dhcp_packet dhcppkt; struct net_device *boot_netdev; int rc; @@ -401,9 +400,8 @@ static int nbi_prepare_dhcp ( struct image *image ) { return -ENODEV; } - if ( ( rc = create_dhcp_response ( &dhcppkt, boot_netdev, DHCPACK, - NULL, basemem_packet, - sizeof ( basemem_packet ) ) ) != 0){ + if ( ( rc = create_dhcpack ( boot_netdev, basemem_packet, + sizeof ( basemem_packet ) ) ) != 0 ) { DBGC ( image, "NBI %p failed to build DHCP packet\n", image ); return rc; } -- cgit v1.2.3-55-g7522