1) fix one goto issue in IScsiProto.c

2)	add Md5.h in [Sources.common] of inf
3)	change mIScsiPrivateGuid to gIScsiPrivateGuid

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7042 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
index dd4068be6eab89c3759ea404c09d88884f79884e..7e7512f041d4fd947ff632d02344e6d9a179e988 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
@@ -23,7 +23,7 @@ EFI_DRIVER_BINDING_PROTOCOL gIScsiDriverBinding = {
   NULL\r
 };\r
 \r
-EFI_GUID                    mIScsiPrivateGuid   = ISCSI_PRIVATE_GUID;\r
+EFI_GUID                    gIScsiPrivateGuid   = ISCSI_PRIVATE_GUID;\r
 \r
 \r
 /**\r
@@ -63,7 +63,7 @@ IScsiDriverBindingSupported (
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
-                  &mIScsiPrivateGuid,\r
+                  &gIScsiPrivateGuid,\r
                   NULL,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
@@ -195,7 +195,7 @@ IScsiDriverBindingStart (
   //\r
   Status = gBS->InstallProtocolInterface (\r
                   &ControllerHandle,\r
-                  &mIScsiPrivateGuid,\r
+                  &gIScsiPrivateGuid,\r
                   EFI_NATIVE_INTERFACE,\r
                   &Private->IScsiIdentifier\r
                   );\r
@@ -299,7 +299,7 @@ IScsiDriverBindingStop (
 \r
   Status = gBS->OpenProtocol (\r
                   IScsiController,\r
-                  &mIScsiPrivateGuid,\r
+                  &gIScsiPrivateGuid,\r
                   (VOID **)&IScsiIdentifier,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
@@ -316,7 +316,7 @@ IScsiDriverBindingStop (
   //\r
   gBS->UninstallProtocolInterface (\r
         IScsiController,\r
-        &mIScsiPrivateGuid,\r
+        &gIScsiPrivateGuid,\r
         &Private->IScsiIdentifier\r
         );\r
 \r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h
index 810462454d85250820b068790a4739998bd6b2b8..78f0c446eec56294caf036296f876bb4cd86f306 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h
@@ -41,8 +41,7 @@ extern EFI_COMPONENT_NAME_PROTOCOL        gIScsiComponentName;
 \r
 extern EFI_ISCSI_INITIATOR_NAME_PROTOCOL  gIScsiInitiatorName;\r
 \r
-\r
-extern EFI_GUID                           mIScsiPrivateGuid;\r
+extern EFI_GUID                           gIScsiPrivateGuid;\r
 \r
 typedef struct _ISCSI_PRIVATE_PROTOCOL {\r
   UINT32  Reserved;\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index e6b497e01b573d40a424d0e221037319dedd432a..dd71a80f56bbb51207d23a7bd79f6a3ccc62ab8b 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
@@ -41,6 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   IScsiDhcp.h\r
   IScsiCommon.h\r
   IScsiCHAP.h\r
+  Md5.h\r
   IScsiTcp4Io.c\r
   IScsiProto.c\r
   IScsiMisc.c\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
index 83824331ba9697277d850b6358ad2a3dc15e3685..ac978a2a40446fcca3f7fd26c5e047ad844aa45f 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
@@ -140,7 +140,7 @@ IScsiFillInitiatorSection (
   //\r
   // Get the identifier from the handle.\r
   //\r
-  Status = gBS->HandleProtocol (Handle, &mIScsiPrivateGuid, (VOID **) &IScsiIdentifier);\r
+  Status = gBS->HandleProtocol (Handle, &gIScsiPrivateGuid, (VOID **) &IScsiIdentifier);\r
   if (EFI_ERROR (Status)) {\r
     ASSERT (FALSE);\r
     return ;\r
@@ -302,7 +302,7 @@ IScsiFillNICAndTargetSections (
   SectionOffset = &Control->NIC0Offset;\r
 \r
   for (Index = 0; Index < HandleCount; Index++) {\r
-    Status = gBS->HandleProtocol (Handles[Index], &mIScsiPrivateGuid, (VOID **)&IScsiIdentifier);\r
+    Status = gBS->HandleProtocol (Handles[Index], &gIScsiPrivateGuid, (VOID **)&IScsiIdentifier);\r
     if (EFI_ERROR (Status)) {\r
       ASSERT (FALSE);\r
       return ;\r
@@ -495,7 +495,7 @@ IScsiPublishIbft (
   //\r
   Status = gBS->LocateHandleBuffer (\r
                   ByProtocol,\r
-                  &mIScsiPrivateGuid,\r
+                  &gIScsiPrivateGuid,\r
                   NULL,\r
                   &HandleCount,\r
                   &HandleBuffer\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
index 06b60da9b1fe4d62ed5d2104182e9e3f127c239f..adf8d9a3c169fc9182f0e7adbe804543e41dd66a 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
@@ -971,9 +971,14 @@ IScsiReceivePdu (
   Len = ISCSI_GET_DATASEG_LEN (Header);\r
   if (Len == 0) {\r
     //\r
-    // No data segment.\r
+    // No data segment.Form the pdu from a list of pdu segments.\r
     //\r
-    goto FORM_PDU;\r
+    *Pdu = NetbufFromBufList (NbufList, 0, 0, IScsiFreeNbufList, NbufList);\r
+    if (*Pdu == NULL) {\r
+      Status = EFI_OUT_OF_RESOURCES;\r
+      goto ON_EXIT;\r
+    }\r
+    return Status;\r
   }\r
   //\r
   // Get the length of the padding bytes of the data segment.\r
@@ -1067,7 +1072,6 @@ IScsiReceivePdu (
     NetbufTrim (DataSeg, PadLen, NET_BUF_TAIL);\r
   }\r
 \r
-FORM_PDU:\r
   //\r
   // Form the pdu from a list of pdu segments.\r
   //\r