X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FLibrary%2FDxeNetLib%2FDxeNetLib.c;h=ee8b6797e5dc4b11bd5abaafe986c0a1f656cac2;hp=f65489e7ed71b4c89ebaecfa06b1c2cc07629d60;hb=3012ce5cf75f938a79c70568595454e27b2f014a;hpb=b290614d493ff72fc2a4410d169314e501b7e79e

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index f65489e7ed..ee8b6797e5 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -25,6 +25,8 @@ Abstract:
 #include <Protocol/SimpleNetwork.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/NicIp4Config.h>
+#include <Protocol/ComponentName.h>
+#include <Protocol/ComponentName2.h>
 
 #include <Library/NetLib.h>
 #include <Library/BaseLib.h>
@@ -842,8 +844,7 @@ NetLibDefaultUnload (
   UINTN                             Index;
   EFI_DRIVER_BINDING_PROTOCOL       *DriverBinding;
   EFI_COMPONENT_NAME_PROTOCOL       *ComponentName;
-  EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfiguration;
-  EFI_DRIVER_DIAGNOSTICS_PROTOCOL   *DriverDiagnostics;
+  EFI_COMPONENT_NAME2_PROTOCOL      *ComponentName2;
 
   //
   // Get the list of all the handles in the handle database.
@@ -912,30 +913,15 @@ NetLibDefaultUnload (
 
     Status = gBS->HandleProtocol (
                     DeviceHandleBuffer[Index],
-                    &gEfiDriverConfigurationProtocolGuid,
-                    (VOID **) &DriverConfiguration
+                    &gEfiComponentName2ProtocolGuid,
+                    (VOID **) &ComponentName2
                     );
-
     if (!EFI_ERROR (Status)) {
       gBS->UninstallProtocolInterface (
-            ImageHandle,
-            &gEfiDriverConfigurationProtocolGuid,
-            DriverConfiguration
-            );
-    }
-
-    Status = gBS->HandleProtocol (
-                    DeviceHandleBuffer[Index],
-                    &gEfiDriverDiagnosticsProtocolGuid,
-                    (VOID **) &DriverDiagnostics
-                    );
-
-    if (!EFI_ERROR (Status)) {
-      gBS->UninstallProtocolInterface (
-            ImageHandle,
-            &gEfiDriverDiagnosticsProtocolGuid,
-            DriverDiagnostics
-            );
+             ImageHandle,
+             &gEfiComponentName2ProtocolGuid,
+             ComponentName2
+             );
     }
   }