1. Add EFI_COMPONENT_NAME2_PROTOCOL.GetControllerName() support.

2. Fix the driver binding Stop() hang issue in the network stack.
3. Add Ip4 raw data support.
4. Add iSCSI Dhcp option 60 support.

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@13995 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 29 insertions, 1 deletions

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
index 688f9a7e99..93d10c9eb2 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
@@ -1,7 +1,7 @@
 /** @file

   Tcp request dispatcher implementation.

 

-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

@@ -263,6 +263,8 @@ Tcp4AttachPcb (
   TCP_CB            *Tcb;

   TCP4_PROTO_DATA   *ProtoData;

   IP_IO             *IpIo;

+  EFI_STATUS        Status;

+  VOID              *Ip;

 

   Tcb = AllocateZeroPool (sizeof (TCP_CB));

 

@@ -286,6 +288,22 @@ Tcp4AttachPcb (
     return EFI_OUT_OF_RESOURCES;

   }

 

+  //

+  // Open the new created IP instance BY_CHILD.

+  //

+  Status = gBS->OpenProtocol (

+                  Tcb->IpInfo->ChildHandle,

+                  &gEfiIp4ProtocolGuid,

+                  &Ip,

+                  IpIo->Image,

+                  Sk->SockHandle,

+                  EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER

+                  );

+  if (EFI_ERROR (Status)) {

+    IpIoRemoveIp (IpIo, Tcb->IpInfo);

+    return Status;

+  }

+

   InitializeListHead (&Tcb->List);

   InitializeListHead (&Tcb->SndQue);

   InitializeListHead (&Tcb->RcvQue);

@@ -318,6 +336,16 @@ Tcp4DetachPcb (
 

   Tcp4FlushPcb (Tcb);

 

+  //

+  // Close the IP protocol.

+  //

+  gBS->CloseProtocol (

+         Tcb->IpInfo->ChildHandle,

+         &gEfiIp4ProtocolGuid,

+         ProtoData->TcpService->IpIo->Image,

+         Sk->SockHandle

+         );

+  

   IpIoRemoveIp (ProtoData->TcpService->IpIo, Tcb->IpInfo);

 

   FreePool (Tcb);