From 58da716138fed5648490cd13411ebff712fa417d Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sat, 20 Sep 2014 18:48:50 +0000
Subject: [PATCH] Revert changes in r269180.  It could cause -c N option to
 enter an infinite loop if no reply packet is received.

PR:	151023
---
 sbin/ping6/ping6.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index b963de17689..01e29a194e3 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1090,14 +1090,8 @@ main(int argc, char *argv[])
 		/* signal handling */
 		if (seenalrm) {
 			/* last packet sent, timeout reached? */
-			if (npackets && ntransmitted >= npackets) {
-				struct timeval zerotime = {0, 0};
-				itimer.it_value = zerotime;
-				itimer.it_interval = zerotime;
-				(void)setitimer(ITIMER_REAL, &itimer, NULL);
-				seenalrm = 0;   /* clear flag */
-				continue;
-			}
+			if (npackets && ntransmitted >= npackets)
+				break;
 			retransmit();
 			seenalrm = 0;
 			continue;