From 39a650691dc87cfd83414661709fee88e7727a79 Mon Sep 17 00:00:00 2001
From: Jiaxin Wu <jiaxin.wu@intel.com>
Date: Tue, 14 Jul 2015 03:41:44 +0000
Subject: [PATCH] ShellPkg: Fix ping IPv6 stack usage mode failure issue

Fix ping IPv6 stack usage mode failure issue and also
update its the help info.
Verified command:
*ping -?
*Ping -_ip6 -_s 2000:bbbb::12 2000:bbbb::8

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17940 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../UefiShellNetwork1CommandsLib/Ping.c       |   7 +------
 .../UefiShellNetwork1CommandsLib.uni          | Bin 20078 -> 20910 bytes
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c
index fda062de1d..643be2304f 100644
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c
@@ -599,6 +599,7 @@ PingGenerateToken (
   Request->Type        = (UINT8)(Private->IpChoice==PING_IP_CHOICE_IP6?ICMP_V6_ECHO_REQUEST:ICMP_V4_ECHO_REQUEST);
   Request->Code        = 0;
   Request->SequenceNum = SequenceNum;
+  Request->TimeStamp   = TimeStamp; 
   Request->Identifier  = 0;
   Request->Checksum    = 0;
 
@@ -627,7 +628,6 @@ PingGenerateToken (
     ((EFI_IP4_TRANSMIT_DATA*)TxData)->DestinationAddress.Addr[3]      = Private->DstAddress[3];
 
     HeadSum = NetChecksum ((UINT8 *) Request, Private->BufferSize);
-    Request->TimeStamp   = TimeStamp;
     TempChecksum = NetChecksum ((UINT8 *) &Request->TimeStamp, sizeof (UINT64));
     Request->Checksum = (UINT16)(~NetAddChecksum (HeadSum, TempChecksum));
   }
@@ -804,11 +804,6 @@ Ping6OnTimerRoutine (
       RemoveEntryList (&TxInfo->Link);
       PingDestroyTxInfo (TxInfo, Private->IpChoice);
 
-      //
-      // We dont need to wait for this some other time...
-      //
-      Private->RxCount++;
-
       if (IsListEmpty (&Private->TxList) && (Private->TxCount == Private->SendNum)) {
         //
         // All the left icmp6 echo request in the list timeout.
diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.uni b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.uni
index 1971ebc5f69c0e7de6ef2252de0428ac75bfaaaf..7cc7b7d672246a62ef97a8b002a780003d3da330 100644
GIT binary patch
delta 466
zcmaDihjHCv#tj*Ug82+Z3<?aM3;_&f3}!%9@#JnB+sVre-FQ)CCO5jsPj0Z|m@HuA
z#Gc7e08|^h+0*DJBP*CQdA)<aHCQ`C2}2@7GD9}ds8WVvAUmBQ70AwI$Y)3avosi7
zfOHyArj#KEs9J#`6KLsuLvcpU$@cb=lO0Ur(5#+ql8h$u(M@<VpJ@$NQNGE$4EZK+
zGd%$Jnlpnh#CwyA&D<v+vXBr}U~pw{X7FI}XNYGA0<r@bd>A4(KR0t^nrvVsG}*zz
zL9hVm$Yh|?(ikd%WFABMWI<EO$#o`rlaoBfCO<HjV~z(p`?rNGqY;qQh3Rv}&<FHj
z2}1_h>qw!DKbR&bdWwVWP>cuK4GL=o1|tRoFtlPwf<h|>D+Y_njOLP?4J_?M0lc+t
A0RR91

delta 120
zcmZ3tnDN~l#tj*Uli!(eO}=7pGI^V!8<>60U1;(FM~=w`MoycXj6N_<7BP*Pe9MY&
za-V6?<O{w6lgw%$6yM}I)_jw9m>rnhW9}lVz~IW@%;3S`&k)ZL1Y`#=_%K9HerO@N
Q`JcH16UfBP1vYk~0Ao%pA^-pY

-- 
2.39.2