1. Enable Network stack to pass SCT, currently MNP, ARP, IP4, TCP4 and DHCP4 have...

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Dhcp4Dxe / Dhcp4Impl.c

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
index 68da959466aacbae44e09eaabeb93e144959a181..3595e784a0205b9c290d994915991848742e763b 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
@@ -69,9 +69,9 @@ EfiDhcp4GetModeData (
   // Caller can use GetModeData to retrieve current DHCP states\r
   // no matter whether it is the active child or not.\r
   //\r
-  Dhcp4ModeData->State                     = DhcpSb->DhcpState;\r
-  CopyMem (&Dhcp4ModeData->ConfigData, &DhcpSb->ActiveConfig, sizeof (EFI_DHCP4_CONFIG_DATA));\r
-  CopyMem (&Dhcp4ModeData->ClientMacAddress, &DhcpSb->Mac, sizeof (EFI_MAC_ADDRESS));\r
+  Dhcp4ModeData->State                     = (EFI_DHCP4_STATE) DhcpSb->DhcpState;\r
+  CopyMem (&Dhcp4ModeData->ConfigData, &DhcpSb->ActiveConfig, sizeof (Dhcp4ModeData->ConfigData));\r
+  CopyMem (&Dhcp4ModeData->ClientMacAddress, &DhcpSb->Mac, sizeof (Dhcp4ModeData->ClientMacAddress));\r
 \r
   Ip = HTONL (DhcpSb->ClientAddr);\r
   NetCopyMem (&Dhcp4ModeData->ClientAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));\r
@@ -161,7 +161,7 @@ DhcpCopyConfigure (
   INTN                      Len;\r
   UINT32                    Index;\r
 \r
-  CopyMem (Dst, Src, sizeof (EFI_DHCP4_CONFIG_DATA));\r
+  CopyMem (Dst, Src, sizeof (Dst));\r
   Dst->DiscoverTimeout  = NULL;\r
   Dst->RequestTimeout   = NULL;\r
   Dst->OptionList       = NULL;\r
@@ -250,9 +250,7 @@ DhcpYieldControl (
   )\r
 {\r
   EFI_DHCP4_CONFIG_DATA     *Config;\r
-  DHCP_PROTOCOL             *Instance;\r
 \r
-  Instance  = DhcpSb->ActiveChild;\r
   Config    = &DhcpSb->ActiveConfig;\r
 \r
   DhcpSb->ServiceState  = DHCP_UNCONFIGED;\r