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

3 files changed, 6 insertions, 6 deletions

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
index c627a140a8..2e31643821 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 d17bfa8b9d..ac36460da8 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 0317efa322..b8ace790ca 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.