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

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

13 files changed, 209 insertions, 209 deletions

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
index c86aae6..4dca145 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
@@ -85,7 +85,7 @@ IScsiCHAPAuthTarget (
             VerifyRsp

             );

 

-  if (NetCompareMem (VerifyRsp, TargetResponse, ISCSI_CHAP_RSP_LEN)) {

+  if (CompareMem (VerifyRsp, TargetResponse, ISCSI_CHAP_RSP_LEN)) {

     Status = EFI_SECURITY_VIOLATION;

   }

 

@@ -123,7 +123,7 @@ Returns:
   CHAR8                     *Value;

   UINT8                     *Data;

   UINT32                    Len;

-  NET_LIST_ENTRY            *KeyValueList;

+  LIST_ENTRY                *KeyValueList;

   UINTN                     Algorithm;

   CHAR8                     *Identifier;

   CHAR8                     *Challenge;

@@ -139,7 +139,7 @@ Returns:
   AuthData    = &Session->AuthData;

 

   Len         = Conn->RspQue.BufSize;

-  Data        = NetAllocatePool (Len);

+  Data        = AllocatePool (Len);

   if (Data == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

@@ -283,7 +283,7 @@ ON_EXIT:
 

   IScsiFreeKeyValueList (KeyValueList);

 

-  NetFreePool (Data);

+  gBS->FreePool (Data);

 

   return Status;

 }

@@ -333,13 +333,13 @@ Returns:
   Status      = EFI_SUCCESS;

 

   RspLen      = 2 * ISCSI_CHAP_RSP_LEN + 3;

-  Response    = NetAllocatePool (RspLen);

+  Response    = AllocatePool (RspLen);

   if (Response == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

 

   ChallengeLen  = 2 * ISCSI_CHAP_RSP_LEN + 3;

-  Challenge     = NetAllocatePool (ChallengeLen);

+  Challenge     = AllocatePool (ChallengeLen);

   if (Challenge == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

@@ -418,8 +418,8 @@ Returns:
     break;

   }

 

-  NetFreePool (Response);

-  NetFreePool (Challenge);

+  gBS->FreePool (Response);

+  gBS->FreePool (Challenge);

 

   return Status;

 }

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index 9f3c4fe..92169cb 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -24,7 +24,7 @@ BOOLEAN         mIScsiDeviceListUpdated = FALSE;
 UINTN           mNumberOfIScsiDevices   = 0;

 ISCSI_FORM_CALLBACK_INFO  *mCallbackInfo;

 

-NET_LIST_ENTRY  mIScsiConfigFormList = {

+LIST_ENTRY      mIScsiConfigFormList = {

   &mIScsiConfigFormList,

   &mIScsiConfigFormList

 };

@@ -138,7 +138,7 @@ Returns:
                   NULL

                   );

   if (Status == EFI_BUFFER_TOO_SMALL) {

-    DeviceList = (ISCSI_DEVICE_LIST *) NetAllocatePool (DataSize);

+    DeviceList = (ISCSI_DEVICE_LIST *) AllocatePool (DataSize);

 

     gRT->GetVariable (

           L"iSCSIDeviceList",

@@ -168,9 +168,9 @@ Returns:
             // Swap the current MAC address entry with the one indexed by

             // LastDeviceIndex.

             //

-            NetCopyMem (&TempMacInfo, CurMacInfo, sizeof (ISCSI_MAC_INFO));

-            NetCopyMem (CurMacInfo, &DeviceList->MacInfo[LastDeviceIndex], sizeof (ISCSI_MAC_INFO));

-            NetCopyMem (&DeviceList->MacInfo[LastDeviceIndex], &TempMacInfo, sizeof (ISCSI_MAC_INFO));

+            CopyMem (&TempMacInfo, CurMacInfo, sizeof (ISCSI_MAC_INFO));

+            CopyMem (CurMacInfo, &DeviceList->MacInfo[LastDeviceIndex], sizeof (ISCSI_MAC_INFO));

+            CopyMem (&DeviceList->MacInfo[LastDeviceIndex], &TempMacInfo, sizeof (ISCSI_MAC_INFO));

           }

 

           LastDeviceIndex++;

@@ -192,16 +192,16 @@ Returns:
       gRT->SetVariable (MacString, &mIScsiCHAPAuthInfoGuid, 0, 0, NULL);

     }

 

-    NetFreePool (DeviceList);

+    gBS->FreePool (DeviceList);

   } else if (Status != EFI_NOT_FOUND) {

-    NetFreePool (Handles);

+    gBS->FreePool (Handles);

     return Status;

   }

   //

   // Construct the new iSCSI device list.

   //

   DeviceListSize        = sizeof (ISCSI_DEVICE_LIST) + (NumHandles - 1) * sizeof (ISCSI_MAC_INFO);

-  DeviceList            = (ISCSI_DEVICE_LIST *) NetAllocatePool (DeviceListSize);

+  DeviceList            = (ISCSI_DEVICE_LIST *) AllocatePool (DeviceListSize);

   DeviceList->NumDevice = (UINT8) NumHandles;

 

   for (Index = 0; Index < NumHandles; Index++) {

@@ -209,7 +209,7 @@ Returns:
     Mode        = Snp->Mode;

 

     CurMacInfo  = &DeviceList->MacInfo[Index];

-    NetCopyMem (&CurMacInfo->Mac, &Mode->PermanentAddress, Mode->HwAddressSize);

+    CopyMem (&CurMacInfo->Mac, &Mode->PermanentAddress, Mode->HwAddressSize);

     CurMacInfo->Len = (UINT8) Mode->HwAddressSize;

   }

 

@@ -221,7 +221,7 @@ Returns:
         DeviceList

         );

 

-  NetFreePool (DeviceList);

+  gBS->FreePool (DeviceList);

 

   return Status;

 }

@@ -248,7 +248,7 @@ Returns:
 --*/

 {

   UINT32                  CurrentIndex;

-  NET_LIST_ENTRY          *Entry;

+  LIST_ENTRY              *Entry;

   ISCSI_CONFIG_FORM_ENTRY *ConfigFormEntry;

 

   CurrentIndex    = 0;

@@ -402,7 +402,7 @@ IScsiFormExtractConfig (
                                Results,

                                Progress

                                );

-  NetFreePool (IfrNvData);

+  gBS->FreePool (IfrNvData);

   return Status;

 }

 

@@ -516,7 +516,7 @@ IScsiFormCallback (
       PopUpInvalidNotify (L"Invalid IP address!");

       Status = EFI_INVALID_PARAMETER;

     } else {

-      NetCopyMem (&Private->Current->SessionConfigData.LocalIp, &HostIp.v4, sizeof (HostIp.v4));

+      CopyMem (&Private->Current->SessionConfigData.LocalIp, &HostIp.v4, sizeof (HostIp.v4));

     }

 

     break;

@@ -528,7 +528,7 @@ IScsiFormCallback (
       PopUpInvalidNotify (L"Invalid Subnet Mask!");

       Status = EFI_INVALID_PARAMETER;

     } else {

-      NetCopyMem (&Private->Current->SessionConfigData.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));

+      CopyMem (&Private->Current->SessionConfigData.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));

     }

 

     break;

@@ -540,7 +540,7 @@ IScsiFormCallback (
       PopUpInvalidNotify (L"Invalid Gateway!");

       Status = EFI_INVALID_PARAMETER;

     } else {

-      NetCopyMem (&Private->Current->SessionConfigData.Gateway, &Gateway.v4, sizeof (Gateway.v4));

+      CopyMem (&Private->Current->SessionConfigData.Gateway, &Gateway.v4, sizeof (Gateway.v4));

     }

 

     break;

@@ -552,7 +552,7 @@ IScsiFormCallback (
       PopUpInvalidNotify (L"Invalid IP address!");

       Status = EFI_INVALID_PARAMETER;

     } else {

-      NetCopyMem (&Private->Current->SessionConfigData.TargetIp, &HostIp.v4, sizeof (HostIp.v4));

+      CopyMem (&Private->Current->SessionConfigData.TargetIp, &HostIp.v4, sizeof (HostIp.v4));

     }

 

     break;

