From owner-svn-src-user@FreeBSD.ORG  Wed Sep  2 03:03:54 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 4E4E8106568D;
	Wed,  2 Sep 2009 03:03:54 +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 3DC188FC15;
	Wed,  2 Sep 2009 03:03:54 +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 n8233sAE079643;
	Wed, 2 Sep 2009 03:03:54 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8233s1R079641;
	Wed, 2 Sep 2009 03:03:54 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200909020303.n8233s1R079641@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 2 Sep 2009 03:03:54 +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: r196749 - user/kmacy/releng_7_2_fcs_1/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: Wed, 02 Sep 2009 03:03:54 -0000

Author: kmacy
Date: Wed Sep  2 03:03:53 2009
New Revision: 196749
URL: http://svn.freebsd.org/changeset/base/196749

Log:
  don't delay acks on localhost

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

Modified: user/kmacy/releng_7_2_fcs_1/sys/netinet/tcp_input.c
==============================================================================
--- user/kmacy/releng_7_2_fcs_1/sys/netinet/tcp_input.c	Wed Sep  2 03:03:35 2009	(r196748)
+++ user/kmacy/releng_7_2_fcs_1/sys/netinet/tcp_input.c	Wed Sep  2 03:03:53 2009	(r196749)
@@ -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)))