1 files changed, 36 insertions, 8 deletions
diff --git a/NetworkPkg/HttpBootDxe/HttpBootDxe.c b/NetworkPkg/HttpBootDxe/HttpBootDxe.c
index 9fb33bbb53..6a3033db11 100644
--- a/NetworkPkg/HttpBootDxe/HttpBootDxe.c
+++ b/NetworkPkg/HttpBootDxe/HttpBootDxe.c
@@ -1,7 +1,7 @@
 /** @file
   Driver Binding functions implementation for UEFI HTTP boot.
 
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed and made available under 
 the terms and conditions of the BSD License that accompanies this distribution.  
 The full text of the license may be found at
@@ -365,6 +365,14 @@ HttpBootIp4DxeDriverBindingStart (
     }
 
     //
+    // Initialize the HII configuration form.
+    //
+    Status = HttpBootConfigFormInit (Private);
+    if (EFI_ERROR (Status)) {
+      goto ON_ERROR;
+    }
+
+    //
     // Install a protocol with Caller Id Guid to the NIC, this is just to build the relationship between
     // NIC handle and the private data.
     //
@@ -508,8 +516,9 @@ HttpBootIp4DxeDriverBindingStart (
 
     
 ON_ERROR:
-  
+
   HttpBootDestroyIp4Children (This, Private);
+  HttpBootConfigFormUnload (Private);
   FreePool (Private);
 
   return Status;
@@ -615,6 +624,11 @@ HttpBootIp4DxeDriverBindingStop (
     // Release the cached data.
     //
     HttpBootFreeCacheList (Private);
+
+    //
+    // Unload the config form.
+    //
+    HttpBootConfigFormUnload (Private);
     
     gBS->UninstallProtocolInterface (
            NicHandle,
@@ -823,6 +837,14 @@ HttpBootIp6DxeDriverBindingStart (
     }
 
     //
+    // Initialize the HII configuration form.
+    //
+    Status = HttpBootConfigFormInit (Private);
+    if (EFI_ERROR (Status)) {
+      goto ON_ERROR;
+    }
+
+    //
     // Install a protocol with Caller Id Guid to the NIC, this is just to build the relationship between
     // NIC handle and the private data.
     //
@@ -989,12 +1011,12 @@ HttpBootIp6DxeDriverBindingStart (
   return EFI_SUCCESS;
    
 ON_ERROR:
-  
- HttpBootDestroyIp6Children(This, Private);
- FreePool (Private);
 
- return Status;
- 
+  HttpBootDestroyIp6Children(This, Private);
+  HttpBootConfigFormUnload (Private);
+  FreePool (Private);
+
+  return Status;
 }
 
 /**
@@ -1096,7 +1118,12 @@ HttpBootIp6DxeDriverBindingStop (
     // Release the cached data.
     //
     HttpBootFreeCacheList (Private);
-        
+
+    //
+    // Unload the config form.
+    //
+    HttpBootConfigFormUnload (Private);
+
     gBS->UninstallProtocolInterface (
            NicHandle,
            &gEfiCallerIdGuid,
@@ -1128,6 +1155,7 @@ HttpBootDxeDriverEntryPoint (
   )
 {
   EFI_STATUS   Status;
+
   //
   // Install UEFI Driver Model protocol(s).
   //