Making the IP6_CONFIG_DATA_RECORD the same size for both IA32 and X64 builds.

Signed-off-by: Kinney, Michael D <michael.d.kinney@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14216 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.c b/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.c
index b9840444bbf9f6412109b88dea4c388c8f08be96..ddb8dcd379846503cca842ca10010b61f300ea1c 100644 (file)
--- a/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.c
+++ b/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.c
@@ -1,7 +1,7 @@
 /** @file\r
   The implementation of EFI IPv6 Configuration Protocol.\r
 \r
 /** @file\r
   The implementation of EFI IPv6 Configuration Protocol.\r
 \r

-  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -473,7 +473,7 @@ Ip6ConfigWriteConfigData (
 \r
       DataRecord           = &Variable->DataRecord[Variable->DataRecordCount];\r
       DataRecord->DataType = (EFI_IP6_CONFIG_DATA_TYPE) Index;\r
 \r
       DataRecord           = &Variable->DataRecord[Variable->DataRecordCount];\r
       DataRecord->DataType = (EFI_IP6_CONFIG_DATA_TYPE) Index;\r

-      DataRecord->DataSize = DataItem->DataSize;\r
+      DataRecord->DataSize = (UINT32) DataItem->DataSize;\r

       DataRecord->Offset   = (UINT16) (Heap - (CHAR8 *) Variable);\r
 \r
       Variable->DataRecordCount++;\r
       DataRecord->Offset   = (UINT16) (Heap - (CHAR8 *) Variable);\r
 \r
       Variable->DataRecordCount++;\r

diff --git a/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.h b/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.h
index ccb09ccc77036c8f0c7cc8508cea8320d89a305d..581978bd5e01aa0995c796cc952f91c7d5f39334 100644 (file)
--- a/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.h
+++ b/NetworkPkg/Ip6Dxe/Ip6ConfigImpl.h
@@ -1,7 +1,7 @@
 /** @file\r
   Definitions for EFI IPv6 Configuartion Protocol implementation.\r
 \r
 /** @file\r
   Definitions for EFI IPv6 Configuartion Protocol implementation.\r
 \r

-  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -129,7 +129,7 @@ typedef struct {
 \r
 typedef struct {\r
   UINT16                    Offset;\r
 \r
 typedef struct {\r
   UINT16                    Offset;\r

-  UINTN                     DataSize;\r
+  UINT32                    DataSize;\r

   EFI_IP6_CONFIG_DATA_TYPE  DataType;\r
 } IP6_CONFIG_DATA_RECORD;\r
 \r
   EFI_IP6_CONFIG_DATA_TYPE  DataType;\r
 } IP6_CONFIG_DATA_RECORD;\r
 \r