NetworkPkg:Fix Http boot download issue.

When http boot download the second time without return
out of the boot manager, the DHCP process will start twice
with the same Boot file uri and print the information twice
which we not expected. This is caused by wrong logic
of handling the device path of the boot file when loading it.

Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>

diff --git a/NetworkPkg/HttpBootDxe/HttpBootImpl.c b/NetworkPkg/HttpBootDxe/HttpBootImpl.c
index 3adb08d9f69c5460343b122c7602abe294cb3184..c4a3e707fb07c4950ada3955fac5a9ecb55a1b2d 100644 (file)
--- a/NetworkPkg/HttpBootDxe/HttpBootImpl.c
+++ b/NetworkPkg/HttpBootDxe/HttpBootImpl.c
@@ -431,7 +431,7 @@ HttpBootDxeLoadFile (
     // 2. The required boot FilePath is different with the one we produced in the device path\r
     // protocol.\r
     //\r
     // 2. The required boot FilePath is different with the one we produced in the device path\r
     // protocol.\r
     //\r

-    if ((UsingIpv6 != Private->UsingIpv6) || !IsDevicePathEnd(FilePath)) {\r
+    if ((UsingIpv6 != Private->UsingIpv6) || ((Private->FilePathUri != NULL) && (AsciiStrCmp (Private->BootFileUri, Private->FilePathUri) != 0))) {\r

       Status = HttpBootStop (Private);\r
       if (!EFI_ERROR (Status)) {\r
         Status = HttpBootStart (Private, UsingIpv6, FilePath);\r
       Status = HttpBootStop (Private);\r
       if (!EFI_ERROR (Status)) {\r
         Status = HttpBootStart (Private, UsingIpv6, FilePath);\r