1. Fix a bug in PXE driver that the PXE boot do not restart if a new boot option on the different IP stack is selected.

2. Retrieve the IP information after iSCSI TCPv6 connection established and fill it into iBFT table.
3. Generate a random IAID for each NIC port to require different IPv6 address in PXE driver.
4. Update function EfiMtftp6Configure() and Mtftp6RrqHandleOack() to allocate at most one UdpIo.
5. Fix a typo from “destory” to “destroy” in network code.

Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Ouyang Qian <qian.ouyang@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13859 6f19259b-4bc3-4df7-8a09-765794883524

20 files changed, 96 insertions, 96 deletions

diff --git a/MdeModulePkg/Include/Library/UdpIoLib.h b/MdeModulePkg/Include/Library/UdpIoLib.h
index 32d61e5..e0b44ce 100644
--- a/MdeModulePkg/Include/Library/UdpIoLib.h
+++ b/MdeModulePkg/Include/Library/UdpIoLib.h
@@ -2,7 +2,7 @@
   This library is used to share code between UEFI network stack modules.

   It provides the helper routines to access UDP service. It is used by both DHCP and MTFTP.

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 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<BR>

@@ -137,7 +137,7 @@ struct _UDP_IO {
   UINT8                     UdpVersion;

 

   //

-  // Handle used to create/destory UDP child

+  // Handle used to create/destroy UDP child

   //

   EFI_HANDLE                Controller;

   EFI_HANDLE                Image;

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index f74dcda..956f733 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -1829,7 +1829,7 @@ NetLibCreateServiceChild (
 

 

 /**

-  Destory a child of the service that is identified by ServiceBindingGuid.

+  Destroy a child of the service that is identified by ServiceBindingGuid.

 

   Get the ServiceBinding Protocol first, then use it to destroy a child.

 

@@ -1838,10 +1838,10 @@ NetLibCreateServiceChild (
   @param[in]   Controller            The controller which has the service installed.

   @param[in]   Image                 The image handle used to open service.

   @param[in]   ServiceBindingGuid    The service's Guid.

-  @param[in]   ChildHandle           The child to destory.

+  @param[in]   ChildHandle           The child to destroy.

 

-  @retval EFI_SUCCESS           The child is successfully destoried.

-  @retval Others                Failed to destory the child.

+  @retval EFI_SUCCESS           The child is successfully destroyed.

+  @retval Others                Failed to destroy the child.

 

 **/

 EFI_STATUS

@@ -1875,7 +1875,7 @@ NetLibDestroyServiceChild (
   }

 

   //

-  // destory the child

+  // destroy the child

   //

   Status = Service->DestroyChild (Service, ChildHandle);

   return Status;

diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
index bb39559..e1d72f3 100644
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
+++ b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
@@ -1,7 +1,7 @@
 /** @file

   Help functions to access UDP service, it is used by both the DHCP and MTFTP.

 

-Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

 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<BR>

@@ -804,7 +804,7 @@ UdpIoFreeIo (
     }

 

     //

-    // Close then destory the Udp4 child

+    // Close then destroy the Udp4 child

     //

     gBS->CloseProtocol (

            UdpIo->UdpHandle,

@@ -827,7 +827,7 @@ UdpIoFreeIo (
     }

 

     //

-    // Close then destory the Udp6 child

+    // Close then destroy the Udp6 child

     //

     gBS->CloseProtocol (

            UdpIo->UdpHandle,

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
index cd4fbbd..8a773d9 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.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 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 438f4cd..08faff0 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.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 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 b3ac646..19ad101 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.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 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 ;

   }

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
index 2d69dcf..4ce85a3 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
@@ -1,7 +1,7 @@
 /** @file

   The driver binding and service binding protocol for IP4 driver.

 

-Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -118,7 +118,7 @@ Ip4DriverBindingSupported (
   Clean up a IP4 service binding instance. It will release all

   the resource allocated by the instance. The instance may be

   partly initialized, or partly destroyed. If a resource is

-  destroyed, it is marked as that in case the destory failed and

+  destroyed, it is marked as that in case the destroy failed and

   being called again later.

 

   @param[in]  IpSb               The IP4 serviceing binding instance to clean up

@@ -176,7 +176,7 @@ Ip4CreateService (
   IpSb->ServiceBinding.CreateChild  = Ip4ServiceBindingCreateChild;

   IpSb->ServiceBinding.DestroyChild = Ip4ServiceBindingDestroyChild;

   IpSb->State                       = IP4_SERVICE_UNSTARTED;

-  IpSb->InDestory                   = FALSE;

+  IpSb->InDestroy                   = FALSE;

 

   IpSb->NumChildren                 = 0;

   InitializeListHead (&IpSb->Children);

@@ -315,7 +315,7 @@ ON_ERROR:
   Clean up a IP4 service binding instance. It will release all

   the resource allocated by the instance. The instance may be

   partly initialized, or partly destroyed. If a resource is

-  destroyed, it is marked as that in case the destory failed and

+  destroyed, it is marked as that in case the destroy failed and

   being called again later.

 

   @param[in]  IpSb               The IP4 serviceing binding instance to clean up

@@ -581,7 +581,7 @@ Ip4DriverBindingStop (
 

     OldTpl = gBS->RaiseTPL (TPL_CALLBACK);

 

-    if (IpSb->Ip4Config != NULL && (IpSb->State != IP4_SERVICE_DESTORY)) {

+    if (IpSb->Ip4Config != NULL && (IpSb->State != IP4_SERVICE_DESTROY)) {

 

       IpSb->Ip4Config->Stop (IpSb->Ip4Config);

 

@@ -651,7 +651,7 @@ Ip4DriverBindingStop (
 

   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);

 

-  if (IpSb->InDestory) {

+  if (IpSb->InDestroy) {

     gBS->RestoreTPL (OldTpl);

     return EFI_SUCCESS;

   }

@@ -668,10 +668,10 @@ Ip4DriverBindingStop (
       goto ON_ERROR;

     }

 

-    IpSb->InDestory = TRUE;

+    IpSb->InDestroy = TRUE;

 

     State           = IpSb->State;

-    IpSb->State     = IP4_SERVICE_DESTORY;

+    IpSb->State     = IP4_SERVICE_DESTROY;

 

     //

     // Clear the variable data.

@@ -696,10 +696,10 @@ Ip4DriverBindingStop (
 

     FreePool (IpSb);

   } else if (NumberOfChildren == 0) {

-    IpSb->InDestory = TRUE;

+    IpSb->InDestroy = TRUE;

 

     State           = IpSb->State;

-    IpSb->State     = IP4_SERVICE_DESTORY;

+    IpSb->State     = IP4_SERVICE_DESTROY;

 

     //

     // Clear the variable data.

@@ -912,18 +912,18 @@ Ip4ServiceBindingDestroyChild (
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);

 

   //

-  // A child can be destoried more than once. For example,

-  // Ip4DriverBindingStop will destory all of its children.

-  // when UDP driver is being stopped, it will destory all

+  // A child can be destroyed more than once. For example,

+  // Ip4DriverBindingStop will destroy all of its children.

+  // when UDP driver is being stopped, it will destroy all

   // the IP child it opens.

   //

-  if (IpInstance->State == IP4_STATE_DESTORY) {

+  if (IpInstance->State == IP4_STATE_DESTROY) {

     gBS->RestoreTPL (OldTpl);

     return EFI_SUCCESS;

   }

 

   State             = IpInstance->State;

-  IpInstance->State = IP4_STATE_DESTORY;

+  IpInstance->State = IP4_STATE_DESTROY;

 

   //

   // Close the Managed Network protocol.

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index d97ab41..2242441 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
@@ -1,7 +1,7 @@
 /** @file

   Implement IP4 pesudo interface.

   

-Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -745,10 +745,10 @@ Ip4FreeInterface (
   }

 

   //

-  // Destory the interface if this is the last IP instance that

+  // Destroy the interface if this is the last IP instance that

   // has the address. Remove all the system transmitted packets

   // from this interface, cancel the receive request if there is

-  // one, and destory the ARP requests.

+  // one, and destroy the ARP requests.

   //

   Ip4CancelFrames (Interface, EFI_ABORTED, Ip4CancelInstanceFrame, NULL);

   Ip4CancelReceive (Interface);

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
index d35e568..998fb25 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
@@ -1,7 +1,7 @@
 /** @file

   Definition for IP4 pesudo interface structure.

   

-Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -154,7 +154,7 @@ struct _IP4_INTERFACE {
   BOOLEAN                       Configured;

 

   //

-  // Handle used to create/destory ARP child. All the IP children

+  // Handle used to create/destroy ARP child. All the IP children

   // share one MNP which is owned by IP service binding.

   //

   EFI_HANDLE                    Controller;

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
index 2cad1f3..f4ce3ea 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
@@ -1,6 +1,6 @@
 /** @file

 

-Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -1256,7 +1256,7 @@ EfiIp4Configure (
     Status = Ip4CleanProtocol (IpInstance);

 

     //

-    // Don't change the state if it is DESTORY, consider the following

+    // Don't change the state if it is DESTROY, consider the following

     // valid sequence: Mnp is unloaded-->Ip Stopped-->Udp Stopped,

     // Configure (ThisIp, NULL). If the state is changed to UNCONFIGED,

     // the unload fails miserably.

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
index 86e6385..563cf7f 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
@@ -1,7 +1,7 @@
 /** @file

   Ip4 internal functions and type defintions.

   

-Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -50,23 +50,23 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //

 // The state of IP4 protocol. It starts from UNCONFIGED. if it is

 // successfully configured, it goes to CONFIGED. if configure NULL

-// is called, it becomes UNCONFIGED again. If (partly) destoried, it

-// becomes DESTORY.

+// is called, it becomes UNCONFIGED again. If (partly) destroyed, it

+// becomes DESTROY.

 //

 #define IP4_STATE_UNCONFIGED    0

 #define IP4_STATE_CONFIGED      1

-#define IP4_STATE_DESTORY       2

+#define IP4_STATE_DESTROY       2

 

 //

 // The state of IP4 service. It starts from UNSTARTED. It transits

 // to STARTED if autoconfigure is started. If default address is

-// configured, it becomes CONFIGED. and if partly destoried, it goes

-// to DESTORY.

+// configured, it becomes CONFIGED. and if partly destroyed, it goes

+// to DESTROY.

 //

 #define IP4_SERVICE_UNSTARTED   0

 #define IP4_SERVICE_STARTED     1

 #define IP4_SERVICE_CONFIGED    2

-#define IP4_SERVICE_DESTORY     3

+#define IP4_SERVICE_DESTROY     3

 

 

 ///

@@ -160,7 +160,7 @@ struct _IP4_SERVICE {
   UINT32                          Signature;

   EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;

   INTN                            State;

-  BOOLEAN                         InDestory;

+  BOOLEAN                         InDestroy;

 

   //

   // List of all the IP instances and interfaces, and default

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
index 0990d18..bd15fc2 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
@@ -1,7 +1,7 @@
 /** @file

   IP4 input process.

   

-Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -845,7 +845,7 @@ Ip4AccpetFrame (
   IpSb   = (IP4_SERVICE *) Context;

   Option = NULL;

 

-  if (EFI_ERROR (IoStatus) || (IpSb->State == IP4_SERVICE_DESTORY)) {

+  if (EFI_ERROR (IoStatus) || (IpSb->State == IP4_SERVICE_DESTROY)) {

     goto DROP;

   }

 

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
index 1c74b5b..2a12b1d 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
@@ -1,7 +1,7 @@
 /** @file

   Implementation of Mtftp drivers.

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -159,7 +159,7 @@ Mtftp4CreateService (
 

   MtftpSb->Signature      = MTFTP4_SERVICE_SIGNATURE;

   MtftpSb->ServiceBinding = gMtftp4ServiceBindingTemplete;

-  MtftpSb->InDestory      = FALSE;

+  MtftpSb->InDestroy      = FALSE;

   MtftpSb->ChildrenNum    = 0;

   InitializeListHead (&MtftpSb->Children);

 

@@ -374,7 +374,7 @@ Mtftp4DriverBindingStop (
 

   MtftpSb = MTFTP4_SERVICE_FROM_THIS (ServiceBinding);

 

-  if (MtftpSb->InDestory) {

+  if (MtftpSb->InDestroy) {

     return EFI_SUCCESS;

   }

 

@@ -382,7 +382,7 @@ Mtftp4DriverBindingStop (
 

   if (NumberOfChildren == 0) {

 

-    MtftpSb->InDestory = TRUE;

+    MtftpSb->InDestroy = TRUE;

 

     gBS->UninstallProtocolInterface (

            NicHandle,

@@ -429,7 +429,7 @@ Mtftp4InitProtocol (
   InitializeListHead (&Instance->Link);

   CopyMem (&Instance->Mtftp4, &gMtftp4ProtocolTemplate, sizeof (Instance->Mtftp4));

   Instance->State     = MTFTP4_STATE_UNCONFIGED;

-  Instance->InDestory = FALSE;

+  Instance->InDestroy = FALSE;

   Instance->Service   = MtftpSb;

 

   InitializeListHead (&Instance->Blocks);

@@ -548,14 +548,14 @@ ON_ERROR:
 

 

 /**

-  Destory one of the service binding's child.

+  Destroy one of the service binding's child.

 

   @param  This                   The service binding instance

-  @param  ChildHandle            The child handle to destory

+  @param  ChildHandle            The child handle to destroy

 

   @retval EFI_INVALID_PARAMETER  The parameter is invaid.

-  @retval EFI_UNSUPPORTED        The child may have already been destoried.

-  @retval EFI_SUCCESS            The child is destoried and removed from the

+  @retval EFI_UNSUPPORTED        The child may have already been destroyed.

+  @retval EFI_SUCCESS            The child is destroyed and removed from the

                                  parent's child list.

 

 **/

@@ -599,11 +599,11 @@ Mtftp4ServiceBindingDestroyChild (
     return EFI_INVALID_PARAMETER;

   }

 

-  if (Instance->InDestory) {

+  if (Instance->InDestroy) {

     return EFI_SUCCESS;

   }

 

-  Instance->InDestory = TRUE;

+  Instance->InDestroy = TRUE;

 

   //

   // Close the Udp4 protocol.

@@ -625,7 +625,7 @@ Mtftp4ServiceBindingDestroyChild (
                   );

 

   if (EFI_ERROR (Status)) {

-    Instance->InDestory = FALSE;

+    Instance->InDestroy = FALSE;

     return Status;

   }

 

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h
index 392ea51..63828bd 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h
@@ -1,7 +1,7 @@
 /** @file

   Mtftp drivers function header.

   

-Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -113,14 +113,14 @@ Mtftp4ServiceBindingCreateChild (
   );

 

 /**

-  Destory one of the service binding's child.

+  Destroy one of the service binding's child.

 

   @param  This                   The service binding instance

-  @param  ChildHandle            The child handle to destory

+  @param  ChildHandle            The child handle to destroy

 

   @retval EFI_INVALID_PARAMETER  The parameter is invaid.

-  @retval EFI_UNSUPPORTED        The child may have already been destoried.

-  @retval EFI_SUCCESS            The child is destoried and removed from the

+  @retval EFI_UNSUPPORTED        The child may have already been destroyed.

+  @retval EFI_SUCCESS            The child is destroyed and removed from the

                                  parent's child list.

 

 **/

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
index 3c68235..5183e1a 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
@@ -1,7 +1,7 @@
 /** @file

   Interface routine for Mtftp4.

   

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -1073,7 +1073,7 @@ EfiMtftp4Poll (
 

   if (Instance->State == MTFTP4_STATE_UNCONFIGED) {

     return EFI_NOT_STARTED;

-  } else if (Instance->State == MTFTP4_STATE_DESTORY) {

+  } else if (Instance->State == MTFTP4_STATE_DESTROY) {

     return EFI_DEVICE_ERROR;

   }

 

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
index 502fcaa..41f524a 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
@@ -9,7 +9,7 @@
   RFC2348 - TFTP Blocksize Option

   RFC2349 - TFTP Timeout Interval and Transfer Size Options

   

-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -59,7 +59,7 @@ typedef struct _MTFTP4_PROTOCOL MTFTP4_PROTOCOL;
 

 #define MTFTP4_STATE_UNCONFIGED     0

 #define MTFTP4_STATE_CONFIGED       1

-#define MTFTP4_STATE_DESTORY        2

+#define MTFTP4_STATE_DESTROY        2

 

 ///

 /// Mtftp service block

@@ -68,7 +68,7 @@ struct _MTFTP4_SERVICE {
   UINT32                        Signature;

   EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;

 

-  BOOLEAN                       InDestory;

+  BOOLEAN                       InDestroy;

 

   UINT16                        ChildrenNum;

   LIST_ENTRY                    Children;

@@ -99,7 +99,7 @@ struct _MTFTP4_PROTOCOL {
   EFI_MTFTP4_PROTOCOL           Mtftp4;

 

   INTN                          State;

-  BOOLEAN                       InDestory;

+  BOOLEAN                       InDestroy;

 

   MTFTP4_SERVICE                *Service;

   EFI_HANDLE                    Handle;

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
index c627a14..2e31643 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
@@ -1,7 +1,7 @@
 /** @file

   Implementation of the Socket.

 

-Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -739,7 +739,7 @@ SockDestroy (
 

   }

   //

-  // Destory the RcvBuffer Queue and SendBuffer Queue

+  // Destroy the RcvBuffer Queue and SendBuffer Queue

   //

   NetbufQueFree (Sock->RcvBuffer.DataQueue);

   NetbufQueFree (Sock->SndBuffer.DataQueue);

@@ -754,7 +754,7 @@ SockDestroy (
 

     DEBUG (

       (EFI_D_INFO,

-      "SockDestory: Delete a unaccepted socket from parent"

+      "SockDestroy: Delete a unaccepted socket from parent"

       "now conncnt is %d\n",

       Sock->Parent->ConnCnt)

       );

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
index d17bfa8..ac36460 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
@@ -131,7 +131,7 @@ SockBufferToken (
 

 

 /**

-  Destory the socket Sock and its associated protocol control block.

+  Destroy the socket Sock and its associated protocol control block.

 

   @param  Sock                 The socket to be destroyed.

 

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
index 0317efa..b8ace79 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
@@ -1,7 +1,7 @@
 /** @file

   Socket header file.

 

-Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -723,7 +723,7 @@ SockCreateChild (
   );

 

 /**

-  Destory the socket Sock and its associated protocol control block.

+  Destroy the socket Sock and its associated protocol control block.

 

   @param  Sock                 The socket to be destroyed.

 

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
index 5f3d913..fa3594d 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
@@ -1,7 +1,7 @@
 /** @file

   Support for PxeBc dhcp functions.

 

-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -203,7 +203,7 @@ PxeBcParseCachedDhcpPacket (
             (Offer->Dhcp4.Header.BootFileName[0] != 0)) {

     //

     // If the bootfile is not present and bootfilename is present in dhcp packet, just parse it.

-    // And do not count dhcp option header, or else will destory the serverhostname.

+    // And do not count dhcp option header, or else will destroy the serverhostname.

     //

     Options[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] = (EFI_DHCP4_PACKET_OPTION *) (&Offer->Dhcp4.Header.BootFileName[0] -

                                             OFFSET_OF (EFI_DHCP4_PACKET_OPTION, Data[0]));