From bf4a3dbd4751b6411bdfc98bf3ac2c4f928bdfdf Mon Sep 17 00:00:00 2001
From: ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 30 May 2012 07:36:00 +0000
Subject: Add new interface GetVariable2 and GetEfiGlobalVariable2 to return
 more info. Also replace old interface with new one.

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13375 6f19259b-4bc3-4df7-8a09-765794883524
---
 NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c |  4 ++--
 NetworkPkg/IScsiDxe/IScsiMisc.c    | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'NetworkPkg')

diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
index ac0e577f5e..479eb143d8 100644
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
@@ -1,7 +1,7 @@
 /** @file
   Dhcp6 support functions implementation.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -41,7 +41,7 @@ Dhcp6GenerateClientId (
   // Attempt to get client Id from variable to keep it constant.
   // See details in section-9 of rfc-3315.
   //
-  Duid = GetVariable (L"ClientId", &gEfiDhcp6ServiceBindingProtocolGuid);
+  GetVariable2 (L"ClientId", &gEfiDhcp6ServiceBindingProtocolGuid, &Duid, NULL);
   if (Duid != NULL) {
     return Duid;
   }
diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.c b/NetworkPkg/IScsiDxe/IScsiMisc.c
index f3ecdb5f6a..46e97a9fcd 100644
--- a/NetworkPkg/IScsiDxe/IScsiMisc.c
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.c
@@ -1,7 +1,7 @@
 /** @file
   Miscellaneous routines for iSCSI driver.
 
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -1076,10 +1076,12 @@ IScsiGetConfigData (
       (UINTN) AttemptConfigOrder[Index]
       );
 
-    AttemptConfigData = (ISCSI_ATTEMPT_CONFIG_NVDATA *) GetVariable (
-                                                          mPrivate->PortString,
-                                                          &gEfiIScsiInitiatorNameProtocolGuid
-                                                          );
+    GetVariable2 (
+                 mPrivate->PortString,
+                 &gEfiIScsiInitiatorNameProtocolGuid,
+                 &AttemptConfigData,
+                 NULL
+                 );
 
     if (AttemptConfigData == NULL) {
       continue;
-- 
cgit v1.2.3