@@ -581,7 +581,7 @@ IScsiFormCallback (
     if (EFI_ERROR (Status)) {

       PopUpInvalidNotify (L"Invalid LUN string!");

     } else {

-      NetCopyMem (Private->Current->SessionConfigData.BootLun, &Lun, sizeof (Lun));

+      CopyMem (Private->Current->SessionConfigData.BootLun, &Lun, sizeof (Lun));

     }

 

     break;

@@ -625,9 +625,9 @@ IScsiFormCallback (
       // deployed.

       //

       if (!Private->Current->SessionConfigData.InitiatorInfoFromDhcp) {

-        NetCopyMem (&HostIp.v4, &Private->Current->SessionConfigData.LocalIp, sizeof (HostIp.v4));

-        NetCopyMem (&SubnetMask.v4, &Private->Current->SessionConfigData.SubnetMask, sizeof (SubnetMask.v4));

-        NetCopyMem (&Gateway.v4, &Private->Current->SessionConfigData.Gateway, sizeof (Gateway.v4));

+        CopyMem (&HostIp.v4, &Private->Current->SessionConfigData.LocalIp, sizeof (HostIp.v4));

+        CopyMem (&SubnetMask.v4, &Private->Current->SessionConfigData.SubnetMask, sizeof (SubnetMask.v4));

+        CopyMem (&Gateway.v4, &Private->Current->SessionConfigData.Gateway, sizeof (Gateway.v4));

 

         if ((Gateway.Addr[0] != 0)) {

           if (SubnetMask.Addr[0] == 0) {

@@ -645,7 +645,7 @@ IScsiFormCallback (
       // Validate target configuration if DHCP isn't deployed.

       //

       if (!Private->Current->SessionConfigData.TargetInfoFromDhcp) {

-        NetCopyMem (&HostIp.v4, &Private->Current->SessionConfigData.TargetIp, sizeof (HostIp.v4));

+        CopyMem (&HostIp.v4, &Private->Current->SessionConfigData.TargetIp, sizeof (HostIp.v4));

         if (!Ip4IsUnicast (NTOHL (HostIp.Addr[0]), 0)) {

           PopUpInvalidNotify (L"Target IP is invalid!");

           Status = EFI_INVALID_PARAMETER;

@@ -718,7 +718,7 @@ IScsiFormCallback (
     Status = SetBrowserData (NULL, NULL, BufferSize, (UINT8 *) IfrNvData, NULL);

   }

 

-  NetFreePool (IfrNvData);

+  gBS->FreePool (IfrNvData);

   return Status;

 }

 

@@ -749,7 +749,7 @@ Returns:
 

 --*/

 {

-  NET_LIST_ENTRY              *Entry;

+  LIST_ENTRY                  *Entry;

   ISCSI_CONFIG_FORM_ENTRY     *ConfigFormEntry;

   BOOLEAN                     EntryExisted;

   EFI_STATUS                  Status;

@@ -779,12 +779,12 @@ Returns:
       //

       // Add a new form.

       //

-      ConfigFormEntry = (ISCSI_CONFIG_FORM_ENTRY *) NetAllocateZeroPool (sizeof (ISCSI_CONFIG_FORM_ENTRY));

+      ConfigFormEntry = (ISCSI_CONFIG_FORM_ENTRY *) AllocateZeroPool (sizeof (ISCSI_CONFIG_FORM_ENTRY));

       if (ConfigFormEntry == NULL) {

         return EFI_OUT_OF_RESOURCES;

       }

 

-      NetListInit (&ConfigFormEntry->Link);

+      InitializeListHead (&ConfigFormEntry->Link);

       ConfigFormEntry->Controller = Controller;

 

       //

@@ -812,7 +812,7 @@ Returns:
                       &ConfigFormEntry->SessionConfigData

                       );

       if (EFI_ERROR (Status)) {

-        NetZeroMem (&ConfigFormEntry->SessionConfigData, sizeof (ConfigFormEntry->SessionConfigData));

+        ZeroMem (&ConfigFormEntry->SessionConfigData, sizeof (ConfigFormEntry->SessionConfigData));

       }

       //

       // Get the CHAP authentication configuration data.

@@ -826,7 +826,7 @@ Returns:
                       &ConfigFormEntry->AuthConfigData

                       );

       if (EFI_ERROR (Status)) {

-        NetZeroMem (&ConfigFormEntry->AuthConfigData, sizeof (ConfigFormEntry->AuthConfigData));

+        ZeroMem (&ConfigFormEntry->AuthConfigData, sizeof (ConfigFormEntry->AuthConfigData));

       }

       //

       // Compose the Port string and create a new STRING_REF.

@@ -840,21 +840,21 @@ Returns:
       UnicodeSPrint (PortString, 128, L"Set the iSCSI parameters on port %s", ConfigFormEntry->MacString);

       HiiLibNewString (mCallbackInfo->RegisteredHandle, &ConfigFormEntry->PortTitleHelpToken, PortString);

 

-      NetListInsertTail (&mIScsiConfigFormList, &ConfigFormEntry->Link);

+      InsertTailList (&mIScsiConfigFormList, &ConfigFormEntry->Link);

       mNumberOfIScsiDevices++;

     }

   } else {

     ASSERT (EntryExisted);

 

     mNumberOfIScsiDevices--;

-    NetListRemoveEntry (&ConfigFormEntry->Link);

-    NetFreePool (ConfigFormEntry);

+    RemoveEntryList (&ConfigFormEntry->Link);

+    gBS->FreePool (ConfigFormEntry);

   }

   //

   // Allocate space for creation of Buffer

   //

   UpdateData.BufferSize = 0x1000;

-  UpdateData.Data = NetAllocateZeroPool (0x1000);

+  UpdateData.Data = AllocateZeroPool (0x1000);

   UpdateData.Offset = 0;

 

   FormIndex = 0;

@@ -882,7 +882,7 @@ Returns:
     &UpdateData

     );

 

-  NetFreePool (UpdateData.Data);

+  gBS->FreePool (UpdateData.Data);

 

   return EFI_SUCCESS;

 }

@@ -918,7 +918,7 @@ Returns:
     return Status;

   }

 

-  CallbackInfo = (ISCSI_FORM_CALLBACK_INFO *) NetAllocatePool (sizeof (ISCSI_FORM_CALLBACK_INFO));

+  CallbackInfo = (ISCSI_FORM_CALLBACK_INFO *) AllocatePool (sizeof (ISCSI_FORM_CALLBACK_INFO));

   if (CallbackInfo == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

@@ -967,7 +967,7 @@ Returns:
                            CallbackInfo->DriverHandle,

                            &CallbackInfo->RegisteredHandle

                            );

-  NetFreePool (PackageList);

+  gBS->FreePool (PackageList);

   if (EFI_ERROR (Status)) {

     return Status;

   }

@@ -1002,7 +1002,7 @@ Returns:
 {

   ISCSI_CONFIG_FORM_ENTRY     *ConfigFormEntry;

 

-  while (!NetListIsEmpty (&mIScsiConfigFormList)) {

+  while (!IsListEmpty (&mIScsiConfigFormList)) {

     //

     // Uninstall the device forms as the iSCSI driver instance may fail to

     // control the controller but still install the device configuration form.

@@ -1032,7 +1032,7 @@ Returns:
         );

   HiiLibDestroyHiiDriverHandle (mCallbackInfo->DriverHandle);

 

-  NetFreePool (mCallbackInfo);

+  gBS->FreePool (mCallbackInfo);

 

   return EFI_SUCCESS;

 }

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
index e9311b6..c3c664d 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
@@ -62,7 +62,7 @@ typedef struct _ISCSI_DEVICE_LIST {
 #pragma pack()

 

 typedef struct _ISCSI_CONFIG_FORM_ENTRY {

-  NET_LIST_ENTRY                Link;

+  LIST_ENTRY                    Link;

   EFI_HANDLE                    Controller;

   CHAR16                        MacString[95];

   STRING_REF                    PortTitleToken;

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
index c7e8e8d..df4772b 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
@@ -62,7 +62,7 @@ Returns:
   //

   IScsiRootPathIdLen = (UINT8) AsciiStrLen (ISCSI_ROOT_PATH_ID);

 

-  if ((Length <= IScsiRootPathIdLen) || (NetCompareMem (RootPath, ISCSI_ROOT_PATH_ID, IScsiRootPathIdLen) != 0)) {

+  if ((Length <= IScsiRootPathIdLen) || (CompareMem (RootPath, ISCSI_ROOT_PATH_ID, IScsiRootPathIdLen) != 0)) {

     return EFI_NOT_FOUND;

   }

   //

@@ -71,17 +71,17 @@ Returns:
   RootPath += IScsiRootPathIdLen;

   Length  = (UINT8) (Length - IScsiRootPathIdLen);

 

-  TmpStr  = (CHAR8 *) NetAllocatePool (Length + 1);

+  TmpStr  = (CHAR8 *) AllocatePool (Length + 1);

   if (TmpStr == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

 

-  NetCopyMem (TmpStr, RootPath, Length);

+  CopyMem (TmpStr, RootPath, Length);

   TmpStr[Length]  = '\0';

 

   Index           = 0;

   FieldIndex      = 0;

-  NetZeroMem (&Fields[0], sizeof (Fields));

+  ZeroMem (&Fields[0], sizeof (Fields));

 

   //

   // Extract the fields in the Root Path option string.

@@ -155,7 +155,7 @@ Returns:
       goto ON_EXIT;

     }

   } else {

-    NetZeroMem (ConfigNvData->BootLun, sizeof (ConfigNvData->BootLun));

+    ZeroMem (ConfigNvData->BootLun, sizeof (ConfigNvData->BootLun));

   }

   //

   // Get the target iSCSI Name.

@@ -178,7 +178,7 @@ Returns:
 

 ON_EXIT:

 

-  NetFreePool (TmpStr);

+  gBS->FreePool (TmpStr);

 

   return Status;

 }

@@ -233,14 +233,14 @@ Returns:
     return EFI_NOT_READY;

   }

 

-  OptionList = NetAllocatePool (OptionCount * sizeof (EFI_DHCP4_PACKET_OPTION *));

+  OptionList = AllocatePool (OptionCount * sizeof (EFI_DHCP4_PACKET_OPTION *));

   if (OptionList == NULL) {

     return EFI_NOT_READY;

   }

 

   Status = This->Parse (This, Packet, &OptionCount, OptionList);

   if (EFI_ERROR (Status)) {

-    NetFreePool (OptionList);

+    gBS->FreePool (OptionList);

     return EFI_NOT_READY;

   }

 

@@ -262,7 +262,7 @@ Returns:
     Status = EFI_NOT_READY;

   }

 

-  NetFreePool (OptionList);

+  gBS->FreePool (OptionList);

 

   return Status;

 }

