Import ArpDxe, Dhcp4Dxe, Ip4Dxe, Mtftp4Dxe, PxeBcDxe and PxeDhcp4Dxe.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
index ea7d732b84..536a01a1d5 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
@@ -118,11 +118,11 @@ Tcp4GetMode (
 

     AccessPoint->UseDefaultAddress  = Tcb->UseDefaultAddr;

 

-    EFI_IP4 (AccessPoint->StationAddress) = Tcb->LocalEnd.Ip;

+    NetCopyMem (&AccessPoint->StationAddress, &Tcb->LocalEnd.Ip, sizeof (EFI_IPv4_ADDRESS));

     AccessPoint->SubnetMask         = Tcb->SubnetMask;

     AccessPoint->StationPort        = NTOHS (Tcb->LocalEnd.Port);

 

-    EFI_IP4 (AccessPoint->RemoteAddress) = Tcb->RemoteEnd.Ip;

+    NetCopyMem (&AccessPoint->RemoteAddress, &Tcb->RemoteEnd.Ip, sizeof (EFI_IPv4_ADDRESS));

     AccessPoint->RemotePort         = NTOHS (Tcb->RemoteEnd.Port);

     AccessPoint->ActiveFlag         = (BOOLEAN) (Tcb->State != TCP_LISTEN);

 

@@ -428,11 +428,11 @@ Tcp4ConfigurePcb (
   Tcb->TTL            = CfgData->TimeToLive;

   Tcb->TOS            = CfgData->TypeOfService;

 

-  Tcb->LocalEnd.Ip    = EFI_IP4 (CfgData->AccessPoint.StationAddress);

+  NetCopyMem (&Tcb->LocalEnd.Ip, &CfgData->AccessPoint.StationAddress, sizeof (IP4_ADDR));

   Tcb->LocalEnd.Port  = HTONS (CfgData->AccessPoint.StationPort);

   Tcb->SubnetMask     = CfgData->AccessPoint.SubnetMask;

 

-  Tcb->RemoteEnd.Ip   = EFI_IP4 (CfgData->AccessPoint.RemoteAddress);

+  NetCopyMem (&Tcb->RemoteEnd.Ip, &CfgData->AccessPoint.RemoteAddress, sizeof (IP4_ADDR));

   Tcb->RemoteEnd.Port = HTONS (CfgData->AccessPoint.RemotePort);

 

   Option              = CfgData->ControlOption;