X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FIScsiDxe%2FIScsiExtScsiPassThru.c;h=697424ad72585075205599d399eb57aa49719268;hp=2729c3b4292fdf374bd4cd053f97e420ae3a56da;hb=e48e37fce2611df7a52aff271835ff72ee396d9b;hpb=bb8ffffd1c0ff0ee697c26d377fd9767097cc02b

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
index 2729c3b429..697424ad72 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
@@ -101,17 +101,17 @@ Returns:
   Private       = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);
   ConfigNvData  = &Private->Session.ConfigData.NvData;
 
-  if ((*Target)[0] == 0 && (NetCompareMem (Lun, ConfigNvData->BootLun, sizeof (UINT64)) == 0)) {
+  if ((*Target)[0] == 0 && (CompareMem (Lun, ConfigNvData->BootLun, sizeof (UINT64)) == 0)) {
     //
     // Only one <Target, Lun> pair per iSCSI Driver instance.
     //
     return EFI_NOT_FOUND;
   }
 
-  NetSetMem (TargetId, TARGET_MAX_BYTES, 0xFF);
-  if (NetCompareMem (*Target, TargetId, TARGET_MAX_BYTES) == 0) {
+  SetMem (TargetId, TARGET_MAX_BYTES, 0xFF);
+  if (CompareMem (*Target, TargetId, TARGET_MAX_BYTES) == 0) {
     (*Target)[0] = 0;
-    NetCopyMem (Lun, ConfigNvData->BootLun, sizeof (UINT64));
+    CopyMem (Lun, ConfigNvData->BootLun, sizeof (UINT64));
 
     return EFI_SUCCESS;
   }
@@ -181,12 +181,12 @@ Returns:
   ConfigNvData  = &Session->ConfigData.NvData;
   AuthConfig    = &Session->AuthData.AuthConfig;
 
-  if (NetCompareMem (&Lun, ConfigNvData->BootLun, sizeof (UINT64)) != 0) {
+  if (CompareMem (&Lun, ConfigNvData->BootLun, sizeof (UINT64)) != 0) {
     return EFI_NOT_FOUND;
   }
 
   DevPathNodeLen  = sizeof (ISCSI_DEVICE_PATH) + AsciiStrLen (ConfigNvData->TargetName) + 1;
-  Node            = NetAllocatePool (DevPathNodeLen);
+  Node            = AllocatePool (DevPathNodeLen);
   if (Node == NULL) {
     return EFI_OUT_OF_RESOURCES;
   }
@@ -214,7 +214,7 @@ Returns:
     break;
   }
 
-  NetCopyMem (&Node->Iscsi.Lun, ConfigNvData->BootLun, sizeof (UINT64));
+  CopyMem (&Node->Iscsi.Lun, ConfigNvData->BootLun, sizeof (UINT64));
   Node->Iscsi.TargetPortalGroupTag = Session->TargetPortalGroupTag;
   AsciiStrCpy ((CHAR8 *) Node + sizeof (ISCSI_DEVICE_PATH), ConfigNvData->TargetName);
 
@@ -276,13 +276,13 @@ Returns:
   Private       = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);
   ConfigNvData  = &Private->Session.ConfigData.NvData;
 
-  NetZeroMem (*Target, TARGET_MAX_BYTES);
+  ZeroMem (*Target, TARGET_MAX_BYTES);
 
   if (AsciiStrCmp (ConfigNvData->TargetName, (CHAR8 *) DevicePath + sizeof (ISCSI_DEVICE_PATH)) != 0) {
     return EFI_UNSUPPORTED;
   }
 
-  NetCopyMem (Lun, ConfigNvData->BootLun, sizeof (UINT64));
+  CopyMem (Lun, ConfigNvData->BootLun, sizeof (UINT64));
 
   return EFI_SUCCESS;
 }
@@ -377,9 +377,9 @@ Returns:
 {
   UINT8 TargetId[TARGET_MAX_BYTES];
 
-  NetSetMem (TargetId, TARGET_MAX_BYTES, 0xFF);
+  SetMem (TargetId, TARGET_MAX_BYTES, 0xFF);
 
-  if (NetCompareMem (*Target, TargetId, TARGET_MAX_BYTES) == 0) {
+  if (CompareMem (*Target, TargetId, TARGET_MAX_BYTES) == 0) {
     (*Target)[0] = 0;
     return EFI_SUCCESS;
   } else if ((*Target)[0] == 0) {