@@ -307,9 +307,9 @@ Returns:
     return EFI_NO_MAPPING;

   }

 

-  NetCopyMem (&ConfigData->NvData.LocalIp, &Dhcp4ModeData.ClientAddress, sizeof (EFI_IPv4_ADDRESS));

-  NetCopyMem (&ConfigData->NvData.SubnetMask, &Dhcp4ModeData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));

-  NetCopyMem (&ConfigData->NvData.Gateway, &Dhcp4ModeData.RouterAddress, sizeof (EFI_IPv4_ADDRESS));

+  CopyMem (&ConfigData->NvData.LocalIp, &Dhcp4ModeData.ClientAddress, sizeof (EFI_IPv4_ADDRESS));

+  CopyMem (&ConfigData->NvData.SubnetMask, &Dhcp4ModeData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));

+  CopyMem (&ConfigData->NvData.Gateway, &Dhcp4ModeData.RouterAddress, sizeof (EFI_IPv4_ADDRESS));

 

   OptionCount = 0;

   OptionList  = NULL;

@@ -319,14 +319,14 @@ Returns:
     return EFI_DEVICE_ERROR;

   }

 

-  OptionList = NetAllocatePool (OptionCount * sizeof (EFI_DHCP4_PACKET_OPTION *));

+  OptionList = AllocatePool (OptionCount * sizeof (EFI_DHCP4_PACKET_OPTION *));

   if (OptionList == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

 

   Status = Dhcp4->Parse (Dhcp4, Dhcp4ModeData.ReplyPacket, &OptionCount, OptionList);

   if (EFI_ERROR (Status)) {

-    NetFreePool (OptionList);

+    gBS->FreePool (OptionList);

     return EFI_DEVICE_ERROR;

   }

 

@@ -343,13 +343,13 @@ Returns:
       //

       // Primary DNS server address.

       //

-      NetCopyMem (&ConfigData->PrimaryDns, &OptionList[Index]->Data[0], sizeof (EFI_IPv4_ADDRESS));

+      CopyMem (&ConfigData->PrimaryDns, &OptionList[Index]->Data[0], sizeof (EFI_IPv4_ADDRESS));

 

       if (OptionList[Index]->Length > 4) {

         //

         // Secondary DNS server address

         //

-        NetCopyMem (&ConfigData->SecondaryDns, &OptionList[Index]->Data[4], sizeof (EFI_IPv4_ADDRESS));

+        CopyMem (&ConfigData->SecondaryDns, &OptionList[Index]->Data[4], sizeof (EFI_IPv4_ADDRESS));

       }

     } else if (OptionList[Index]->OpCode == DHCP4_TAG_SERVER_ID) {

       if (OptionList[Index]->Length != 4) {

@@ -357,11 +357,11 @@ Returns:
         break;

       }

 

-      NetCopyMem (&ConfigData->DhcpServer, &OptionList[Index]->Data[0], sizeof (EFI_IPv4_ADDRESS));

+      CopyMem (&ConfigData->DhcpServer, &OptionList[Index]->Data[0], sizeof (EFI_IPv4_ADDRESS));

     }

   }

 

-  NetFreePool (OptionList);

+  gBS->FreePool (OptionList);

 

   return Status;

 }

@@ -428,7 +428,7 @@ Returns:
     goto ON_EXIT;

   }

 

-  ParaList = NetAllocatePool (sizeof (EFI_DHCP4_PACKET_OPTION) + 3);

+  ParaList = AllocatePool (sizeof (EFI_DHCP4_PACKET_OPTION) + 3);

   if (ParaList == NULL) {

     Status = EFI_OUT_OF_RESOURCES;

     goto ON_EXIT;

@@ -443,7 +443,7 @@ Returns:
   ParaList->Data[2] = DHCP4_TAG_DNS;

   ParaList->Data[3] = DHCP4_TAG_ROOT_PATH;

 

-  NetZeroMem (&Dhcp4ConfigData, sizeof (EFI_DHCP4_CONFIG_DATA));

+  ZeroMem (&Dhcp4ConfigData, sizeof (EFI_DHCP4_CONFIG_DATA));

   Dhcp4ConfigData.OptionCount = 1;

   Dhcp4ConfigData.OptionList  = &ParaList;

 

@@ -472,7 +472,7 @@ Returns:
 ON_EXIT:

 

   if (ParaList != NULL) {

-    NetFreePool (ParaList);

+    gBS->FreePool (ParaList);

   }

 

   if (Dhcp4 != NULL) {

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
index 1602d5b..8cc2a50 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
@@ -362,7 +362,7 @@ Returns:
     }

 

     if (DeviceHandleBuffer != NULL) {

-      NetFreePool (DeviceHandleBuffer);

+      gBS->FreePool (DeviceHandleBuffer);

     }

   }

   //

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
index 2729c3b..697424a 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) {

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
index 0c06437..cd4be8b 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c
@@ -42,7 +42,7 @@ Returns:
 

 --*/

 {

-  NetZeroMem (Header, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER));

+  ZeroMem (Header, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_HEADER));

 

   Header->Signature = EFI_ACPI_3_0_ISCSI_BOOT_FIRMWARE_TABLE_SIGNATURE;

   Header->Length    = IBFT_HEAP_OFFSET;

