tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-29 16:44:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove ASSERT when failed to Get/Set “AttemptOrder” and “ClientId” variable.

Browse Source 
Removes RT attribute for “AttemptOrder” variable.
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Dong, Guo <guo.dong@intel.com>
Reviewed-by: Yao, Jiewen <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15328 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Fu Siyuan 2014-03-17 05:32:32 +00:00 committed by sfu5
parent 1c9135a288
commit 9c12f2d77f
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Dhcp6 support functions implementation. Dhcp6 support functions implementation.
Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -157,7 +157,10 @@ Dhcp6GenerateClientId (
Duid->Length + 2, Duid->Length + 2,
(VOID *) Duid (VOID *) Duid
); );
ASSERT_EFI_ERROR (Status); if (EFI_ERROR (Status)) {
FreePool (Duid);
return NULL;
}
return Duid; return Duid;
} }

9
NetworkPkg/IScsiDxe/IScsiConfig.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Helper functions for configuring or getting the parameters relating to iSCSI. Helper functions for configuring or getting the parameters relating to iSCSI.
Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -784,7 +784,7 @@ IScsiConvertIfrNvDataToAttemptConfigData (
Status = gRT->SetVariable ( Status = gRT->SetVariable (
L"AttemptOrder", L"AttemptOrder",
&gIScsiConfigGuid, &gIScsiConfigGuid,
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE, EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,
AttemptConfigOrderSize, AttemptConfigOrderSize,
AttemptConfigOrder AttemptConfigOrder
); );
@ -1246,8 +1246,7 @@ IScsiConfigDeleteAttempts (
} }
} }
Attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS Attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE;
| EFI_VARIABLE_NON_VOLATILE;
// //
// Update AttemptOrder in NVR. // Update AttemptOrder in NVR.
@ -1558,7 +1557,7 @@ IScsiConfigOrderAttempts (
Status = gRT->SetVariable ( Status = gRT->SetVariable (
L"AttemptOrder", L"AttemptOrder",
&gIScsiConfigGuid, &gIScsiConfigGuid,
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE, EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,
AttemptConfigOrderSize, AttemptConfigOrderSize,
AttemptConfigOrderTmp AttemptConfigOrderTmp
); );

8
NetworkPkg/IScsiDxe/IScsiDriver.c
View File

@ -651,7 +651,9 @@ IScsiStart (
&gIScsiConfigGuid, &gIScsiConfigGuid,
&AttemptConfigOrderSize &AttemptConfigOrderSize
); );
ASSERT (AttemptConfigOrder != NULL); if (AttemptConfigOrder == NULL) {
goto ON_ERROR;
}
for (Index = 0; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) { for (Index = 0; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {
if (AttemptConfigOrder[Index] == mPrivate->BootSelectedIndex || if (AttemptConfigOrder[Index] == mPrivate->BootSelectedIndex ||
AttemptConfigOrder[Index] == BootSelected) { AttemptConfigOrder[Index] == BootSelected) {
@ -689,7 +691,9 @@ IScsiStart (
goto ON_EXIT; goto ON_EXIT;
} else { } else {
ASSERT (AttemptConfigOrder[Index] == BootSelected); if (AttemptConfigOrder[Index] != BootSelected) {
goto ON_ERROR;
}
mPrivate->BootSelectedIndex = BootSelected; mPrivate->BootSelectedIndex = BootSelected;
// //
// Clear the resource in ExistPrivate. // Clear the resource in ExistPrivate.