Open default Tcp child via BY_CHILD_CONTROLLER.
authorWu Jiaxin <jiaxin.wu@intel.com>
Thu, 5 Feb 2015 07:56:09 +0000 (07:56 +0000)
committerjiaxinwu <jiaxinwu@Edk2>
Thu, 5 Feb 2015 07:56:09 +0000 (07:56 +0000)
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

index 8d17424..5e5d700 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   The entry point of IScsi driver.\r
 \r
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -290,7 +290,7 @@ IScsiStart (
   }\r
 \r
   Status = gBS->OpenProtocol (\r
-                  Private->ChildHandle,\r
+                  Private->ChildHandle, /// Default Tcp child\r
                   ProtocolGuid,\r
                   &Interface,\r
                   Image,\r
@@ -750,6 +750,30 @@ IScsiStart (
     goto ON_ERROR;\r
   }\r
 \r
+  //\r
+  // ISCSI children should share the default Tcp child, just open the default Tcp child via BY_CHILD_CONTROLLER.\r
+  //\r
+  Status = gBS->OpenProtocol (\r
+                  Private->ChildHandle, /// Default Tcp child\r
+                  ProtocolGuid,\r
+                  &Interface,\r
+                  Image,\r
+                  Private->ExtScsiPassThruHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+                  );              \r
+  if (EFI_ERROR (Status)) {\r
+    gBS->UninstallMultipleProtocolInterfaces (\r
+           Private->ExtScsiPassThruHandle,\r
+           &gEfiExtScsiPassThruProtocolGuid,\r
+           &Private->IScsiExtScsiPassThru,\r
+           &gEfiDevicePathProtocolGuid,\r
+           Private->DevicePath,\r
+           NULL\r
+           );\r
+    \r
+    goto ON_ERROR;\r
+  }\r
+\r
 ON_EXIT:\r
 \r
   //\r
@@ -838,6 +862,13 @@ IScsiStop (
       ProtocolGuid = &gEfiTcp6ProtocolGuid;\r
     }\r
 \r
+    gBS->CloseProtocol (\r
+           Private->ChildHandle,\r
+           ProtocolGuid,\r
+           Private->Image,\r
+           Private->ExtScsiPassThruHandle\r
+           );\r
+    \r
     gBS->CloseProtocol (\r
            Conn->TcpIo.Handle,\r
            ProtocolGuid,\r
@@ -847,6 +878,7 @@ IScsiStop (
 \r
     return EFI_SUCCESS;\r
   }\r
+  \r
   //\r
   // Get the handle of the controller we are controling.\r
   //\r