@@ -85,7 +85,7 @@ Returns:
 

   Control = (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE *) (Table + 1);

 

-  NetZeroMem (Control, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE));

+  ZeroMem (Control, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE));

 

   Control->Header.StructureId = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_ID;

   Control->Header.Version     = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_CONTROL_STRUCTURE_VERSION;

@@ -136,7 +136,7 @@ Returns:
   //

   *Heap -= Len + 1;

 

-  NetCopyMem (*Heap, Data, Len);

+  CopyMem (*Heap, Data, Len);

   *(*Heap + Len) = 0;

 }

 

@@ -181,7 +181,7 @@ Returns:
 

   Control->InitiatorOffset = (UINT16) ((UINTN) Initiator - (UINTN) Table);

 

-  NetZeroMem (Initiator, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE));

+  ZeroMem (Initiator, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE));

 

   Initiator->Header.StructureId = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_ID;

   Initiator->Header.Version     = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_INITIATOR_STRUCTURE_VERSION;

@@ -234,7 +234,7 @@ Returns:
 {

   UINTN Index;

 

-  NetZeroMem (V6, sizeof (EFI_IPv6_ADDRESS));

+  ZeroMem (V6, sizeof (EFI_IPv6_ADDRESS));

 

   V6->Addr[10]  = 0xff;

   V6->Addr[11]  = 0xff;

@@ -405,7 +405,7 @@ Returns:
     //

     // Fill the Nic section.

     //

-    NetZeroMem (Nic, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE));

+    ZeroMem (Nic, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE));

 

     Nic->Header.StructureId = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_ID;

     Nic->Header.Version     = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_NIC_STRUCTURE_VERSION;

@@ -435,7 +435,7 @@ Returns:
     IScsiMapV4ToV6Addr (&SessionConfigData->DhcpServer, &Nic->DhcpServer);

 

     Mac = IScsiGetMacAddress (DriverData->Controller);

-    NetCopyMem (Nic->Mac, Mac, sizeof (Nic->Mac));

+    CopyMem (Nic->Mac, Mac, sizeof (Nic->Mac));

 

     //

     // Get the PCI location of the Nic.

@@ -448,7 +448,7 @@ Returns:
     //

     // Fill the Target section.

     //

-    NetZeroMem (Target, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE));

+    ZeroMem (Target, sizeof (EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE));

 

     Target->Header.StructureId  = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_ID;

     Target->Header.Version      = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_TARGET_STRUCTURE_VERSION;

@@ -460,7 +460,7 @@ Returns:
     Target->NicIndex            = (UINT8) Index;

 

     IScsiMapV4ToV6Addr (&SessionConfigData->NvData.TargetIp, &Target->Ip);

-    NetCopyMem (Target->BootLun, SessionConfigData->NvData.BootLun, sizeof (Target->BootLun));

+    CopyMem (Target->BootLun, SessionConfigData->NvData.BootLun, sizeof (Target->BootLun));

 

     //

     // Target iSCSI Name, CHAP name/secret, reverse CHAP name/secret.

@@ -572,7 +572,7 @@ Returns:
     }

 

     Signature = Table->Signature;

-    NetFreePool (Table);

+    gBS->FreePool (Table);

 

     if (Signature == EFI_ACPI_3_0_ISCSI_BOOT_FIRMWARE_TABLE_SIGNATURE) {

       //

@@ -608,7 +608,7 @@ Returns:
   //

   // Allocate 4k bytes to hold the ACPI table.

   //

-  Table = NetAllocatePool (IBFT_MAX_SIZE);

+  Table = AllocatePool (IBFT_MAX_SIZE);

   if (Table == NULL) {

     return ;

   }

@@ -623,7 +623,7 @@ Returns:
   IScsiFillInitiatorSection (Table, &Heap, HandleBuffer[0]);

   IScsiFillNICAndTargetSections (Table, &Heap, HandleCount, HandleBuffer);

 

-  NetFreePool (HandleBuffer);

+  gBS->FreePool (HandleBuffer);

 

   TableHandle = 0;

 

@@ -641,5 +641,5 @@ Returns:
     AcpiSupport->PublishTables (AcpiSupport, EFI_ACPI_TABLE_VERSION_3_0);

   }

 

-  NetFreePool (Table);

+  gBS->FreePool (Table);

 }

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
index 7019a78..1eb4b4b 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
@@ -57,10 +57,10 @@ struct _ISCSI_SESSION {
   UINT32                    InitiatorTaskTag;

   UINT16                    NextCID;

 

-  NET_LIST_ENTRY            Conns;

+  LIST_ENTRY                Conns;

   UINT32                    NumConns;

 

-  NET_LIST_ENTRY            TcbList;

+  LIST_ENTRY                TcbList;

 

   //

   // session-wide parameters

@@ -83,7 +83,7 @@ struct _ISCSI_SESSION {
 

 struct _ISCSI_CONNECTION {

   UINT32            Signature;

-  NET_LIST_ENTRY    Link;

+  LIST_ENTRY        Link;

 

   EFI_EVENT         TimeoutEvent;

 

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
index 8dee904..1683d88 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
@@ -198,8 +198,8 @@ Returns:
   CHAR8   Digit;

   UINTN   Temp;

 

-  NetZeroMem (Lun, 8);

-  NetZeroMem (LunUnitStr, sizeof (LunUnitStr));

+  ZeroMem (Lun, 8);

+  ZeroMem (LunUnitStr, sizeof (LunUnitStr));

 

   Index         = 0;

   LunUnitStr[0] = Str;

@@ -667,7 +667,7 @@ Returns:
   ISCSI_DRIVER_DATA *Private;

   EFI_STATUS        Status;

 

-  Private = NetAllocateZeroPool (sizeof (ISCSI_DRIVER_DATA));

+  Private = AllocateZeroPool (sizeof (ISCSI_DRIVER_DATA));

   if (Private == NULL) {

     return NULL;

   }

@@ -688,11 +688,11 @@ Returns:
                   &Private->ExitBootServiceEvent

                   );

   if (EFI_ERROR (Status)) {

-    NetFreePool (Private);

+    gBS->FreePool (Private);

     return NULL;

   }

 

-  NetCopyMem(&Private->IScsiExtScsiPassThru, &gIScsiExtScsiPassThruProtocolTemplate, sizeof(EFI_EXT_SCSI_PASS_THRU_PROTOCOL));

+  CopyMem(&Private->IScsiExtScsiPassThru, &gIScsiExtScsiPassThruProtocolTemplate, sizeof(EFI_EXT_SCSI_PASS_THRU_PROTOCOL));

 

   //

   // 0 is designated to the TargetId, so use another value for the AdapterId.

@@ -713,7 +713,7 @@ Returns:
                   );

   if (EFI_ERROR (Status)) {

     gBS->CloseEvent (Private->ExitBootServiceEvent);

-    NetFreePool (Private);

+    gBS->FreePool (Private);

 

     return NULL;

   }

@@ -750,7 +750,7 @@ Returns:
           Private->DevicePath

           );

 

-    NetFreePool (Private->DevicePath);

+    gBS->FreePool (Private->DevicePath);

   }

 

   if (Private->ExtScsiPassThruHandle != NULL) {

@@ -763,7 +763,7 @@ Returns:
 

   gBS->CloseEvent (Private->ExitBootServiceEvent);

 

-  NetFreePool (Private);

+  gBS->FreePool (Private);

 }

 

 EFI_STATUS

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
index 93e03b0..8607558 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
@@ -43,7 +43,7 @@ Returns:
 

 --*/

 {

-  NetListInsertTail (&Session->Conns, &Conn->Link);

+  InsertTailList (&Session->Conns, &Conn->Link);

   Conn->Session = Session;

   Session->NumConns++;

 }

@@ -68,7 +68,7 @@ Returns:
 

 --*/

 {

-  NetListRemoveEntry (&Conn->Link);

+  RemoveEntryList (&Conn->Link);

   Conn->Session->NumConns--;

   Conn->Session = NULL;

 }

@@ -259,7 +259,7 @@ Returns:
   TCP4_IO_CONFIG_DATA Tcp4IoConfig;

   EFI_STATUS          Status;

 

