3 files changed, 11 insertions, 10 deletions
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
index 932b21c5ef..7303f6b40e 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
@@ -547,13 +547,13 @@ Returns:
 
 --*/
 {
-  return NetLibInstallAllDriverProtocols (
-          ImageHandle,
-          SystemTable,
-          &gMnpDriverBinding,
-          ImageHandle,
-          &gMnpComponentName,
-          NULL,
-          NULL
-          );
+  return EfiLibInstallAllDriverProtocols (
+           ImageHandle,
+           SystemTable,
+           &gMnpDriverBinding,
+           ImageHandle,
+           &gMnpComponentName,
+           NULL,
+           NULL
+           );
 }
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
index dd4a63cc3a..1eef0e54dd 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
@@ -25,7 +25,7 @@
   EFI_SPECIFICATION_VERSION      = 0x00020000
 
   ENTRY_POINT                    = MnpDriverEntryPoint
-
+  UNLOAD_IMAGE                   = NetLibDefaultUnload
 #
 # The following information is for reference only and not required by the build tools.
 #
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.msa b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.msa
index ba180ac4b7..718e1b9a7b 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.msa
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.msa
@@ -65,6 +65,7 @@
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
     <Extern>
       <ModuleEntryPoint>MnpDriverEntryPoint</ModuleEntryPoint>
+      <ModuleUnloadImage>NetLibDefaultUnload</ModuleUnloadImage>
     </Extern>
   </Externs>
 </ModuleSurfaceArea>
 \ No newline at end of file