Sync the latest version from R8.

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

MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c

@@ -348,7 +348,7 @@ Mtftp4DriverBindingStop (
   NicHandle = NetLibGetNicHandle (Controller, &gEfiUdp4ProtocolGuid);
 
   if (NicHandle == NULL) {
-    return EFI_SUCCESS;
+    return EFI_DEVICE_ERROR;
   }
 
   Status = gBS->OpenProtocol (
@@ -370,38 +370,33 @@ Mtftp4DriverBindingStop (
     return EFI_SUCCESS;
   }
 
-  OldTpl             = NET_RAISE_TPL (NET_TPL_LOCK);
-  MtftpSb->InDestory = TRUE;
+  OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);
 
-  while (!NetListIsEmpty (&MtftpSb->Children)) {
-    Instance = NET_LIST_HEAD (&MtftpSb->Children, MTFTP4_PROTOCOL, Link);
-    Mtftp4ServiceBindingDestroyChild (ServiceBinding, Instance->Handle);
+  if (NumberOfChildren == 0) {
+
+    MtftpSb->InDestory = TRUE;
+
+    gBS->UninstallProtocolInterface (
+           NicHandle,
+           &gEfiMtftp4ServiceBindingProtocolGuid,
+           ServiceBinding
+           );
+
+    Mtftp4CleanService (MtftpSb);
+
+    NetFreePool (MtftpSb);
+  } else {
+
+    while (!NetListIsEmpty (&MtftpSb->Children)) {
+      Instance = NET_LIST_HEAD (&MtftpSb->Children, MTFTP4_PROTOCOL, Link);
+      Mtftp4ServiceBindingDestroyChild (ServiceBinding, Instance->Handle);
+    }
+
+    if (MtftpSb->ChildrenNum != 0) {
+      Status = EFI_DEVICE_ERROR;
+    }
   }
 
-  if (MtftpSb->ChildrenNum != 0) {
-    Status = EFI_DEVICE_ERROR;
-    goto ON_ERROR;
-  }
-
-  Status = gBS->UninstallProtocolInterface (
-                  NicHandle,
-                  &gEfiMtftp4ServiceBindingProtocolGuid,
-                  ServiceBinding
-                  );
-
-  if (EFI_ERROR (Status)) {
-    goto ON_ERROR;
-  }
-
-  Mtftp4CleanService (MtftpSb);
-  NetFreePool (MtftpSb);
-
-  NET_RESTORE_TPL (OldTpl);
-  return EFI_SUCCESS;
-
-ON_ERROR:
-  MtftpSb->InDestory = FALSE;
-
   NET_RESTORE_TPL (OldTpl);
   return Status;
 }

MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c

@@ -585,6 +585,16 @@ Mtftp4ConfigUnicastPort (
     return EFI_SUCCESS;
   }
 
+  if (!Config->UseDefaultSetting && !EFI_IP4_EQUAL (&mZeroIp4Addr, &Config->GatewayIp)) {
+    //
+    // The station IP address is manually configured and the Gateway IP is not 0.
+    // Add the default route for this UDP instance.
+    //
+    Status = UdpIo->Udp->Routes (UdpIo->Udp, FALSE, &mZeroIp4Addr, &mZeroIp4Addr, &Config->GatewayIp);
+    if (EFI_ERROR (Status)) {
+      UdpIo->Udp->Configure (UdpIo->Udp, NULL);
+    }
+  }
   return Status;
 }
 

MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c

@@ -412,6 +412,18 @@ Mtftp4RrqConfigMcastPort (
     return Status;
   }
 
+  if (!Config->UseDefaultSetting && !EFI_IP4_EQUAL (&mZeroIp4Addr, &Config->GatewayIp)) {
+    //
+    // The station IP address is manually configured and the Gateway IP is not 0.
+    // Add the default route for this UDP instance.
+    //
+    Status = McastIo->Udp->Routes (McastIo->Udp, FALSE, &mZeroIp4Addr, &mZeroIp4Addr, &Config->GatewayIp);
+    if (EFI_ERROR (Status)) {
+      McastIo->Udp->Configure (McastIo->Udp, NULL);
+      return Status;
+    }
+  }
+
   //
   // join the multicast group
   //
@@ -534,22 +546,22 @@ Mtftp4RrqHandleOack (
 
         return Status;
       }
-
+    
       //
       // Update the parameters used.
       //
       if (Reply.BlkSize != 0) {
         Instance->BlkSize = Reply.BlkSize;
       }
-
+      
       if (Reply.Timeout != 0) {
         Instance->Timeout = Reply.Timeout;
-      }
-    }
-
+      }  
+    }    
+    
   } else {
     Instance->Master = TRUE;
-
+    
     if (Reply.BlkSize != 0) {
       Instance->BlkSize = Reply.BlkSize;
     }
@@ -558,7 +570,7 @@ Mtftp4RrqHandleOack (
       Instance->Timeout = Reply.Timeout;
     }
   }
-
+  
   //
   // Send an ACK to (Expected - 1) which is 0 for unicast download,
   // or tell the server we want to receive the Expected block.

MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c

@@ -467,7 +467,7 @@ Mtftp4SendPacket (
              Instance->UnicastPort,
              Packet,
              &UdpPoint,
-             Instance->Gateway,
+             0,
              Mtftp4OnPacketSent,
              Instance
              );
@@ -524,7 +524,7 @@ Mtftp4Retransmit (
              Instance->UnicastPort,
              Instance->LastPacket,
              &UdpPoint,
-             Instance->Gateway,
+             0,
              Mtftp4OnPacketSent,
              Instance
              );