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

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

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index 952eb98ccc90ceae5c6ba997ccf6a80aec4fab29..bfb9616c2d830b55988823873bdf5cc1b35c5ed6 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
@@ -108,8 +108,8 @@ Ip4WrapLinkTxToken (
   Token->CallBack   = CallBack;\r
   Token->Packet     = Packet;\r
   Token->Context    = Context;\r
-  CopyMem (&Token->DstMac, &mZeroMacAddress, sizeof (EFI_MAC_ADDRESS));\r
-  CopyMem (&Token->SrcMac, &Interface->Mac, sizeof (EFI_MAC_ADDRESS));\r
+  CopyMem (&Token->DstMac, &mZeroMacAddress, sizeof (Token->DstMac));\r
+  CopyMem (&Token->SrcMac, &Interface->Mac, sizeof (Token->SrcMac));\r
 \r
   MnpToken          = &(Token->MnpToken);\r
   MnpToken->Status  = EFI_NOT_READY;\r
@@ -213,7 +213,7 @@ Ip4CreateArpQue (
   }\r
 \r
   ArpQue->Ip  = DestIp;\r
-  CopyMem (&ArpQue->Mac, &mZeroMacAddress, sizeof (EFI_MAC_ADDRESS));\r
+  CopyMem (&ArpQue->Mac, &mZeroMacAddress, sizeof (ArpQue->Mac));\r
 \r
   return ArpQue;\r
 }\r
@@ -485,8 +485,8 @@ Ip4CreateInterface (
     return NULL;\r
   }\r
 \r
-  CopyMem (&Interface->Mac, &SnpMode.CurrentAddress, sizeof (EFI_MAC_ADDRESS));\r
-  CopyMem (&Interface->BroadcastMac, &SnpMode.BroadcastAddress, sizeof (EFI_MAC_ADDRESS));\r
+  CopyMem (&Interface->Mac, &SnpMode.CurrentAddress, sizeof (Interface->Mac));\r
+  CopyMem (&Interface->BroadcastMac, &SnpMode.BroadcastAddress, sizeof (Interface->BroadcastMac));\r
   Interface->HwaddrLen    = SnpMode.HwAddressSize;\r
 \r
   NetListInit (&Interface->IpInstances);\r
@@ -796,7 +796,7 @@ Ip4OnArpResolved (
     NetListRemoveEntry (Entry);\r
 \r
     Token         = NET_LIST_USER_STRUCT (Entry, IP4_LINK_TX_TOKEN, Link);\r
-    CopyMem (&Token->DstMac, &ArpQue->Mac, sizeof (EFI_MAC_ADDRESS));\r
+    CopyMem (&Token->DstMac, &ArpQue->Mac, sizeof (Token->DstMac));\r
 \r
     Status = Interface->Mnp->Transmit (Interface->Mnp, &Token->MnpToken);\r
 \r
@@ -904,7 +904,7 @@ Ip4SendFrame (
   // all the broadcasts.\r
   //\r
   if (NextHop == IP4_ALLONE_ADDRESS) {\r
-    CopyMem (&Token->DstMac, &Interface->BroadcastMac, sizeof (EFI_MAC_ADDRESS));\r
+    CopyMem (&Token->DstMac, &Interface->BroadcastMac, sizeof (Token->DstMac));\r
     goto SEND_NOW;\r
 \r
   } else if (IP4_IS_MULTICAST (NextHop)) {\r