-  Conn = NetAllocatePool (sizeof (ISCSI_CONNECTION));

+  Conn = AllocatePool (sizeof (ISCSI_CONNECTION));

   if (Conn == NULL) {

     return NULL;

   }

@@ -276,13 +276,13 @@ Returns:
 

   Status = gBS->CreateEvent (

                   EFI_EVENT_TIMER,

-                  NET_TPL_TIMER,

+                  TPL_CALLBACK,

                   NULL,

                   NULL,

                   &Conn->TimeoutEvent

                   );

   if (EFI_ERROR (Status)) {

-    NetFreePool (Conn);

+    gBS->FreePool (Conn);

     return NULL;

   }

 

@@ -295,10 +295,10 @@ Returns:
   Conn->HeaderDigest              = ISCSI_DIGEST_NONE;

   Conn->DataDigest                = ISCSI_DIGEST_NONE;

 

-  NetCopyMem (&Tcp4IoConfig.LocalIp, &Session->ConfigData.NvData.LocalIp, sizeof (EFI_IPv4_ADDRESS));

-  NetCopyMem (&Tcp4IoConfig.SubnetMask, &Session->ConfigData.NvData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));

-  NetCopyMem (&Tcp4IoConfig.Gateway, &Session->ConfigData.NvData.Gateway, sizeof (EFI_IPv4_ADDRESS));

-  NetCopyMem (&Tcp4IoConfig.RemoteIp, &Session->ConfigData.NvData.TargetIp, sizeof (EFI_IPv4_ADDRESS));

+  CopyMem (&Tcp4IoConfig.LocalIp, &Session->ConfigData.NvData.LocalIp, sizeof (EFI_IPv4_ADDRESS));

+  CopyMem (&Tcp4IoConfig.SubnetMask, &Session->ConfigData.NvData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));

+  CopyMem (&Tcp4IoConfig.Gateway, &Session->ConfigData.NvData.Gateway, sizeof (EFI_IPv4_ADDRESS));

+  CopyMem (&Tcp4IoConfig.RemoteIp, &Session->ConfigData.NvData.TargetIp, sizeof (EFI_IPv4_ADDRESS));

 

   Tcp4IoConfig.RemotePort = Session->ConfigData.NvData.TargetPort;

 

@@ -313,7 +313,7 @@ Returns:
             );

   if (EFI_ERROR (Status)) {

     gBS->CloseEvent (Conn->TimeoutEvent);

-    NetFreePool (Conn);

+    gBS->FreePool (Conn);

     Conn = NULL;

   }

 

@@ -343,7 +343,7 @@ Returns:
   Tcp4IoDestroySocket (&Conn->Tcp4Io);

   NetbufQueFlush (&Conn->RspQue);

   gBS->CloseEvent (Conn->TimeoutEvent);

-  NetFreePool (Conn);

+  gBS->FreePool (Conn);

 }

 

 EFI_STATUS

@@ -553,7 +553,7 @@ Returns:
   //

   // Add the key.

   //

-  NetCopyMem (Data, Key, KeyLen);

+  CopyMem (Data, Key, KeyLen);

   Data += KeyLen;

 

   *Data = '=';

@@ -562,7 +562,7 @@ Returns:
   //

   // Add the value.

   //

-  NetCopyMem (Data, Value, ValueLen);

+  CopyMem (Data, Value, ValueLen);

   Data += ValueLen;

 

   *Data = '\0';

@@ -608,7 +608,7 @@ Returns:
   }

 

   LoginReq = (ISCSI_LOGIN_REQUEST *) NetbufAllocSpace (Nbuf, sizeof (ISCSI_LOGIN_REQUEST), NET_BUF_TAIL);

-  NetZeroMem (LoginReq, sizeof (ISCSI_LOGIN_REQUEST));

+  ZeroMem (LoginReq, sizeof (ISCSI_LOGIN_REQUEST));

 

   //

   // Init the login request pdu

@@ -630,7 +630,7 @@ Returns:
   // with their increasing StatSN values.

   //

   LoginReq->ExpStatSN = HTONL (Conn->ExpStatSN);

-  NetCopyMem (LoginReq->ISID, Session->ISID, sizeof (LoginReq->ISID));

+  CopyMem (LoginReq->ISID, Session->ISID, sizeof (LoginReq->ISID));

 

   if (Conn->PartialRspRcvd) {

     //

@@ -777,7 +777,7 @@ Returns:
       (CurrentStage != Conn->CurrentStage) ||

       (!Conn->TransitInitiated && Transit) ||

       (Transit && (NextStage != Conn->NextStage)) ||

-      (NetCompareMem (Session->ISID, LoginRsp->ISID, sizeof (LoginRsp->ISID)) != 0) ||

+      (CompareMem (Session->ISID, LoginRsp->ISID, sizeof (LoginRsp->ISID)) != 0) ||

       (LoginRsp->InitiatorTaskTag != Session->InitiatorTaskTag)

       ) {

     //

@@ -913,7 +913,7 @@ Returns:
 

 --*/

 {

-  NET_LIST_ENTRY  *KeyValueList;

+  LIST_ENTRY      *KeyValueList;

   CHAR8           *TargetAddress;

   CHAR8           *IpStr;

   EFI_STATUS      Status;

@@ -1011,8 +1011,8 @@ Returns:
 {

   ASSERT (Arg != NULL);

 

-  NetbufFreeList ((NET_LIST_ENTRY *) Arg);

-  NetFreePool (Arg);

+  NetbufFreeList ((LIST_ENTRY     *) Arg);

+  gBS->FreePool (Arg);

 }

 

 VOID

@@ -1072,7 +1072,7 @@ Returns:
 

 --*/

 {

-  NET_LIST_ENTRY  *NbufList;

+  LIST_ENTRY      *NbufList;

   UINT32          Len;

   NET_BUF         *PduHdr;

   UINT8           *Header;

@@ -1084,12 +1084,12 @@ Returns:
   NET_BUF         *DataSeg;

   UINT32          PadAndCRC32[2];

 

-  NbufList = NetAllocatePool (sizeof (NET_LIST_ENTRY));

+  NbufList = AllocatePool (sizeof (LIST_ENTRY    ));

   if (NbufList == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

 

-  NetListInit (NbufList);

+  InitializeListHead (NbufList);

 

   //

   // The header digest will be received together with the PDU header if exists.

@@ -1102,7 +1102,7 @@ Returns:
   }

 

   Header = NetbufAllocSpace (PduHdr, Len, NET_BUF_TAIL);

-  NetListInsertTail (NbufList, &PduHdr->List);

+  InsertTailList (NbufList, &PduHdr->List);

 

   //

   // First step, receive the BHS of the PDU.

@@ -1197,7 +1197,7 @@ Returns:
     goto ON_EXIT;

   }

 

-  NetListInsertTail (NbufList, &DataSeg->List);

+  InsertTailList (NbufList, &DataSeg->List);

 

   //

   // Receive the data segment with the data digest if any.

@@ -1266,7 +1266,7 @@ Returns:
 --*/

 {

   EFI_STATUS      Status;

-  NET_LIST_ENTRY  *KeyValueList;

+  LIST_ENTRY      *KeyValueList;

   CHAR8           *Data;

   UINT32          Len;

   ISCSI_SESSION   *Session;

@@ -1278,7 +1278,7 @@ Returns:
   Session = Conn->Session;

 

   Len     = Conn->RspQue.BufSize;

-  Data    = NetAllocatePool (Len);

+  Data    = AllocatePool (Len);

   if (Data == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

@@ -1292,7 +1292,7 @@ Returns:
   //

   KeyValueList = IScsiBuildKeyValueList (Data, Len);

   if (KeyValueList == NULL) {

-    NetFreePool (Data);

+    gBS->FreePool (Data);

     return Status;

   }

   //

@@ -1488,7 +1488,7 @@ Returns:
   IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_TARGET_ALIAS);

   IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_TARGET_PORTAL_GROUP_TAG);

 

-  if (NetListIsEmpty (KeyValueList)) {

+  if (IsListEmpty (KeyValueList)) {

     //

     // Succeed if no more keys in the list.

     //

@@ -1499,7 +1499,7 @@ ON_ERROR:
 

   IScsiFreeKeyValueList (KeyValueList);

 

-  NetFreePool (Data);

+  gBS->FreePool (Data);

 

   return Status;

 }

@@ -1612,13 +1612,13 @@ Returns:
       return EFI_OUT_OF_RESOURCES;

     }

 

-    NetZeroMem (Data, PadLen);

+    ZeroMem (Data, PadLen);

   }

 

   return EFI_SUCCESS;

 }

 

