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

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Get_status.c b/MdeModulePkg/Universal/Network/SnpDxe/Get_status.c
index fad2e9821253e796d879e09d84b26e6e92abac5f..edbc0f2374994c73d3562439b896ee869a6b6178 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Get_status.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Get_status.c
@@ -80,12 +80,12 @@ PxeGetStatus (
 \r
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
 \r
-  if (Snp->Cdb.StatCode != EFI_SUCCESS) {\r
+  if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
     DEBUG (\r
       (EFI_D_NET,\r
       "\nSnp->undi.get_status()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
-      Snp->Cdb.StatFlags)\r
+      Snp->Cdb.StatCode)\r
       );\r
 \r
     return EFI_DEVICE_ERROR;\r

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

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