From d63a52ebf3ab50ef3578ec412bc5e8675d33e503 Mon Sep 17 00:00:00 2001
From: Wu Jiaxin <jiaxin.wu@intel.com>
Date: Thu, 5 Feb 2015 07:56:09 +0000
Subject: [PATCH] Open default Tcp child via BY_CHILD_CONTROLLER.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16774 6f19259b-4bc3-4df7-8a09-765794883524
---
 NetworkPkg/IScsiDxe/IScsiDriver.c | 36 +++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/NetworkPkg/IScsiDxe/IScsiDriver.c b/NetworkPkg/IScsiDxe/IScsiDriver.c
index 8d1742455c..5e5d700e47 100644
--- a/NetworkPkg/IScsiDxe/IScsiDriver.c
+++ b/NetworkPkg/IScsiDxe/IScsiDriver.c
@@ -1,7 +1,7 @@
 /** @file
   The entry point of IScsi driver.
 
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2015, 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
@@ -290,7 +290,7 @@ IScsiStart (
   }
 
   Status = gBS->OpenProtocol (
-                  Private->ChildHandle,
+                  Private->ChildHandle, /// Default Tcp child
                   ProtocolGuid,
                   &Interface,
                   Image,
@@ -750,6 +750,30 @@ IScsiStart (
     goto ON_ERROR;
   }
 
+  //
+  // ISCSI children should share the default Tcp child, just open the default Tcp child via BY_CHILD_CONTROLLER.
+  //
+  Status = gBS->OpenProtocol (
+                  Private->ChildHandle, /// Default Tcp child
+                  ProtocolGuid,
+                  &Interface,
+                  Image,
+                  Private->ExtScsiPassThruHandle,
+                  EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER
+                  );              
+  if (EFI_ERROR (Status)) {
+    gBS->UninstallMultipleProtocolInterfaces (
+           Private->ExtScsiPassThruHandle,
+           &gEfiExtScsiPassThruProtocolGuid,
+           &Private->IScsiExtScsiPassThru,
+           &gEfiDevicePathProtocolGuid,
+           Private->DevicePath,
+           NULL
+           );
+    
+    goto ON_ERROR;
+  }
+
 ON_EXIT:
 
   //
@@ -838,6 +862,13 @@ IScsiStop (
       ProtocolGuid = &gEfiTcp6ProtocolGuid;
     }
 
+    gBS->CloseProtocol (
+           Private->ChildHandle,
+           ProtocolGuid,
+           Private->Image,
+           Private->ExtScsiPassThruHandle
+           );
+    
     gBS->CloseProtocol (
            Conn->TcpIo.Handle,
            ProtocolGuid,
@@ -847,6 +878,7 @@ IScsiStop (
 
     return EFI_SUCCESS;
   }
+  
   //
   // Get the handle of the controller we are controling.
   //