Sync one bug on PxeBC module from R8.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / PxeBcDxe / Pxe_bc_dhcp.c

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
index d0eb98cfb79eab33542151f703bf61fe7a1d599d..a61b6acff7865a3ebb94366567154da4ad4dec7c 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
@@ -26,8 +26,8 @@ STATIC EFI_PXE_BASE_CODE_UDP_PORT DhcpServerPort        = DHCP_SERVER_PORT;
 STATIC EFI_PXE_BASE_CODE_UDP_PORT DHCPClientPort        = DHCP_CLIENT_PORT;\r
 STATIC EFI_PXE_BASE_CODE_UDP_PORT PseudoDhcpServerPort  = PXE_DISCOVERY_PORT;\r
 #define PSEUDO_DHCP_CLIENT_PORT PseudoDhcpServerPort\r
-STATIC EFI_IP_ADDRESS             BroadcastIP       = { 0xffffffff };\r
-STATIC EFI_IP_ADDRESS             DefaultSubnetMask = { 0xffffff00 };\r
+STATIC EFI_IP_ADDRESS             BroadcastIP       = {{0xffffffff}};\r
+STATIC EFI_IP_ADDRESS             DefaultSubnetMask = {{0xffffff00}};\r
 \r
 typedef union {\r
   DHCPV4_OP_STRUCT          *OpPtr;\r
@@ -1421,7 +1421,7 @@ DeclineOffer (
     OP_PAD\r
     );\r
   DHCPDECLINEoptions.DhcpMessageType.Type = DHCPDECLINE;\r
-  CopyMem (&DHCPDECLINEoptions.OpDeclineEnd, &DHCP_REQ_OPTIONS, sizeof (struct requestopendstr));\r
+  CopyMem (&DHCPDECLINEoptions.OpDeclineEnd, &DHCP_REQ_OPTIONS, sizeof (DHCPDECLINEoptions.OpDeclineEnd));\r
 \r
   {\r
     EFI_IP_ADDRESS  TmpIp;\r
@@ -1470,7 +1470,7 @@ Release (
 \r
   CopyMem (\r
     &DHCPRELEASEoptions.DhcServerIpPtr,\r
-    &(DHCPV4_OP_SERVER_IP *) DHCPV4_ACK_BUFFER.OpAdds.PktOptAdds[OP_DHCP_SERVER_IP_IX - 1],\r
+    (DHCPV4_OP_SERVER_IP *) DHCPV4_ACK_BUFFER.OpAdds.PktOptAdds[OP_DHCP_SERVER_IP_IX - 1],\r
     sizeof DHCPRELEASEoptions.DhcServerIpPtr\r
     );\r
 \r
@@ -1729,8 +1729,7 @@ TryFinishDORA (
   //\r
   DhcpRxBuf = &DHCPV4_ACK_BUFFER;\r
   DHCPV4_OPTIONS_BUFFER.DhcpMessageType.Type  = DHCPREQUEST;\r
-  CopyMem (&DHCP_REQ_OPTIONS, &RequestOpEndStr, sizeof (RequestOpEndStr));\r
-//  DHCP_REQ_OPTIONS = RequestOpEndStr;\r
+  CopyMem (&DHCP_REQ_OPTIONS, &RequestOpEndStr, sizeof (DHCP_REQ_OPTIONS));\r
   DHCP_REQ_OPTIONS.OpReqIP.Ip = *(EFI_IPv4_ADDRESS *) &RxBuf[OfferIx].u.Dhcpv4.yiaddr;\r
 \r
   CopyMem (\r