From 42737ed919516127995a8b100c3aafbe655be7e7 Mon Sep 17 00:00:00 2001
From: hhuan13 <hhuan13@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 18 Jul 2011 08:28:30 +0000
Subject: [PATCH] 1. Fix a bug : netboot6 client hangs if DHCPv6 Advertisement
 received without netboot6 info

Signed-off-by: hhuan13
Reviewed-by: tye1
Reviewed-by: qianouyang


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12022 6f19259b-4bc3-4df7-8a09-765794883524
---
 NetworkPkg/Dhcp6Dxe/Dhcp6Io.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c
index 761f9c2d36..cca1468683 100644
--- a/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c
+++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c
@@ -1,7 +1,7 @@
 /** @file
   Dhcp6 internal functions implementation.
 
-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2011, 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
@@ -2797,6 +2797,7 @@ Dhcp6OnTimerTick (
   DHCP6_TX_CB               *TxCb;
   DHCP6_IA_CB               *IaCb;
   UINT32                    LossTime;
+  EFI_STATUS                Status;
 
   ASSERT (Context != NULL);
 
@@ -2827,7 +2828,10 @@ Dhcp6OnTimerTick (
           //
           // Select the advertisement received before.
           //
-          Dhcp6SelectAdvertiseMsg (Instance, Instance->AdSelect);
+          Status = Dhcp6SelectAdvertiseMsg (Instance, Instance->AdSelect);
+          if (EFI_ERROR (Status)) {
+            TxCb->RetryCnt++;
+          }
           return;
         }
       }
-- 
2.39.2