Use Mde library and definition instead of some native definitions in NetLib, to simpl...

[mirror_edk2.git] / MdeModulePkg / Universal / Network / IScsiDxe / IScsiCHAP.c

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
index c86aae680b7b9f3a7dd7f9e5eab9bca053f9c4c4..4dca145318e27f066bd8ea7d64252a2014002909 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
@@ -85,7 +85,7 @@ IScsiCHAPAuthTarget (
             VerifyRsp\r
             );\r
 \r
-  if (NetCompareMem (VerifyRsp, TargetResponse, ISCSI_CHAP_RSP_LEN)) {\r
+  if (CompareMem (VerifyRsp, TargetResponse, ISCSI_CHAP_RSP_LEN)) {\r
     Status = EFI_SECURITY_VIOLATION;\r
   }\r
 \r
@@ -123,7 +123,7 @@ Returns:
   CHAR8                     *Value;\r
   UINT8                     *Data;\r
   UINT32                    Len;\r
-  NET_LIST_ENTRY            *KeyValueList;\r
+  LIST_ENTRY                *KeyValueList;\r
   UINTN                     Algorithm;\r
   CHAR8                     *Identifier;\r
   CHAR8                     *Challenge;\r
@@ -139,7 +139,7 @@ Returns:
   AuthData    = &Session->AuthData;\r
 \r
   Len         = Conn->RspQue.BufSize;\r
-  Data        = NetAllocatePool (Len);\r
+  Data        = AllocatePool (Len);\r
   if (Data == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -283,7 +283,7 @@ ON_EXIT:
 \r
   IScsiFreeKeyValueList (KeyValueList);\r
 \r
-  NetFreePool (Data);\r
+  gBS->FreePool (Data);\r
 \r
   return Status;\r
 }\r
@@ -333,13 +333,13 @@ Returns:
   Status      = EFI_SUCCESS;\r
 \r
   RspLen      = 2 * ISCSI_CHAP_RSP_LEN + 3;\r
-  Response    = NetAllocatePool (RspLen);\r
+  Response    = AllocatePool (RspLen);\r
   if (Response == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   ChallengeLen  = 2 * ISCSI_CHAP_RSP_LEN + 3;\r
-  Challenge     = NetAllocatePool (ChallengeLen);\r
+  Challenge     = AllocatePool (ChallengeLen);\r
   if (Challenge == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -418,8 +418,8 @@ Returns:
     break;\r
   }\r
 \r
-  NetFreePool (Response);\r
-  NetFreePool (Challenge);\r
+  gBS->FreePool (Response);\r
+  gBS->FreePool (Challenge);\r
 \r
   return Status;\r
 }\r