1. Fixed bugs in DxeNetLib to meet consistence with network module DriverBinding...

[mirror_edk2.git] / MdeModulePkg / Library / DxeNetLib / DxeNetLib.c

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