Fix one issue: Some last IP settings may be lost when IP setting was re-set.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Ip4ConfigDxe / Ip4ConfigNv.c

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
index ca03a80239c44348ae6b41e00a55633d0eda320f..e161b51ec57d7029f425aca2c6efea098b179bde 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
@@ -154,18 +154,26 @@ Ip4ConfigConvertDeviceConfigDataToIfrNvData (
   NicConfig = EfiNicIp4ConfigGetInfo (Ip4ConfigInstance);\r
   if (NicConfig != NULL) {\r
     IfrFormNvData->Configure = 1;\r
+    Ip4ConfigInstance->Ip4ConfigCallbackInfo.Configured = TRUE;\r
     if (NicConfig->Source == IP4_CONFIG_SOURCE_DHCP) {\r
       IfrFormNvData->DhcpEnable = 1;\r
+      Ip4ConfigInstance->Ip4ConfigCallbackInfo.DhcpEnabled = TRUE;\r
     } else {\r
       IfrFormNvData->DhcpEnable = 0;\r
       Ip4ConfigIpToStr (&NicConfig->Ip4Info.StationAddress, IfrFormNvData->StationAddress);\r
       Ip4ConfigIpToStr (&NicConfig->Ip4Info.SubnetMask, IfrFormNvData->SubnetMask);\r
       Ip4ConfigIpToStr (&NicConfig->Ip4Info.RouteTable[1].GatewayAddress, IfrFormNvData->GatewayAddress);\r
+\r
+      Ip4ConfigInstance->Ip4ConfigCallbackInfo.DhcpEnabled = FALSE;\r
+      CopyMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.LocalIp, &NicConfig->Ip4Info.StationAddress, sizeof (EFI_IPv4_ADDRESS));\r
+      CopyMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.SubnetMask, &NicConfig->Ip4Info.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+      CopyMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.Gateway, &NicConfig->Ip4Info.RouteTable[1].GatewayAddress, sizeof (EFI_IPv4_ADDRESS));\r
     }\r
 \r
     FreePool (NicConfig);\r
   } else {\r
     IfrFormNvData->Configure = 0;\r
+    Ip4ConfigInstance->Ip4ConfigCallbackInfo.Configured = FALSE;\r
   }\r
 }\r
 \r