Clean up the private GUID definition in module Level.

[mirror_edk2.git] / NetworkPkg / IScsiDxe / IScsiMisc.c

diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.c b/NetworkPkg/IScsiDxe/IScsiMisc.c
index a697659f49e9805d8b708e5c1cbfd4c3ee1753cf..731081f1df85fa86ce2e49a99ae886a46e39a812 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiMisc.c
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.c
@@ -297,7 +297,7 @@ IScsiMacAddrToStr (
   for (Index = 0; Index < Len; Index++) {\r
     Str[3 * Index]      = (CHAR16) IScsiHexString[(Mac->Addr[Index] >> 4) & 0x0F];\r
     Str[3 * Index + 1]  = (CHAR16) IScsiHexString[Mac->Addr[Index] & 0x0F];\r
-    Str[3 * Index + 2]  = L'-';\r
+    Str[3 * Index + 2]  = L':';\r
   }\r
 \r
   String = &Str[3 * Index - 1] ;\r
@@ -640,6 +640,14 @@ IScsiRemoveNic (
     }\r
   }\r
 \r
+  //\r
+  // Free attempt is created but not saved to system.\r
+  //\r
+  if (mPrivate->NewAttempt != NULL) {\r
+    FreePool (mPrivate->NewAttempt);\r
+    mPrivate->NewAttempt = NULL;\r
+  }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -913,7 +921,7 @@ IScsiGetConfigData (
   //\r
   AttemptConfigOrder = IScsiGetVariableAndSize (\r
                          L"AttemptOrder",\r
-                         &mVendorGuid,\r
+                         &gIScsiConfigGuid,\r
                          &AttemptConfigOrderSize\r
                          );\r
   if (AttemptConfigOrder == NULL || AttemptConfigOrderSize == 0) {\r