===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tcpbench/tcpbench.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- src/usr.bin/tcpbench/tcpbench.c	2015/11/13 19:37:20	1.47
+++ src/usr.bin/tcpbench/tcpbench.c	2016/03/21 00:49:36	1.48
@@ -680,7 +680,8 @@
 	event_add(&ts->ev, NULL);
 	if (event & EV_TIMEOUT)
 		return;
-	if ((sock = accept(fd, (struct sockaddr *)&ss, &sslen)) == -1) {
+	if ((sock = accept4(fd, (struct sockaddr *)&ss, &sslen, SOCK_NONBLOCK))
+	    == -1) {
 		/*
 		 * Pause accept if we are out of file descriptors, or
 		 * libevent will haunt us here too.
@@ -697,11 +698,6 @@
 	}
 	saddr_ntop((struct sockaddr *)&ss, sslen,
 	    tmp, sizeof(tmp));
-	if ((r = fcntl(sock, F_GETFL, 0)) == -1)
-		err(1, "fcntl(F_GETFL)");
-	r |= O_NONBLOCK;
-	if (fcntl(sock, F_SETFL, r) == -1)
-		err(1, "fcntl(F_SETFL, O_NONBLOCK)");
 	if (ptb->Tflag != -1 && ss.ss_family == AF_INET) {
 		if (setsockopt(sock, IPPROTO_IP, IP_TOS,
 		    &ptb->Tflag, sizeof(ptb->Tflag)))