From owner-svn-src-stable@FreeBSD.ORG  Fri Jul  5 19:11:13 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 688DE4EC;
 Fri,  5 Jul 2013 19:11:13 +0000 (UTC)
 (envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5955B1D94;
 Fri,  5 Jul 2013 19:11:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65JBD6W045049;
 Fri, 5 Jul 2013 19:11:13 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65JBDfW045048;
 Fri, 5 Jul 2013 19:11:13 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201307051911.r65JBDfW045048@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Fri, 5 Jul 2013 19:11:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252825 - stable/9/sys/netinet
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jul 2013 19:11:13 -0000

Author: andre
Date: Fri Jul  5 19:11:12 2013
New Revision: 252825
URL: http://svnweb.freebsd.org/changeset/base/252825

Log:
  MFC r242308:
  
    Define the delayed ACK timeout value directly as hz/10 instead of
    obfuscating it by going through PR_FASTHZ.  No functional change.

Modified:
  stable/9/sys/netinet/tcp_timer.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/tcp_timer.h
==============================================================================
--- stable/9/sys/netinet/tcp_timer.h	Fri Jul  5 18:56:04 2013	(r252824)
+++ stable/9/sys/netinet/tcp_timer.h	Fri Jul  5 19:11:12 2013	(r252825)
@@ -118,7 +118,7 @@
 
 #define	TCP_MAXRXTSHIFT	12			/* maximum retransmits */
 
-#define	TCPTV_DELACK	(hz / PR_FASTHZ / 2)	/* 100ms timeout */
+#define	TCPTV_DELACK	( hz/10 )		/* 100ms timeout */
 
 #ifdef	TCPTIMERS
 static const char *tcptimers[] =