Revision: 14230
http://edk2.svn.sourceforge.net/edk2/?rev=14230&view=rev
Author: vanjeff
Date: 2013-04-01 06:05:46 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
Sync patches part of r13859, r13885 and r13940 from main trunk.
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.
6. Fix issue that ifconfig -c cannot clear IP address details.
Revision Links:
--------------
http://edk2.svn.sourceforge.net/edk2/?rev=13859&view=rev
http://edk2.svn.sourceforge.net/edk2/?rev=13885&view=rev
http://edk2.svn.sourceforge.net/edk2/?rev=13940&view=rev
Modified Paths:
--------------
branches/UDK2010.SR1/MdeModulePkg/Include/Library/UdpIoLib.h
branches/UDK2010.SR1/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
branches/UDK2010.SR1/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
branches/UDK2010.SR1/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c
branches/UDK2010.SR1/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c
Modified: branches/UDK2010.SR1/MdeModulePkg/Include/Library/UdpIoLib.h
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Include/Library/UdpIoLib.h
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Include/Library/UdpIoLib.h
2013-04-01 06:05:46 UTC (rev 14230)
@@ -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 @@
UINT8 UdpVersion;
//
- // Handle used to create/destory UDP child
+ // Handle used to create/destroy UDP child
//
EFI_HANDLE Controller;
EFI_HANDLE Image;
Modified: branches/UDK2010.SR1/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -1940,7 +1940,7 @@
/**
- 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.
@@ -1949,10 +1949,10 @@
@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
@@ -1986,7 +1986,7 @@
}
//
- // destory the child
+ // destroy the child
//
Status = Service->DestroyChild (Service, ChildHandle);
return Status;
Modified: branches/UDK2010.SR1/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -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 @@
}
//
- // Close then destory the Udp4 child
+ // Close then destroy the Udp4 child
//
gBS->CloseProtocol (
UdpIo->UdpHandle,
@@ -827,7 +827,7 @@
}
//
- // Close then destory the Udp6 child
+ // Close then destroy the Udp6 child
//
gBS->CloseProtocol (
UdpIo->UdpHandle,
Modified:
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -146,11 +146,11 @@
/**
- 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.
@@ -466,7 +466,7 @@
//
// Destroy the service itself if no child instance left.
//
- DhcpSb->ServiceState = DHCP_DESTORY;
+ DhcpSb->ServiceState = DHCP_DESTROY;
gBS->UninstallProtocolInterface (
NicHandle,
@@ -507,7 +507,7 @@
InitializeListHead (&Instance->Link);
Instance->Handle = NULL;
Instance->Service = DhcpSb;
- Instance->InDestory = FALSE;
+ Instance->InDestroy = FALSE;
Instance->CompletionEvent = NULL;
Instance->RenewRebindEvent = NULL;
Instance->Token = NULL;
@@ -674,15 +674,15 @@
//
// 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.
@@ -705,7 +705,7 @@
);
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
if (EFI_ERROR (Status)) {
- Instance->InDestory = FALSE;
+ Instance->InDestroy = FALSE;
gBS->RestoreTPL (OldTpl);
return Status;
Modified:
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
2013-04-01 06:05:46 UTC (rev 14230)
@@ -48,12 +48,12 @@
// 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 @@
EFI_HANDLE Handle;
DHCP_SERVICE *Service;
- BOOLEAN InDestory;
+ BOOLEAN InDestroy;
EFI_EVENT CompletionEvent;
EFI_EVENT RenewRebindEvent;
@@ -83,7 +83,7 @@
UINT32 Signature;
EFI_SERVICE_BINDING_PROTOCOL ServiceBinding;
- INTN ServiceState; // CONFIGED, UNCONFIGED, and
DESTORY
+ INTN ServiceState; // CONFIGED, UNCONFIGED, and
DESTROY
EFI_HANDLE Controller;
EFI_HANDLE Image;
Modified: branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -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 @@
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 ;
}
Modified:
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
===================================================================
---
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
2013-04-01 03:43:40 UTC (rev 14229)
+++
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -1,7 +1,7 @@
/** @file
This code implements the IP4Config and NicIp4Config protocols.
-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<BR>
@@ -125,6 +125,15 @@
// Signal the IP4 to run the auto configuration again
//
if (Reconfig && (Instance->ReconfigEvent != NULL)) {
+ //
+ // When NicConfig is NULL, NIC IP4 configuration parameter is removed,
+ // the auto configuration process should stop running the configuration
+ // policy for the EFI IPv4 Protocol driver.
+ //
+ if (NicConfig == NULL) {
+ Instance->DoNotStart = TRUE;
+ }
+
Status = gBS->SignalEvent (Instance->ReconfigEvent);
DispatchDpc ();
}
@@ -344,6 +353,12 @@
Instance->NicConfig = EfiNicIp4ConfigGetInfo (Instance);
if (Instance->NicConfig == NULL) {
+ if (Instance->DoNotStart) {
+ Instance->DoNotStart = FALSE;
+ Status = EFI_SUCCESS;
+ goto ON_EXIT;
+ }
+
Source = IP4_CONFIG_SOURCE_DHCP;
} else {
Source = Instance->NicConfig->Source;
Modified:
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
===================================================================
---
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
2013-04-01 03:43:40 UTC (rev 14229)
+++
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
2013-04-01 06:05:46 UTC (rev 14230)
@@ -1,7 +1,7 @@
/** @file
Header file for IP4Config driver.
-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<BR>
@@ -137,7 +137,12 @@
//
// Underlying media present status.
//
- BOOLEAN MediaPresent;
+ BOOLEAN MediaPresent;
+
+ //
+ // A flag to indicate EfiIp4ConfigStart should not run
+ //
+ BOOLEAN DoNotStart;
} IP4_CONFIG_INSTANCE;
#define IP4_CONFIG_INSTANCE_FROM_IP4CONFIG(this) \
Modified:
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
===================================================================
---
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
2013-04-01 03:43:40 UTC (rev 14229)
+++
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -79,7 +79,8 @@
NULL,
NULL,
NULL,
- TRUE
+ TRUE,
+ FALSE
};
/**
Modified:
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
===================================================================
---
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
2013-04-01 03:43:40 UTC (rev 14229)
+++
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -1,7 +1,7 @@
/** @file
Helper functions for configuring or getting the parameters relating to Ip4.
-Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 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
Modified: branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -118,7 +118,7 @@
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
@@ -314,7 +314,7 @@
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
@@ -611,7 +611,7 @@
}
IpSb = IP4_SERVICE_FROM_PROTOCOL (ServiceBinding);
- if (IpSb->Ip4Config != NULL && (IpSb->State != IP4_SERVICE_DESTORY)) {
+ if (IpSb->Ip4Config != NULL && (IpSb->State != IP4_SERVICE_DESTROY)) {
IpSb->Ip4Config->Stop (IpSb->Ip4Config);
@@ -683,7 +683,7 @@
);
} else if (IsListEmpty (&IpSb->Children)) {
State = IpSb->State;
- IpSb->State = IP4_SERVICE_DESTORY;
+ IpSb->State = IP4_SERVICE_DESTROY;
//
// Clear the variable data.
@@ -886,18 +886,18 @@
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.
Modified: branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -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 @@
}
//
- // 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);
Modified: branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
2013-04-01 06:05:46 UTC (rev 14230)
@@ -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 @@
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;
Modified: branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -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
@@ -1271,7 +1271,7 @@
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.
Modified: branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
2013-04-01 06:05:46 UTC (rev 14230)
@@ -51,23 +51,23 @@
//
// 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
///
Modified: branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -845,7 +845,7 @@
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;
}
Modified:
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
===================================================================
---
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
2013-04-01 03:43:40 UTC (rev 14229)
+++
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -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
@@ -611,14 +611,14 @@
/**
- 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.
**/
@@ -662,11 +662,11 @@
return EFI_INVALID_PARAMETER;
}
- if (Instance->InDestory) {
+ if (Instance->InDestroy) {
return EFI_SUCCESS;
}
- Instance->InDestory = TRUE;
+ Instance->InDestroy = TRUE;
//
// Close the Udp4 protocol.
@@ -704,7 +704,7 @@
);
if (EFI_ERROR (Status)) {
- Instance->InDestory = FALSE;
+ Instance->InDestroy = FALSE;
return Status;
}
Modified:
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h
===================================================================
---
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h
2013-04-01 03:43:40 UTC (rev 14229)
+++
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.h
2013-04-01 06:05:46 UTC (rev 14230)
@@ -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
@@ -114,14 +114,14 @@
);
/**
- 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.
**/
Modified:
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -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
@@ -1079,7 +1079,7 @@
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;
}
Modified:
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
2013-04-01 06:05:46 UTC (rev 14230)
@@ -60,7 +60,7 @@
#define MTFTP4_STATE_UNCONFIGED 0
#define MTFTP4_STATE_CONFIGED 1
-#define MTFTP4_STATE_DESTORY 2
+#define MTFTP4_STATE_DESTROY 2
///
/// Mtftp service block
@@ -98,7 +98,7 @@
EFI_MTFTP4_PROTOCOL Mtftp4;
INTN State;
- BOOLEAN InDestory;
+ BOOLEAN InDestroy;
MTFTP4_SERVICE *Service;
EFI_HANDLE Handle;
Modified: branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -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 @@
}
//
- // 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 @@
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)
);
Modified:
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -131,7 +131,7 @@
/**
- 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.
Modified: branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
===================================================================
--- branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
2013-04-01 06:05:46 UTC (rev 14230)
@@ -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
@@ -724,7 +724,7 @@
);
/**
- 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.
Modified:
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
===================================================================
---
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
2013-04-01 03:43:40 UTC (rev 14229)
+++
branches/UDK2010.SR1/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -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 @@
(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]));
Modified:
branches/UDK2010.SR1/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c
===================================================================
---
branches/UDK2010.SR1/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c
2013-04-01 03:43:40 UTC (rev 14229)
+++
branches/UDK2010.SR1/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -1042,7 +1042,7 @@
}
/**
- Create an IP child, use it to start the auto configuration, then destory it.
+ Create an IP child, use it to start the auto configuration, then destroy it.
@param[in] NicInfo The pointer to the NIC_INFO of the Nic to be
configured.
Modified:
branches/UDK2010.SR1/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c
===================================================================
--- branches/UDK2010.SR1/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c
2013-04-01 03:43:40 UTC (rev 14229)
+++ branches/UDK2010.SR1/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c
2013-04-01 06:05:46 UTC (rev 14230)
@@ -1,7 +1,7 @@
/** @file
The implementation for Ping shell command.
- Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 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
@@ -1190,14 +1190,14 @@
}
/**
- Destory the IP instance.
+ Destroy the IP instance.
@param[in] Private The pointer of PING_PRIVATE_DATA.
**/
VOID
EFIAPI
-Ping6DestoryIp6Instance (
+Ping6DestroyIp6Instance (
IN PING_PRIVATE_DATA *Private
)
{
@@ -1414,7 +1414,7 @@
}
if (Private->IpChildHandle != NULL) {
- Ping6DestoryIp6Instance (Private);
+ Ping6DestroyIp6Instance (Private);
}
FreePool (Private);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Own the Future-Intel® Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game
on Steam. $5K grand prize plus 10 genre and skill prizes.
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
