From owner-svn-src-user@FreeBSD.ORG  Sat Aug 22 00:56:48 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4B0BE106568B;
	Sat, 22 Aug 2009 00:56:48 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3AE3E8FC0C;
	Sat, 22 Aug 2009 00:56:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7M0ummx039817;
	Sat, 22 Aug 2009 00:56:48 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7M0umXM039815;
	Sat, 22 Aug 2009 00:56:48 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200908220056.n7M0umXM039815@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 22 Aug 2009 00:56:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196429 - user/kmacy/releng_7_2_fcs/sys/netinet
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Aug 2009 00:56:48 -0000

Author: kmacy
Date: Sat Aug 22 00:56:47 2009
New Revision: 196429
URL: http://svn.freebsd.org/changeset/base/196429

Log:
  don't delay acks on localhost

Modified:
  user/kmacy/releng_7_2_fcs/sys/netinet/tcp_input.c

Modified: user/kmacy/releng_7_2_fcs/sys/netinet/tcp_input.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/netinet/tcp_input.c	Sat Aug 22 00:56:17 2009	(r196428)
+++ user/kmacy/releng_7_2_fcs/sys/netinet/tcp_input.c	Sat Aug 22 00:56:47 2009	(r196429)
@@ -257,6 +257,8 @@ do { \
  */
 #define DELAY_ACK(tp)							\
 	((!tcp_timer_active(tp, TT_DELACK) &&				\
+	    !((tp->t_inpcb->inp_flags2 & INP_RT_VALID) &&		\
+		(tp->t_inpcb->inp_rt->rt_ifp->if_flags & IFF_LOOPBACK))	&& \
 	    (tp->t_flags & TF_RXWIN0SENT) == 0) &&			\
 	    (V_tcp_delack_enabled || (tp->t_flags & TF_NEEDSYN)))