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

MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c

@@ -1201,7 +1201,6 @@ BcStart (
     return EFI_ALREADY_STARTED;
   }
 
-#if !SUPPORT_IPV6
   //
   // Fail if IPv6 is requested and not supported.
   //
@@ -1210,7 +1209,6 @@ BcStart (
     EfiReleaseLock (&Private->Lock);
     return EFI_UNSUPPORTED;
   }
-#endif
   //
   // Setup shortcuts to SNP protocol and data structure.
   //
@@ -2174,7 +2172,7 @@ PxeBcDriverStart (
   if (EFI_ERROR (Status)) {
     goto PxeBcError;
   }
-  
+
   //
   // Get the Snp interface
   //
@@ -2223,12 +2221,8 @@ PxeBcDriverStart (
   // implementation supports IPv6.
   //
   Private->EfiBc.Mode->Ipv6Supported = SUPPORT_IPV6;
-
-#if SUPPORT_IPV6
-  Private->EfiBc.Mode->Ipv6Available = Private->NiiPtr->Ipv6Supported;
-#else
   Private->EfiBc.Mode->Ipv6Available = FALSE;
-#endif
+
   //
   // Set to TRUE by the BC constructor if this BC
   // implementation supports BIS.

MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c

@@ -1127,11 +1127,7 @@ MtftpDownload (
     // test of MTFTP server to make sure it handles mulitple opens correctly.
     // This code should NOT be enabled normally.
     //
-#ifdef SpecialNowaitVersion
-#pragma message ("This is special version for MTFTP regression test")
-    if (StartBlock || !LastBlock)
-#endif
-      if (((Status = MtftpListen (
+    if (((Status = MtftpListen (
                       Private,
                       &BufferSize,
                       BufferPtrLocal,
@@ -1148,7 +1144,7 @@ MtftpDownload (
         //
         // failed
         //
-      }
+    }
     //
     // if none were received, start block is not reset
     //

MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_udp.c

@@ -320,14 +320,6 @@ UdpRead (
     CopyMem (&TmpDestIp, &Private->EfiBc.Mode->StationIp, sizeof (EFI_IP_ADDRESS));
   }
 
-#if SUPPORT_IPV6
-  if (Private->EfiBc.Mode->UsingIpv6) {
-    //
-    // %%TBD
-    //
-  }
-#endif
-
   for (;;) {
     *BufferSizeptr = BufferSize;