Merge branch 'master' of https://github.com/tianocore/edk2 into MemoryAttributeTable

This commit is contained in:
jiewen yao 2016-02-17 09:05:35 +08:00
commit ca92a370b9
3 changed files with 9 additions and 9 deletions

View File

@ -80,12 +80,12 @@ PxeGetStatus (
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb); (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
if (Snp->Cdb.StatCode != EFI_SUCCESS) { if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {
DEBUG ( DEBUG (
(EFI_D_NET, (EFI_D_NET,
"\nSnp->undi.get_status() %xh:%xh\n", "\nSnp->undi.get_status() %xh:%xh\n",
Snp->Cdb.StatFlags, Snp->Cdb.StatFlags,
Snp->Cdb.StatFlags) Snp->Cdb.StatCode)
); );
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;

View File

@ -2,7 +2,7 @@
Implementation of managing the multicast receive filters of a network Implementation of managing the multicast receive filters of a network
interface. interface.
Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available under the 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 terms and conditions of the BSD License which accompanies this distribution. The
full text of the license may be found at full text of the license may be found at
@ -83,7 +83,7 @@ PxeRecvFilterEnable (
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb); (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
if (Snp->Cdb.StatCode != EFI_SUCCESS) { if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {
// //
// UNDI command failed. Return UNDI status to caller. // UNDI command failed. Return UNDI status to caller.
// //
@ -171,7 +171,7 @@ PxeRecvFilterDisable (
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb); (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
if (Snp->Cdb.StatCode != EFI_SUCCESS) { if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {
// //
// UNDI command failed. Return UNDI status to caller. // UNDI command failed. Return UNDI status to caller.
// //
@ -223,7 +223,7 @@ PxeRecvFilterRead (
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb); (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
if (Snp->Cdb.StatCode != EFI_SUCCESS) { if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {
// //
// UNDI command failed. Return UNDI status to caller. // UNDI command failed. Return UNDI status to caller.
// //

View File

@ -1,7 +1,7 @@
/** @file /** @file
Implementation of stopping a network interface. Implementation of stopping a network interface.
Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed This program and the accompanying materials are licensed
and made available under the terms and conditions of the BSD License which 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 accompanies this distribution. The full text of the license may be found at
@ -51,8 +51,8 @@ PxeStop (
DEBUG ( DEBUG (
(EFI_D_WARN, (EFI_D_WARN,
"\nsnp->undi.stop() %xh:%xh\n", "\nsnp->undi.stop() %xh:%xh\n",
Snp->Cdb.StatCode, Snp->Cdb.StatFlags,
Snp->Cdb.StatFlags) Snp->Cdb.StatCode)
); );
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;