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

[mirror_edk2.git] / MdeModulePkg / Universal / Network / PxeBcDxe / Pxe_bc_mtftp.c

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
index b065a53f3a31d290ae671187ce08bf7de5fc2020..108c2c987e4e8ff320ce2ab0d5ba76cfde323d2a 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
@@ -1101,8 +1101,8 @@ MtftpDownload (
 \r
   Filter.Filters    = EFI_PXE_BASE_CODE_IP_FILTER_BROADCAST;\r
   Filter.IpCnt      = 2;\r
-  Filter.IpList[0]  = Private->EfiBc.Mode->StationIp;\r
-  Filter.IpList[1]  = MtftpInfoPtr->MCastIp;\r
+  CopyMem (&Filter.IpList[0], &Private->EfiBc.Mode->StationIp, sizeof (EFI_IP_ADDRESS));\r
+  CopyMem (&Filter.IpList[1], &MtftpInfoPtr->MCastIp, sizeof (EFI_IP_ADDRESS));\r
 \r
   if ((Status = IpFilter (Private, &Filter)) != EFI_SUCCESS) {\r
     return Status;\r
@@ -1127,11 +1127,7 @@ MtftpDownload (
     // test of MTFTP server to make sure it handles mulitple opens correctly.\r
     // This code should NOT be enabled normally.\r
     //\r
-#ifdef SpecialNowaitVersion\r
-#pragma message ("This is special version for MTFTP regression test")\r
-    if (StartBlock || !LastBlock)\r
-#endif\r
-      if (((Status = MtftpListen (\r
+    if (((Status = MtftpListen (\r
                       Private,\r
                       &BufferSize,\r
                       BufferPtrLocal,\r
@@ -1148,7 +1144,7 @@ MtftpDownload (
         //\r
         // failed\r
         //\r
-      }\r
+    }\r
     //\r
     // if none were received, start block is not reset\r
     //\r