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

2. Enable Network stack to pass ICC build.
3. Sync Network library instances' module names with their filenames.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3692 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 9 insertions, 9 deletions

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
index 83fc3c6ae4..88158ea50b 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
@@ -537,12 +537,12 @@ MnpInitializeInstanceData (
   //

   // Copy the MNP Protocol interfaces from the template.

   //

-  CopyMem (&Instance->ManagedNetwork, &mMnpProtocolTemplate, sizeof (EFI_MANAGED_NETWORK_PROTOCOL));

+  CopyMem (&Instance->ManagedNetwork, &mMnpProtocolTemplate, sizeof (Instance->ManagedNetwork));

 

   //

   // Copy the default config data.

   //

-  CopyMem (&Instance->ConfigData, &mMnpDefaultConfigData, sizeof (EFI_MANAGED_NETWORK_CONFIG_DATA));

+  CopyMem (&Instance->ConfigData, &mMnpDefaultConfigData, sizeof (Instance->ConfigData));

 

   //

   // Initialize the lists.

@@ -1038,7 +1038,7 @@ MnpConfigureInstance (
   //

   // Save the new configuration data.

   //

-  CopyMem (OldConfigData, NewConfigData, sizeof (EFI_MANAGED_NETWORK_CONFIG_DATA));

+  CopyMem (OldConfigData, NewConfigData, sizeof (*OldConfigData));

 

   Instance->Configured  = (BOOLEAN) (ConfigData != NULL);

 

@@ -1152,7 +1152,7 @@ MnpConfigReceiveFilters (
       NET_LIST_FOR_EACH (Entry, &MnpServiceData->GroupAddressList) {

 

         GroupAddress            = NET_LIST_USER_STRUCT (Entry, MNP_GROUP_ADDRESS, AddrEntry);

-        CopyMem (MCastFilter + Index, &GroupAddress->Address, sizeof (EFI_MAC_ADDRESS));

+        CopyMem (MCastFilter + Index, &GroupAddress->Address, sizeof (*(MCastFilter + Index)));

         Index++;

 

         ASSERT (Index <= MCastFilterCnt);

@@ -1266,7 +1266,7 @@ MnpGroupOpAddCtrlBlk (
       return EFI_OUT_OF_RESOURCES;

     }

 

-    CopyMem (&GroupAddress->Address, MacAddress, sizeof (EFI_MAC_ADDRESS));

+    CopyMem (&GroupAddress->Address, MacAddress, sizeof (GroupAddress->Address));

     GroupAddress->RefCnt  = 0;

     NetListInsertTail (

       &MnpServiceData->GroupAddressList,

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
index aafc8433a5..c1529d2620 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
@@ -747,7 +747,7 @@ MnpWrapRxData (
   //

   // Fill the RxData in RxDataWrap,

   //

-  CopyMem (&RxDataWrap->RxData, RxData, sizeof (EFI_MANAGED_NETWORK_RECEIVE_DATA));

+  CopyMem (&RxDataWrap->RxData, RxData, sizeof (RxDataWrap->RxData));

 

   //

   // Create the recycle event.

@@ -827,7 +827,7 @@ MnpEnqueuePacket (
       //

       // Wrap the RxData.

       //

-      CopyMem (&RxDataWrap, MnpWrapRxData (Instance, &RxData), sizeof (MNP_RXDATA_WRAP));

+      RxDataWrap = MnpWrapRxData (Instance, &RxData);

       if (RxDataWrap == NULL) {

         continue;

       }

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
index ccd82d0e87..04e437e939 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
@@ -68,7 +68,7 @@ MnpGetModeData (
     //

     // Copy the instance configuration data.

     //

-    CopyMem (MnpConfigData, &Instance->ConfigData, sizeof (EFI_MANAGED_NETWORK_CONFIG_DATA));

+    CopyMem (MnpConfigData, &Instance->ConfigData, sizeof (*MnpConfigData));

   }

 

   if (SnpModeData != NULL) {

@@ -76,7 +76,7 @@ MnpGetModeData (
     // Copy the underlayer Snp mode data.

     //

     Snp           = Instance->MnpServiceData->Snp;

-    CopyMem (SnpModeData, Snp->Mode, sizeof (EFI_SIMPLE_NETWORK_MODE));

+    CopyMem (SnpModeData, Snp->Mode, sizeof (*SnpModeData));

   }

 

   if (!Instance->Configured) {