-NET_LIST_ENTRY *

+LIST_ENTRY     *

 IScsiBuildKeyValueList (

   IN CHAR8  *Data,

   IN UINT32 Len

@@ -1640,23 +1640,23 @@ Returns:
 

 --*/

 {

-  NET_LIST_ENTRY        *ListHead;

+  LIST_ENTRY            *ListHead;

   ISCSI_KEY_VALUE_PAIR  *KeyValuePair;

 

-  ListHead = NetAllocatePool (sizeof (NET_LIST_ENTRY));

+  ListHead = AllocatePool (sizeof (LIST_ENTRY    ));

   if (ListHead == NULL) {

     return NULL;

   }

 

-  NetListInit (ListHead);

+  InitializeListHead (ListHead);

 

   while (Len > 0) {

-    KeyValuePair = NetAllocatePool (sizeof (ISCSI_KEY_VALUE_PAIR));

+    KeyValuePair = AllocatePool (sizeof (ISCSI_KEY_VALUE_PAIR));

     if (KeyValuePair == NULL) {

       goto ON_ERROR;

     }

 

-    NetListInit (&KeyValuePair->List);

+    InitializeListHead (&KeyValuePair->List);

 

     KeyValuePair->Key = Data;

 

@@ -1671,13 +1671,13 @@ Returns:
       Data++;

       Len--;

     } else {

-      NetFreePool (KeyValuePair);

+      gBS->FreePool (KeyValuePair);

       goto ON_ERROR;

     }

 

     KeyValuePair->Value = Data;

 

-    NetListInsertTail (ListHead, &KeyValuePair->List);;

+    InsertTailList (ListHead, &KeyValuePair->List);;

 

     Data += AsciiStrLen (KeyValuePair->Value) + 1;

     Len -= (UINT32) AsciiStrLen (KeyValuePair->Value) + 1;

@@ -1694,7 +1694,7 @@ ON_ERROR:
 

 CHAR8 *

 IScsiGetValueByKeyFromList (

-  IN NET_LIST_ENTRY  *KeyValueList,

+  IN LIST_ENTRY      *KeyValueList,

   IN CHAR8           *Key

   )

 /*++

@@ -1715,7 +1715,7 @@ Returns:
 

 --*/

 {

-  NET_LIST_ENTRY        *Entry;

+  LIST_ENTRY            *Entry;

   ISCSI_KEY_VALUE_PAIR  *KeyValuePair;

   CHAR8                 *Value;

 

@@ -1727,8 +1727,8 @@ Returns:
     if (AsciiStrCmp (KeyValuePair->Key, Key) == 0) {

       Value = KeyValuePair->Value;

 

-      NetListRemoveEntry (&KeyValuePair->List);

-      NetFreePool (KeyValuePair);

+      RemoveEntryList (&KeyValuePair->List);

+      gBS->FreePool (KeyValuePair);

       break;

     }

   }

@@ -1738,7 +1738,7 @@ Returns:
 

 VOID

 IScsiFreeKeyValueList (

-  IN NET_LIST_ENTRY  *KeyValueList

+  IN LIST_ENTRY      *KeyValueList

   )

 /*++

 

@@ -1756,17 +1756,17 @@ Returns:
 

 --*/

 {

-  NET_LIST_ENTRY        *Entry;

+  LIST_ENTRY            *Entry;

   ISCSI_KEY_VALUE_PAIR  *KeyValuePair;

 

-  while (!NetListIsEmpty (KeyValueList)) {

+  while (!IsListEmpty (KeyValueList)) {

     Entry         = NetListRemoveHead (KeyValueList);

     KeyValuePair  = NET_LIST_USER_STRUCT (Entry, ISCSI_KEY_VALUE_PAIR, List);

 

-    NetFreePool (KeyValuePair);

+    gBS->FreePool (KeyValuePair);

   }

 

-  NetFreePool (KeyValueList);

+  gBS->FreePool (KeyValueList);

 }

 

 EFI_STATUS

@@ -1816,7 +1816,7 @@ Returns:
     }

   }

 

-  if ((Len < 4) || (NetCompareMem (Name, "iqn.", 4) != 0)) {

+  if ((Len < 4) || (CompareMem (Name, "iqn.", 4) != 0)) {

     //

     // Only IQN format is accepted now.

     //

@@ -1860,19 +1860,19 @@ Returns:
     return EFI_NOT_READY;

   }

 

-  NewTcb = NetAllocateZeroPool (sizeof (ISCSI_TCB));

+  NewTcb = AllocateZeroPool (sizeof (ISCSI_TCB));

   if (NewTcb == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

 

-  NetListInit (&NewTcb->Link);

+  InitializeListHead (&NewTcb->Link);

 

   NewTcb->SoFarInOrder      = TRUE;

   NewTcb->InitiatorTaskTag  = Session->InitiatorTaskTag;

   NewTcb->CmdSN             = Session->CmdSN;

   NewTcb->Conn              = Conn;

 

-  NetListInsertTail (&Session->TcbList, &NewTcb->Link);

+  InsertTailList (&Session->TcbList, &NewTcb->Link);

 

   //

   // Advance the initiator task tag.

@@ -1905,14 +1905,14 @@ Returns:
 

 --*/

 {

-  NetListRemoveEntry (&Tcb->Link);

+  RemoveEntryList (&Tcb->Link);

 

-  NetFreePool (Tcb);

+  gBS->FreePool (Tcb);

 }

 

 ISCSI_TCB *

 IScsiFindTcbByITT (

-  IN NET_LIST_ENTRY  *TcbList,

+  IN LIST_ENTRY      *TcbList,

   IN UINT32          InitiatorTaskTag

   )

 /*++

@@ -1933,7 +1933,7 @@ Returns:
 --*/

 {

   ISCSI_TCB       *Tcb;

-  NET_LIST_ENTRY  *Entry;

+  LIST_ENTRY      *Entry;

 

   Tcb = NULL;

 

@@ -2022,7 +2022,7 @@ Returns:
 

 --*/

 {

-  NET_LIST_ENTRY                  *NbufList;

+  LIST_ENTRY                      *NbufList;

   NET_BUF                         *Pdu;

   NET_BUF                         *PduHeader;

   NET_BUF                         *DataSeg;

@@ -2060,7 +2060,7 @@ Returns:
   ScsiCmd = (SCSI_COMMAND *) NetbufAllocSpace (PduHeader, Length, NET_BUF_TAIL);

   Header  = (ISCSI_ADDITIONAL_HEADER *) (ScsiCmd + 1);

 

-  NetZeroMem (ScsiCmd, Length);

+  ZeroMem (ScsiCmd, Length);

 

   ISCSI_SET_OPCODE (ScsiCmd, ISCSI_OPCODE_SCSI_CMD, 0);

   ISCSI_SET_FLAG (ScsiCmd, ISCSI_TASK_ATTR_SIMPLE);

@@ -2097,18 +2097,18 @@ Returns:
   }

 

   ScsiCmd->TotalAHSLength = AHSLength;

-  NetCopyMem (ScsiCmd->Lun, &Lun, sizeof (ScsiCmd->Lun));

+  CopyMem (ScsiCmd->Lun, &Lun, sizeof (ScsiCmd->Lun));

   ScsiCmd->InitiatorTaskTag = NTOHL (Tcb->InitiatorTaskTag);

   ScsiCmd->CmdSN            = NTOHL (Tcb->CmdSN);

   ScsiCmd->ExpStatSN        = NTOHL (Tcb->Conn->ExpStatSN);

 

-  NetCopyMem (ScsiCmd->CDB, Packet->Cdb, sizeof (ScsiCmd->CDB));

+  CopyMem (ScsiCmd->CDB, Packet->Cdb, sizeof (ScsiCmd->CDB));

 

   if (Packet->CdbLength > 16) {

     Header->Length  = NTOHS (Packet->CdbLength - 15);

     Header->Type    = ISCSI_AHS_TYPE_EXT_CDB;

 

-    NetCopyMem (Header + 1, (UINT8 *) Packet->Cdb + 16, Packet->CdbLength - 16);

+    CopyMem (Header + 1, (UINT8 *) Packet->Cdb + 16, Packet->CdbLength - 16);

   }

 

   Pdu               = PduHeader;

@@ -2139,7 +2139,7 @@ Returns:
       goto ON_EXIT;

     }

 

-    NbufList = NetAllocatePool (sizeof (NET_LIST_ENTRY));

+    NbufList = AllocatePool (sizeof (LIST_ENTRY    ));

     if (NbufList == NULL) {

       NetbufFree (PduHeader);

       NetbufFree (DataSeg);

@@ -2148,9 +2148,9 @@ Returns:
       goto ON_EXIT;

     }

 

-    NetListInit (NbufList);

-    NetListInsertTail (NbufList, &PduHeader->List);

-    NetListInsertTail (NbufList, &DataSeg->List);

+    InitializeListHead (NbufList);

+    InsertTailList (NbufList, &PduHeader->List);

+    InsertTailList (NbufList, &DataSeg->List);

 

     Pdu = NetbufFromBufList (NbufList, 0, 0, IScsiFreeNbufList, NbufList);

     if (Pdu == NULL) {

@@ -2205,37 +2205,37 @@ Returns:
 

 --*/

 {

-  NET_LIST_ENTRY      *NbufList;

+  LIST_ENTRY          *NbufList;

   NET_BUF             *PduHdr;

   NET_BUF             *DataSeg;

   NET_BUF             *Pdu;

   ISCSI_SCSI_DATA_OUT *DataOutHdr;

   ISCSI_XFER_CONTEXT  *XferContext;

 

-  NbufList = NetAllocatePool (sizeof (NET_LIST_ENTRY));

+  NbufList = AllocatePool (sizeof (LIST_ENTRY    ));

   if (NbufList == NULL) {

     return NULL;

   }

 

-  NetListInit (NbufList);

+  InitializeListHead (NbufList);

 

   //

   // Allocate memory for the BHS.

   //

   PduHdr = NetbufAlloc (sizeof (ISCSI_SCSI_DATA_OUT));

   if (PduHdr == NULL) {

-    NetFreePool (NbufList);

+    gBS->FreePool (NbufList);

     return NULL;

   }

   //

   // Insert the BHS into the buffer list.

   //

-  NetListInsertTail (NbufList, &PduHdr->List);

+  InsertTailList (NbufList, &PduHdr->List);

 

   DataOutHdr  = (ISCSI_SCSI_DATA_OUT *) NetbufAllocSpace (PduHdr, sizeof (ISCSI_SCSI_DATA_OUT), NET_BUF_TAIL);

   XferContext = &Tcb->XferContext;

 

-  NetZeroMem (DataOutHdr, sizeof (ISCSI_SCSI_DATA_OUT));

+  ZeroMem (DataOutHdr, sizeof (ISCSI_SCSI_DATA_OUT));

 

   //

   // Set the flags and fields of the Data Out PDU BHS.

@@ -2250,7 +2250,7 @@ Returns:
   DataOutHdr->BufferOffset      = HTONL (XferContext->Offset);

 

   if (XferContext->TargetTransferTag != ISCSI_RESERVED_TAG) {

-    NetCopyMem (&DataOutHdr->Lun, &Lun, sizeof (DataOutHdr->Lun));

+    CopyMem (&DataOutHdr->Lun, &Lun, sizeof (DataOutHdr->Lun));

   }

   //

   // Build the data segment for this Data Out PDU.

@@ -2264,7 +2264,7 @@ Returns:
   // Put the data segment into the buffer list and combine it with the BHS

   // into a full Data Out PDU.

   //

-  NetListInsertTail (NbufList, &DataSeg->List);

+  InsertTailList (NbufList, &DataSeg->List);

   Pdu = NetbufFromBufList (NbufList, 0, 0, IScsiFreeNbufList, NbufList);

   if (Pdu == NULL) {

     IScsiFreeNbufList (NbufList);

@@ -2273,7 +2273,7 @@ Returns:
   return Pdu;

 }

 

-NET_LIST_ENTRY *

+LIST_ENTRY     *

 IScsiGenerateDataOutPduSequence (

   IN UINT8      *Data,

   IN ISCSI_TCB  *Tcb,

@@ -2297,19 +2297,19 @@ Returns:
 

 --*/

 {

-  NET_LIST_ENTRY      *PduList;

+  LIST_ENTRY          *PduList;

   UINT32              DataSN;

   UINT32              DataLen;

   NET_BUF             *DataOutPdu;

   ISCSI_CONNECTION    *Conn;

   ISCSI_XFER_CONTEXT  *XferContext;

 

-  PduList = NetAllocatePool (sizeof (NET_LIST_ENTRY));

+  PduList = AllocatePool (sizeof (LIST_ENTRY    ));

   if (PduList == NULL) {

     return NULL;

   }

 

-  NetListInit (PduList);

+  InitializeListHead (PduList);

 

   DataSN      = 0;

   Conn        = Tcb->Conn;

@@ -2334,7 +2334,7 @@ Returns:
       goto ON_EXIT;

     }

 

-    NetListInsertTail (PduList, &DataOutPdu->List);

+    InsertTailList (PduList, &DataOutPdu->List);

 

     //

     // Update the context and DataSN.

@@ -2378,8 +2378,8 @@ Returns:
 

 --*/

 {

-  NET_LIST_ENTRY  *DataOutPduList;

-  NET_LIST_ENTRY  *Entry;

+  LIST_ENTRY      *DataOutPduList;

+  LIST_ENTRY      *Entry;

   NET_BUF         *Pdu;

   EFI_STATUS      Status;

 

@@ -2671,7 +2671,7 @@ Returns:
 

     Packet->SenseDataLength = (UINT8) MIN (SenseData->Length, Packet->SenseDataLength);

     if (Packet->SenseDataLength != 0) {

-      NetCopyMem (Packet->SenseData, &SenseData->Data[0], Packet->SenseDataLength);

+      CopyMem (Packet->SenseData, &SenseData->Data[0], Packet->SenseDataLength);

     }

   } else {

     Packet->SenseDataLength = 0;

@@ -2999,8 +2999,8 @@ Returns:
     Session->ISID[4]    = (UINT8) Random;

     Session->ISID[5]    = (UINT8) (Random >> 8);

 

-    NetListInit (&Session->Conns);

-    NetListInit (&Session->TcbList);

+    InitializeListHead (&Session->Conns);

+    InitializeListHead (&Session->TcbList);

   }

 

   Session->TSIH                 = 0;

@@ -3051,11 +3051,11 @@ Returns:
     return EFI_SUCCESS;

   }

 

-  ASSERT (!NetListIsEmpty (&Session->Conns));

+  ASSERT (!IsListEmpty (&Session->Conns));

 

   Private = ISCSI_DRIVER_DATA_FROM_SESSION (Session);

 

-  while (!NetListIsEmpty (&Session->Conns)) {

+  while (!IsListEmpty (&Session->Conns)) {

     Conn = NET_LIST_USER_STRUCT_S (

             Session->Conns.ForwardLink,

             ISCSI_CONNECTION,

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
index d01b635..d9325e3 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
@@ -608,7 +608,7 @@ typedef struct _ISCSI_IN_BUFFER_CONTEXT {
 } ISCSI_IN_BUFFER_CONTEXT;

 

 typedef struct _ISCSI_TCB {

-  NET_LIST_ENTRY      Link;

+  LIST_ENTRY          Link;

 

   BOOLEAN             SoFarInOrder;

   UINT32              ExpDataSN;

@@ -627,7 +627,7 @@ typedef struct _ISCSI_TCB {
 } ISCSI_TCB;

 

 typedef struct _ISCSI_KEY_VALUE_PAIR {

-  NET_LIST_ENTRY  List;

+  LIST_ENTRY      List;

 

   CHAR8           *Key;

   CHAR8           *Value;

@@ -736,7 +736,7 @@ IScsiPadSegment (
   IN UINT32   Len

   );

 

-NET_LIST_ENTRY    *

+LIST_ENTRY        *

 IScsiBuildKeyValueList (

   IN CHAR8  *Data,

   IN UINT32 Len

@@ -744,13 +744,13 @@ IScsiBuildKeyValueList (
 

 CHAR8             *

 IScsiGetValueByKeyFromList (

-  IN NET_LIST_ENTRY  *KeyValueList,

+  IN LIST_ENTRY      *KeyValueList,

   IN CHAR8           *Key

   );

 

 VOID

 IScsiFreeKeyValueList (

-  IN NET_LIST_ENTRY  *KeyValueList

+  IN LIST_ENTRY      *KeyValueList

   );

 

 EFI_STATUS

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
index d43437b..06caf72 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
@@ -144,9 +144,9 @@ Returns:
   AccessPoint->RemotePort = ConfigData->RemotePort;

   AccessPoint->ActiveFlag = TRUE;

 

-  NetCopyMem (&AccessPoint->StationAddress, &ConfigData->LocalIp, sizeof (EFI_IPv4_ADDRESS));

-  NetCopyMem (&AccessPoint->SubnetMask, &ConfigData->SubnetMask, sizeof (EFI_IPv4_ADDRESS));

-  NetCopyMem (&AccessPoint->RemoteAddress, &ConfigData->RemoteIp, sizeof (EFI_IPv4_ADDRESS));

+  CopyMem (&AccessPoint->StationAddress, &ConfigData->LocalIp, sizeof (EFI_IPv4_ADDRESS));

+  CopyMem (&AccessPoint->SubnetMask, &ConfigData->SubnetMask, sizeof (EFI_IPv4_ADDRESS));

+  CopyMem (&AccessPoint->RemoteAddress, &ConfigData->RemoteIp, sizeof (EFI_IPv4_ADDRESS));

 

   //

   // Configure the TCP4 protocol.

@@ -170,7 +170,7 @@ Returns:
   //

   Status = gBS->CreateEvent (

                   EFI_EVENT_NOTIFY_SIGNAL,

-                  NET_TPL_EVENT,

+                  TPL_NOTIFY,

                   Tcp4IoCommonNotify,

                   &Tcp4Io->IsConnDone,

                   &Tcp4Io->ConnToken.CompletionToken.Event

@@ -181,7 +181,7 @@ Returns:
 

   Status = gBS->CreateEvent (

                   EFI_EVENT_NOTIFY_SIGNAL,

-                  NET_TPL_EVENT,

+                  TPL_NOTIFY,

                   Tcp4IoCommonNotify,

                   &Tcp4Io->IsTxDone,

                   &Tcp4Io->TxToken.CompletionToken.Event

@@ -192,7 +192,7 @@ Returns:
 

   Status = gBS->CreateEvent (

                   EFI_EVENT_NOTIFY_SIGNAL,

-                  NET_TPL_EVENT,

+                  TPL_NOTIFY,

                   Tcp4IoCommonNotify,

                   &Tcp4Io->IsRxDone,

                   &Tcp4Io->RxToken.CompletionToken.Event

@@ -203,7 +203,7 @@ Returns:
 

   Status = gBS->CreateEvent (

                   EFI_EVENT_NOTIFY_SIGNAL,

-                  NET_TPL_EVENT,

+                  TPL_NOTIFY,

                   Tcp4IoCommonNotify,

                   &Tcp4Io->IsCloseDone,

                   &Tcp4Io->CloseToken.CompletionToken.Event

@@ -406,7 +406,7 @@ Returns:
   EFI_TCP4_PROTOCOL       *Tcp4;

   EFI_STATUS              Status;

 

-  TxData = NetAllocatePool (sizeof (EFI_TCP4_TRANSMIT_DATA) + (Packet->BlockOpNum - 1) * sizeof (EFI_TCP4_FRAGMENT_DATA));

+  TxData = AllocatePool (sizeof (EFI_TCP4_TRANSMIT_DATA) + (Packet->BlockOpNum - 1) * sizeof (EFI_TCP4_FRAGMENT_DATA));

   if (TxData == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

@@ -442,7 +442,7 @@ Returns:
 

 ON_EXIT:

 

-  NetFreePool (TxData);

+  gBS->FreePool (TxData);

 

   return Status;

 }

@@ -485,7 +485,7 @@ Returns:
   UINT32                CurrentFragment;

 

   FragmentCount = Packet->BlockOpNum;

-  Fragment      = NetAllocatePool (FragmentCount * sizeof (NET_FRAGMENT));

+  Fragment      = AllocatePool (FragmentCount * sizeof (NET_FRAGMENT));

   if (Fragment == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

@@ -544,7 +544,7 @@ Returns:
 

 ON_EXIT:

 

-  NetFreePool (Fragment);

+  gBS->FreePool (Fragment);

 

   return Status;

 }

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c
index 44aceae..a86144b 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c
@@ -155,7 +155,7 @@ Returns:
   //

   // Copy MD5 states to S

   //

-  NetCopyMem (S, Md5Ctx->States, MD5_HASHSIZE);

+  CopyMem (S, Md5Ctx->States, MD5_HASHSIZE);

 

   t = 0;

   for (i = 0; i < 4; i++) {

@@ -205,7 +205,7 @@ Returns:
   UINTN Limit;

 

   for (Limit = 64 - Md5Ctx->Count; DataLen >= 64 - Md5Ctx->Count; Limit = 64) {

-    NetCopyMem (Md5Ctx->M + Md5Ctx->Count, (VOID *)Data, Limit);

+    CopyMem (Md5Ctx->M + Md5Ctx->Count, (VOID *)Data, Limit);

     MD5Transform (Md5Ctx);

     

     Md5Ctx->Count = 0;

@@ -213,7 +213,7 @@ Returns:
     DataLen      -= Limit;

   }

 

-  NetCopyMem (Md5Ctx->M + Md5Ctx->Count, (VOID *)Data, DataLen);

+  CopyMem (Md5Ctx->M + Md5Ctx->Count, (VOID *)Data, DataLen);

   Md5Ctx->Count += DataLen;

 }

 

@@ -237,7 +237,7 @@ Returns:
 

 --*/

 {

-  NetZeroMem (Md5Ctx, sizeof (*Md5Ctx));

+  ZeroMem (Md5Ctx, sizeof (*Md5Ctx));

 

   //

   // Set magic initialization constants.

@@ -311,8 +311,8 @@ Returns:
     //

     // Store Hashed value & Zeroize sensitive context information.

     //

-    NetCopyMem (HashVal, (UINT8 *) Md5Ctx->States, MD5_HASHSIZE);

-    NetZeroMem ((UINT8 *)Md5Ctx, sizeof (*Md5Ctx));

+    CopyMem (HashVal, (UINT8 *) Md5Ctx->States, MD5_HASHSIZE);

+    ZeroMem ((UINT8 *)Md5Ctx, sizeof (*Md5Ctx));

     

     return EFI_SUCCESS;

   }

@@ -327,7 +327,7 @@ Returns:
   Md5Ctx->Length = LShiftU64 (Md5Ctx->Length, 3);

   MD5UpdateBlock (Md5Ctx, (CONST UINT8 *) &Md5Ctx->Length, 8);

 

-  NetZeroMem (Md5Ctx->M, sizeof (Md5Ctx->M));

+  ZeroMem (Md5Ctx->M, sizeof (Md5Ctx->M));

   Md5Ctx->Length  = 0;

   Md5Ctx->Status  = EFI_ALREADY_STARTED;

   return MD5Final (Md5Ctx, HashVal);