BaseTools/Capsule: Do not support -o with --dump-info

[mirror_edk2.git] / NetworkPkg / Dhcp6Dxe / Dhcp6Impl.c

diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.c
index 1107865f4227aa9ec345823c20f60007ee643d2e..9ace833b98f7a922e6dc27990ee61bfc69029f23 100644 (file)
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.c
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Impl.c
@@ -1,7 +1,7 @@
 /** @file\r
   This EFI_DHCP6_PROTOCOL interface implementation.\r
 \r
 /** @file\r
   This EFI_DHCP6_PROTOCOL interface implementation.\r
 \r

-  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -76,7 +76,7 @@ EfiDhcp6Start (
   EFI_TPL                      OldTpl;\r
   DHCP6_INSTANCE               *Instance;\r
   DHCP6_SERVICE                *Service;\r
   EFI_TPL                      OldTpl;\r
   DHCP6_INSTANCE               *Instance;\r
   DHCP6_SERVICE                *Service;\r

-  BOOLEAN                      MediaPresent;\r
+  EFI_STATUS                   MediaStatus;\r

 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r


@@ -106,9 +106,9 @@ EfiDhcp6Start (
   //\r
   // Check Media Satus.\r
   //\r
   //\r
   // Check Media Satus.\r
   //\r

-  MediaPresent = TRUE;\r
-  NetLibDetectMedia (Service->Controller, &MediaPresent);\r
-  if (!MediaPresent) {\r
+  MediaStatus = EFI_SUCCESS;\r
+  NetLibDetectMediaWaitTimeout (Service->Controller, DHCP_CHECK_MEDIA_WAITING_TIME, &MediaStatus);\r
+  if (MediaStatus != EFI_SUCCESS) {\r

     Status = EFI_NO_MEDIA;\r
     goto ON_ERROR;\r
   }\r
     Status = EFI_NO_MEDIA;\r
     goto ON_ERROR;\r
   }\r


@@ -237,7 +237,7 @@ EfiDhcp6Stop (
     }\r
     Status = Instance->UdpSts;\r
   }\r
     }\r
     Status = Instance->UdpSts;\r
   }\r

-  \r
+\r

 ON_EXIT:\r
   //\r
   // Clean up the session data for the released Ia.\r
 ON_EXIT:\r
   //\r
   // Clean up the session data for the released Ia.\r


@@ -678,7 +678,7 @@ EfiDhcp6InfoRequest (
       return Status;\r
     }\r
 \r
       return Status;\r
     }\r
 \r

-    do {  \r
+    do {\r

       TimerStatus = gBS->CheckEvent (Timer);\r
       if (!EFI_ERROR (TimerStatus)) {\r
         Status = Dhcp6StartInfoRequest (\r
       TimerStatus = gBS->CheckEvent (Timer);\r
       if (!EFI_ERROR (TimerStatus)) {\r
         Status = Dhcp6StartInfoRequest (\r


@@ -694,7 +694,7 @@ EfiDhcp6InfoRequest (
                    );\r
       }\r
     } while (TimerStatus == EFI_NOT_READY);\r
                    );\r
       }\r
     } while (TimerStatus == EFI_NOT_READY);\r

-    \r
+\r

     gBS->CloseEvent (Timer);\r
   }\r
   if (EFI_ERROR (Status)) {\r
     gBS->CloseEvent (Timer);\r
   }\r
   if (EFI_ERROR (Status)) {\r