From 75dce340624dba5e4a79b2e5b2dbe943bae0d0e9 Mon Sep 17 00:00:00 2001 From: sfu5 Date: Wed, 17 Oct 2012 08:23:41 +0000 Subject: =?UTF-8?q?1.=20Fix=20a=20bug=20in=20PXE=20driver=20that=20the=20P?= =?UTF-8?q?XE=20boot=20do=20not=20restart=20if=20a=20new=20boot=20option?= =?UTF-8?q?=20on=20the=20different=20IP=20stack=20is=20selected.=202.=20Re?= =?UTF-8?q?trieve=20the=20IP=20information=20after=20iSCSI=20TCPv6=20conne?= =?UTF-8?q?ction=20established=20and=20fill=20it=20into=20iBFT=20table.=20?= =?UTF-8?q?3.=20Generate=20a=20random=20IAID=20for=20each=20NIC=20port=20t?= =?UTF-8?q?o=20require=20different=20IPv6=20address=20in=20PXE=20driver.?= =?UTF-8?q?=204.=20Update=20function=20EfiMtftp6Configure()=20and=20Mtftp6?= =?UTF-8?q?RrqHandleOack()=20to=20allocate=20at=20most=20one=20UdpIo.=205.?= =?UTF-8?q?=20Fix=20a=20typo=20from=20=E2=80=9Cdestory=E2=80=9D=20to=20?= =?UTF-8?q?=E2=80=9Cdestroy=E2=80=9D=20in=20network=20code.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fu Siyuan Reviewed-by: Ye Ting Reviewed-by: Ouyang Qian git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13859 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/Network/Dhcp4Dxe/Dhcp4Driver.c | 26 +++++++++++----------- .../Universal/Network/Dhcp4Dxe/Dhcp4Impl.h | 14 ++++++------ MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c | 6 ++--- 3 files changed, 23 insertions(+), 23 deletions(-) (limited to 'MdeModulePkg/Universal/Network/Dhcp4Dxe') diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c index cd4fbbd196..8a773d9461 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -146,11 +146,11 @@ DhcpConfigUdpIo ( /** - Destory the DHCP service. The Dhcp4 service may be partly initialized, + Destroy the DHCP service. The Dhcp4 service may be partly initialized, or partly destroyed. If a resource is destroyed, it is marked as so in case the destroy failed and being called again later. - @param[in] DhcpSb The DHCP service instance to destory. + @param[in] DhcpSb The DHCP service instance to destroy. @retval EFI_SUCCESS Always return success. @@ -212,7 +212,7 @@ Dhcp4CreateService ( DhcpSb->Signature = DHCP_SERVICE_SIGNATURE; DhcpSb->ServiceState = DHCP_UNCONFIGED; - DhcpSb->InDestory = FALSE; + DhcpSb->InDestroy = FALSE; DhcpSb->Controller = Controller; DhcpSb->Image = ImageHandle; InitializeListHead (&DhcpSb->Children); @@ -414,7 +414,7 @@ Dhcp4DriverBindingStop ( DhcpSb = DHCP_SERVICE_FROM_THIS (ServiceBinding); - if (DhcpSb->InDestory) { + if (DhcpSb->InDestroy) { return EFI_SUCCESS; } @@ -422,8 +422,8 @@ Dhcp4DriverBindingStop ( if (NumberOfChildren == 0) { - DhcpSb->InDestory = TRUE; - DhcpSb->ServiceState = DHCP_DESTORY; + DhcpSb->InDestroy = TRUE; + DhcpSb->ServiceState = DHCP_DESTROY; gBS->UninstallProtocolInterface ( NicHandle, @@ -436,7 +436,7 @@ Dhcp4DriverBindingStop ( FreePool (DhcpSb); } else { // - // Don't use NET_LIST_FOR_EACH_SAFE here, Dhcp4ServiceBindingDestoryChild + // Don't use NET_LIST_FOR_EACH_SAFE here, Dhcp4ServiceBindingDestroyChild // may cause other child to be deleted. // while (!IsListEmpty (&DhcpSb->Children)) { @@ -473,7 +473,7 @@ DhcpInitProtocol ( InitializeListHead (&Instance->Link); Instance->Handle = NULL; Instance->Service = DhcpSb; - Instance->InDestory = FALSE; + Instance->InDestroy = FALSE; Instance->CompletionEvent = NULL; Instance->RenewRebindEvent = NULL; Instance->Token = NULL; @@ -640,15 +640,15 @@ Dhcp4ServiceBindingDestroyChild ( // // A child can be destroyed more than once. For example, // Dhcp4DriverBindingStop will destroy all of its children. - // when caller driver is being stopped, it will destory the + // when caller driver is being stopped, it will destroy the // dhcp child it opens. // - if (Instance->InDestory) { + if (Instance->InDestroy) { return EFI_SUCCESS; } OldTpl = gBS->RaiseTPL (TPL_CALLBACK); - Instance->InDestory = TRUE; + Instance->InDestroy = TRUE; // // Close the Udp4 protocol. @@ -670,7 +670,7 @@ Dhcp4ServiceBindingDestroyChild ( ); if (EFI_ERROR (Status)) { - Instance->InDestory = FALSE; + Instance->InDestroy = FALSE; gBS->RestoreTPL (OldTpl); return Status; diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h index 438f4cddf7..08faff0206 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h @@ -6,7 +6,7 @@ RFC 1534: Interoperation Between DHCP and BOOTP RFC 3396: Encoding Long Options in DHCP. -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -48,12 +48,12 @@ typedef struct _DHCP_PROTOCOL DHCP_PROTOCOL; // The state of the DHCP service. It starts as UNCONFIGED. If // and active child configures the service successfully, it // goes to CONFIGED. If the active child configures NULL, it -// goes back to UNCONFIGED. It becomes DESTORY if it is (partly) -// destoried. +// goes back to UNCONFIGED. It becomes DESTROY if it is (partly) +// destroyed. // #define DHCP_UNCONFIGED 0 #define DHCP_CONFIGED 1 -#define DHCP_DESTORY 2 +#define DHCP_DESTROY 2 struct _DHCP_PROTOCOL { @@ -63,7 +63,7 @@ struct _DHCP_PROTOCOL { EFI_HANDLE Handle; DHCP_SERVICE *Service; - BOOLEAN InDestory; + BOOLEAN InDestroy; EFI_EVENT CompletionEvent; EFI_EVENT RenewRebindEvent; @@ -83,8 +83,8 @@ struct _DHCP_SERVICE { UINT32 Signature; EFI_SERVICE_BINDING_PROTOCOL ServiceBinding; - INTN ServiceState; // CONFIGED, UNCONFIGED, and DESTORY - BOOLEAN InDestory; + INTN ServiceState; // CONFIGED, UNCONFIGED, and DESTROY + BOOLEAN InDestroy; EFI_HANDLE Controller; EFI_HANDLE Image; diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c index b3ac646446..19ad101d54 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c @@ -1,7 +1,7 @@ /** @file EFI DHCP protocol implementation. -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -972,11 +972,11 @@ DhcpInput ( DhcpSb = (DHCP_SERVICE *) Context; // - // Don't restart receive if error occurs or DHCP is destoried. + // Don't restart receive if error occurs or DHCP is destroyed. // if (EFI_ERROR (IoStatus)) { return ; - } else if (DhcpSb->ServiceState == DHCP_DESTORY) { + } else if (DhcpSb->ServiceState == DHCP_DESTROY) { NetbufFree (UdpPacket); return ; } -- cgit v1.2.3