2 files changed, 10 insertions, 28 deletions
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
index 183dc0ced7..6c36d058f6 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
@@ -1,7 +1,7 @@
 /** @file
   This implementation of EFI_PXE_BASE_CODE_PROTOCOL and EFI_LOAD_FILE_PROTOCOL.
 
-  Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2007 - 2013, 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
@@ -428,10 +428,6 @@ EfiPxeBcDhcp (
     // Start S.A.R.R. process to get a IPv6 address and other boot information.
     //
     Status = PxeBcDhcp6Sarr (Private, Private->Dhcp6);
-
-    if (EFI_ERROR (Status)) {
-      goto ON_EXIT;
-    }
   } else {
 
     //
@@ -443,13 +439,11 @@ EfiPxeBcDhcp (
     // Start D.O.R.A. process to get a IPv4 address and other boot information.
     //
     Status = PxeBcDhcp4Dora (Private, Private->Dhcp4);
-
-    if (EFI_ERROR (Status)) {
-      goto ON_EXIT;
-    }
   }
-  
-ON_EXIT:
+
+  //
+  // Reconfigure the UDP instance with the default configuration.
+  //
   if (Mode->UsingIpv6) {
     Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData);
   } else {
@@ -690,9 +684,7 @@ EfiPxeBcDiscover (
       }
   }
 
-  if (EFI_ERROR (Status)) {
-    goto ON_EXIT;
-  } else {
+  if (!EFI_ERROR (Status)) {
     //
     // Parse the cached PXE reply packet, and store it into mode data if valid.
     //
@@ -964,11 +956,9 @@ EfiPxeBcMtftp (
     Mode->IcmpErrorReceived = TRUE;
   }
 
-  if (EFI_ERROR (Status)) {
-    goto ON_EXIT;
-  }
-  
-ON_EXIT:
+  //
+  // Reconfigure the UDP instance with the default configuration.
+  //
   if (Mode->UsingIpv6) {
     Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData);
   } else {
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
index f918d6a298..e6fb01ca71 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
@@ -1,7 +1,7 @@
 /** @file
   Support functions implementation for UefiPxeBc Driver.
 
-  Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2007 - 2013, 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
@@ -59,10 +59,6 @@ PxeBcFlushStaionIp (
     }
 
     Status = Private->Ip6->Receive (Private->Ip6, &Private->Icmp6Token);
-    if (EFI_ERROR (Status)) {
-      goto ON_EXIT;
-    }
-
   } else {
     ASSERT (SubnetMask != NULL);
     CopyMem (&Private->Udp4CfgData.StationAddress, StationIp, sizeof (EFI_IPv4_ADDRESS));
@@ -82,10 +78,6 @@ PxeBcFlushStaionIp (
     }
 
     Status = Private->Ip4->Receive (Private->Ip4, &Private->IcmpToken);
-    if (EFI_ERROR (Status)) {
-      goto ON_EXIT;
-    }
-
   }
 
 ON_EXIT: