BaseTools:Change the path of the file that Binary Cache

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Dhcp4Dxe / Dhcp4Io.c

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
index 9532ca8f47efb260d32e3ec550b290aa07d87cb2..4728b94c5803110d05bb2209032ef28643183841 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
@@ -1,14 +1,8 @@
 /** @file\r
   EFI DHCP protocol implementation.\r
-  \r
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
 \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -41,7 +35,7 @@ DhcpInitRequest (
   // Clear initial time to make sure that elapsed-time is set to 0 for first Discover or REQUEST message.\r
   //\r
   DhcpSb->ActiveChild->ElaspedTime= 0;\r
-  \r
+\r
   if (DhcpSb->DhcpState == Dhcp4Init) {\r
     DhcpSetState (DhcpSb, Dhcp4Selecting, FALSE);\r
     Status = DhcpSendMessage (DhcpSb, NULL, NULL, DHCP_MSG_DISCOVER, NULL);\r
@@ -1381,13 +1375,13 @@ DhcpSendMessage (
   }\r
 \r
   ASSERT (UdpIo != NULL);\r
-  \r
+\r
   Status = UdpIoSendDatagram (\r
-             UdpIo, \r
-             Wrap, \r
-             &EndPoint, \r
-             NULL, \r
-             DhcpOnPacketSent, \r
+             UdpIo,\r
+             Wrap,\r
+             &EndPoint,\r
+             NULL,\r
+             DhcpOnPacketSent,\r
              DhcpSb\r
              );\r
 \r
@@ -1509,7 +1503,7 @@ DhcpOnTimerTick (
   if (Instance != NULL && Instance->ElaspedTime < 0xffff) {\r
     Instance->ElaspedTime++;\r
   }\r
-  \r
+\r
   //\r
   // Check the retransmit timer\r
   //\r
@@ -1531,7 +1525,7 @@ DhcpOnTimerTick (
         goto ON_EXIT;\r
       }\r
     }\r
-    \r
+\r
     if (++DhcpSb->CurRetry < DhcpSb->MaxRetries) {\r
       //\r
       // Still has another try\r
@@ -1570,7 +1564,7 @@ DhcpOnTimerTick (
       goto END_SESSION;\r
     }\r
   }\r
-  \r
+\r
   //\r
   // If an address has been acquired, check whether need to\r
   // refresh or whether it has expired.\r
@@ -1602,8 +1596,8 @@ DhcpOnTimerTick (
 \r
       if (Instance != NULL) {\r
         Instance->ElaspedTime= 0;\r
-      }      \r
-      \r
+      }\r
+\r
       Status = DhcpSendMessage (\r
                  DhcpSb,\r
                  DhcpSb->Selected,\r
@@ -1626,7 +1620,7 @@ DhcpOnTimerTick (
 \r
       if (Instance != NULL) {\r
         Instance->ElaspedTime= 0;\r
-      }    \r
+      }\r
 \r
       Status = DhcpSendMessage (\r
                  DhcpSb,\r
@@ -1648,12 +1642,9 @@ ON_EXIT:
   //\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &DhcpSb->Children) {\r
     Instance = NET_LIST_USER_STRUCT (Entry, DHCP_PROTOCOL, Link);\r
-    \r
-    if ((Instance != NULL) && (Instance->Token != NULL)) {\r
-      Instance->Timeout--;\r
-      if (Instance->Timeout == 0) {\r
-        PxeDhcpDone (Instance);\r
-      }\r
+    Instance->Timeout--;\r
+    if (Instance->Timeout == 0 && Instance->Token != NULL) {\r
+      PxeDhcpDone (Instance);\r
     }\r
   }\r
 \r