X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FIp4ConfigDxe%2FIp4ConfigDriver.c;h=7f0149fa009bf0efcba0fd84fc3aa48a1db4c29d;hb=7659d0c92fb0edde36289ea738258464484204e4;hp=c3845f4734a441517101b2de592257f2690b861a;hpb=da1d02010d73465a9c2b21f619e8c01cb00bd1fa;p=mirror_edk2.git

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
index c3845f4734..7f0149fa00 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
@@ -85,14 +85,13 @@ Returns:
 
 --*/
 {
-  return EfiLibInstallAllDriverProtocols (
+  return EfiLibInstallDriverBindingComponentName2 (
            ImageHandle,
            SystemTable,
            &gIp4ConfigDriverBinding,
            ImageHandle,
            &gIp4ConfigComponentName,
-           NULL,
-           NULL
+           &gIp4ConfigComponentName2
            );
 }
 
@@ -215,7 +214,7 @@ Ip4ConfigDriverBindingStart (
   //
   // Allocate an instance then initialize it
   //
-  Instance = NetAllocatePool (sizeof (IP4_CONFIG_INSTANCE));
+  Instance = AllocatePool (sizeof (IP4_CONFIG_INSTANCE));
 
   if (Instance == NULL) {
     Status = EFI_OUT_OF_RESOURCES;
@@ -226,8 +225,8 @@ Ip4ConfigDriverBindingStart (
   Instance->Controller        = ControllerHandle;
   Instance->Image             = This->DriverBindingHandle;
 
-  Instance->Ip4ConfigProtocol = mIp4ConfigProtocolTemplate;
-  Instance->NicIp4Protocol    = mNicIp4ConfigProtocolTemplate;
+  CopyMem (&Instance->Ip4ConfigProtocol, &mIp4ConfigProtocolTemplate, sizeof (mIp4ConfigProtocolTemplate));
+  CopyMem (&Instance->NicIp4Protocol, &mNicIp4ConfigProtocolTemplate, sizeof (mNicIp4ConfigProtocolTemplate));
 
   Instance->State             = IP4_CONFIG_STATE_IDLE;
   Instance->Mnp               = Mnp;
@@ -333,7 +332,7 @@ Ip4ConfigDriverBindingStart (
     NewVariable = Ip4ConfigModifyVariable (Variable, &Instance->NicAddr, NULL);
 
   } else if (NicConfig->Source == IP4_CONFIG_SOURCE_DHCP) {
-    NetZeroMem (&NicConfig->Ip4Info, sizeof (EFI_IP4_IPCONFIG_DATA));
+    ZeroMem (&NicConfig->Ip4Info, sizeof (EFI_IP4_IPCONFIG_DATA));
     NewVariable = Ip4ConfigModifyVariable (Variable, &Instance->NicAddr, NicConfig);
 
   }
@@ -341,21 +340,21 @@ Ip4ConfigDriverBindingStart (
   Ip4ConfigWriteVariable (NewVariable);
 
   if (NewVariable != NULL) {
-    NetFreePool (NewVariable);
+    gBS->FreePool (NewVariable);
   }
 
 ON_EXIT:
-  NetFreePool (Variable);
+  gBS->FreePool (Variable);
 
   if (NicConfig != NULL) {
-    NetFreePool (NicConfig);
+    gBS->FreePool (NicConfig);
   }
 
   return EFI_SUCCESS;
 
 ON_ERROR:
   if (Instance != NULL) {
-    NetFreePool (Instance);
+    gBS->FreePool (Instance);
   }
 
   if (Mnp != NULL) {
@@ -512,7 +511,7 @@ Ip4ConfigDriverBindingStop (
 
   Ip4ConfigCleanConfig (Instance);
   mIp4ConfigNicList[Instance->NicIndex] = NULL;
-  NetFreePool (Instance);
+  gBS->FreePool (Instance);
 
   return EFI_SUCCESS;
 }