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

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Ip4Dxe / Ip4Impl.c

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
index 824524d508ed5ee6086983e7412ca731558092a9..e617d3de80a44f22fc6a5528b527c80482e4a851 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
@@ -67,7 +67,7 @@ EfiIp4GetModeData (
     // IsConfigured is "whether the station address has been configured"\r
     //\r
     Ip4ModeData->IsStarted     = (BOOLEAN)(IpInstance->State == IP4_STATE_CONFIGED);\r
-    CopyMem (&Ip4ModeData->ConfigData, &IpInstance->ConfigData, sizeof (EFI_IP4_CONFIG_DATA));\r
+    CopyMem (&Ip4ModeData->ConfigData, &IpInstance->ConfigData, sizeof (Ip4ModeData->ConfigData));\r
     Ip4ModeData->IsConfigured  = FALSE;\r
 \r
     Ip4ModeData->GroupCount    = IpInstance->GroupCount;\r
@@ -112,11 +112,11 @@ EfiIp4GetModeData (
   }\r
 \r
   if (MnpConfigData != NULL) {\r
-    CopyMem (MnpConfigData, &IpSb->MnpConfigData, sizeof (EFI_MANAGED_NETWORK_CONFIG_DATA));\r
+    CopyMem (MnpConfigData, &IpSb->MnpConfigData, sizeof (*MnpConfigData));\r
   }\r
 \r
   if (SnpModeData != NULL) {\r
-    CopyMem (SnpModeData, &IpSb->SnpMode, sizeof (EFI_SIMPLE_NETWORK_MODE));\r
+    CopyMem (SnpModeData, &IpSb->SnpMode, sizeof (*SnpModeData));\r
   }\r
 \r
   NET_RESTORE_TPL (OldTpl);\r
@@ -197,7 +197,7 @@ Ip4ServiceConfigMnp (
   // recover the original configuration if failed to set the configure.\r
   //\r
   if (EFI_ERROR (Status) && Reconfig) {\r
-    IpSb->MnpConfigData.EnablePromiscuousReceive = !PromiscReceive;\r
+    IpSb->MnpConfigData.EnablePromiscuousReceive = (BOOLEAN) !PromiscReceive;\r
   }\r
 \r
   return Status;\r
@@ -477,7 +477,7 @@ Ip4InitProtocol (
   NetZeroMem (IpInstance, sizeof (IP4_PROTOCOL));\r
 \r
   IpInstance->Signature = IP4_PROTOCOL_SIGNATURE;\r
-  CopyMem (&IpInstance->Ip4Proto, &mEfiIp4ProtocolTemplete, sizeof (EFI_IP4_PROTOCOL));\r
+  CopyMem (&IpInstance->Ip4Proto, &mEfiIp4ProtocolTemplete, sizeof (IpInstance->Ip4Proto));\r
   IpInstance->State     = IP4_STATE_UNCONFIGED;\r
   IpInstance->Service   = IpSb;\r
 \r
@@ -538,7 +538,7 @@ Ip4ConfigProtocol (
       return EFI_DEVICE_ERROR;\r
     }\r
 \r
-    CopyMem (&IpInstance->ConfigData, Config, sizeof (EFI_IP4_CONFIG_DATA));\r
+    CopyMem (&IpInstance->ConfigData, Config, sizeof (IpInstance->ConfigData));\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -627,7 +627,7 @@ Ip4ConfigProtocol (
   IpInstance->Interface = IpIf;\r
   NetListInsertTail (&IpIf->IpInstances, &IpInstance->AddrLink);\r
 \r
-  CopyMem (&IpInstance->ConfigData, Config, sizeof (EFI_IP4_CONFIG_DATA));\r
+  CopyMem (&IpInstance->ConfigData, Config, sizeof (IpInstance->ConfigData));\r
   IpInstance->State       = IP4_STATE_CONFIGED;\r
 \r
   //\r
@@ -1616,7 +1616,6 @@ EfiIp4Receive (
   )\r
 {\r
   IP4_PROTOCOL              *IpInstance;\r
-  EFI_IP4_CONFIG_DATA       *Config;\r
   EFI_STATUS                Status;\r
   EFI_TPL                   OldTpl;\r
 \r
@@ -1636,8 +1635,6 @@ EfiIp4Receive (
     goto ON_EXIT;\r
   }\r
 \r
-  Config = &IpInstance->ConfigData;\r
-\r
   //\r
   // Current Udp implementation creates an IP child for each Udp child.\r
   // It initates a asynchronous receive immediately no matter whether\r