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 --- NetworkPkg/Ip6Dxe/Ip6ConfigImpl.c | 6 +++--- NetworkPkg/Ip6Dxe/Ip6ConfigImpl.h | 6 +++--- NetworkPkg/Ip6Dxe/Ip6Driver.c | 8 ++++---- NetworkPkg/Ip6Dxe/Ip6Driver.h | 4 ++-- NetworkPkg/Ip6Dxe/Ip6If.c | 4 ++-- NetworkPkg/Ip6Dxe/Ip6Impl.c | 4 ++-- NetworkPkg/Ip6Dxe/Ip6Nd.c | 4 ++-- NetworkPkg/Ip6Dxe/Ip6Nd.h | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) (limited to 'NetworkPkg/Ip6Dxe') diff --git a/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.c b/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.c index 8b389772d9..b9840444bb 100644 --- a/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.c +++ b/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.c @@ -1,7 +1,7 @@ /** @file The implementation of EFI IPv6 Configuration Protocol. - Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 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 @@ -2316,12 +2316,12 @@ Ip6ConfigCleanInstance ( } /** - Destory the Dhcp6 child in IP6_CONFIG_INSTANCE and release the resources. + Destroy the Dhcp6 child in IP6_CONFIG_INSTANCE and release the resources. @param[in, out] Instance The buffer of IP6_CONFIG_INSTANCE to be freed. @retval EFI_SUCCESS The child was successfully destroyed. - @retval Others Failed to destory the child. + @retval Others Failed to destroy the child. **/ EFI_STATUS diff --git a/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.h b/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.h index 5ae483931a..ccb09ccc77 100644 --- a/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.h +++ b/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.h @@ -1,7 +1,7 @@ /** @file Definitions for EFI IPv6 Configuartion Protocol implementation. - Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 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 @@ -279,12 +279,12 @@ Ip6ConfigCleanInstance ( ); /** - Destory the Dhcp6 child in IP6_CONFIG_INSTANCE and release the resources. + Destroy the Dhcp6 child in IP6_CONFIG_INSTANCE and release the resources. @param[in, out] Instance The buffer of IP6_CONFIG_INSTANCE to be freed. @retval EFI_SUCCESS The child was successfully destroyed. - @retval Others Failed to destory the child. + @retval Others Failed to destroy the child. **/ EFI_STATUS diff --git a/NetworkPkg/Ip6Dxe/Ip6Driver.c b/NetworkPkg/Ip6Dxe/Ip6Driver.c index 502c32bd0d..d242b153df 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Driver.c +++ b/NetworkPkg/Ip6Dxe/Ip6Driver.c @@ -1,7 +1,7 @@ /** @file The driver binding and service binding protocol for IP6 driver. - Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 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 @@ -94,7 +94,7 @@ Ip6DriverBindingSupported ( Clean up an IP6 service binding instance. It releases 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 IP6 service binding instance to clean up. @@ -852,8 +852,8 @@ Ip6ServiceBindingDestroyChild ( // // A child can be destroyed more than once. For example, - // Ip6DriverBindingStop will destory all of its children. - // when UDP driver is being stopped, it will destory all + // Ip6DriverBindingStop will destroy all of its children. + // when UDP driver is being stopped, it will destroy all // the IP child it opens. // if (IpInstance->State == IP6_STATE_DESTROY) { diff --git a/NetworkPkg/Ip6Dxe/Ip6Driver.h b/NetworkPkg/Ip6Dxe/Ip6Driver.h index 48ffe7b06b..4a23d836b8 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Driver.h +++ b/NetworkPkg/Ip6Dxe/Ip6Driver.h @@ -1,7 +1,7 @@ /** @file The driver binding and service binding protocol for IP6 driver. - Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 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 @@ -24,7 +24,7 @@ extern EFI_COMPONENT_NAME2_PROTOCOL gIp6ComponentName2; Clean up an IP6 service binding instance. It releases 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 IP6 service binding instance to clean up. diff --git a/NetworkPkg/Ip6Dxe/Ip6If.c b/NetworkPkg/Ip6Dxe/Ip6If.c index 198b547ed2..a934188479 100644 --- a/NetworkPkg/Ip6Dxe/Ip6If.c +++ b/NetworkPkg/Ip6Dxe/Ip6If.c @@ -1,7 +1,7 @@ /** @file Implement IP6 pesudo interface. - Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 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 @@ -314,7 +314,7 @@ Ip6CleanInterface ( } // - // Destory the interface if this is the last IP instance. + // Destroy the interface if this is the last IP instance. // Remove all the system transmitted packets // from this interface, cancel the receive request if exists. // diff --git a/NetworkPkg/Ip6Dxe/Ip6Impl.c b/NetworkPkg/Ip6Dxe/Ip6Impl.c index 9775aec778..44e0392511 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Impl.c +++ b/NetworkPkg/Ip6Dxe/Ip6Impl.c @@ -1,7 +1,7 @@ /** @file Implementation of EFI_IP6_PROTOCOL protocol interfaces. - Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 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 @@ -689,7 +689,7 @@ EfiIp6Configure ( Status = Ip6CleanProtocol (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/NetworkPkg/Ip6Dxe/Ip6Nd.c b/NetworkPkg/Ip6Dxe/Ip6Nd.c index 4bcf1a6d44..d510f330c1 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Nd.c +++ b/NetworkPkg/Ip6Dxe/Ip6Nd.c @@ -1,7 +1,7 @@ /** @file Implementation of Neighbor Discovery support routines. - Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 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 @@ -261,7 +261,7 @@ Ip6CreatePrefixListEntry ( } /** - Destory a IP6 prefix list entry. + Destroy a IP6 prefix list entry. @param[in] IpSb The pointer to IP6_SERVICE instance. @param[in] PrefixEntry The to be destroyed prefix list entry. diff --git a/NetworkPkg/Ip6Dxe/Ip6Nd.h b/NetworkPkg/Ip6Dxe/Ip6Nd.h index 1ec022ba64..982203ca5f 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Nd.h +++ b/NetworkPkg/Ip6Dxe/Ip6Nd.h @@ -1,7 +1,7 @@ /** @file Definition of Neighbor Discovery support routines. - Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 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 @@ -336,7 +336,7 @@ Ip6CreatePrefixListEntry ( ); /** - Destory a IP6 prefix list entry. + Destroy a IP6 prefix list entry. @param[in] IpSb The pointer to IP6_SERVICE instance. @param[in] PrefixEntry The to be destroyed prefix list entry. -- cgit v1.2.3