From: Jiaxin Wu Date: Tue, 14 Jul 2015 03:41:44 +0000 (+0000) Subject: ShellPkg: Fix ping IPv6 stack usage mode failure issue X-Git-Tag: edk2-stable201903~9337 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=39a650691dc87cfd83414661709fee88e7727a79 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 Reviewed-by: Jaben Carsey Reviewed-by: Ye Ting git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17940 6f19259b-4bc3-4df7-8a09-765794883524 --- 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 1971ebc5f6..7cc7b7d672 100644 Binary files a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.uni and b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.uni differ