1. add error handling in case DHCP success but boot request fail

2. add UnloadImage to ease debug

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

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
index d2e60b6a592f339a8ad92532229dda9dd761e93b..f406c507c314fe71d8a1b42a1c5bf3cb866db399 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
@@ -1217,6 +1217,13 @@ PxeBcDiscvBootService (
     }\r
   }\r
 \r
     }\r
   }\r
 \r

+  if (TryIndex > PXEBC_BOOT_REQUEST_RETRIES) {\r
+    //\r
+    // No server response our PXE request\r
+    //\r
+    Status = EFI_TIMEOUT;\r
+  }\r
+\r

   if (!EFI_ERROR (Status)) {\r
     //\r
     // Find Pxe Reply\r
   if (!EFI_ERROR (Status)) {\r
     //\r
     // Find Pxe Reply\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
index eefc5ac666bfac94b8ffcd71dbe6f757c9e7ed42..4df333e1a6fa623e28f99530a28de025466e93fb 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
@@ -22,6 +22,7 @@
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   ENTRY_POINT                    = PxeBcDriverEntryPoint\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   ENTRY_POINT                    = PxeBcDriverEntryPoint\r

+  UNLOAD_IMAGE                   = NetLibDefaultUnload\r

 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r