From owner-p4-projects@FreeBSD.ORG  Tue Aug  9 12:40:47 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B896F1065673; Tue,  9 Aug 2011 12:40:46 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7ADB21065670
	for <perforce@freebsd.org>; Tue,  9 Aug 2011 12:40:46 +0000 (UTC)
	(envelope-from cnicutar@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 681938FC08
	for <perforce@freebsd.org>; Tue,  9 Aug 2011 12:40:46 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p79CekuF031501
	for <perforce@freebsd.org>; Tue, 9 Aug 2011 12:40:46 GMT
	(envelope-from cnicutar@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p79CekDG031497
	for perforce@freebsd.org; Tue, 9 Aug 2011 12:40:46 GMT
	(envelope-from cnicutar@freebsd.org)
Date: Tue, 9 Aug 2011 12:40:46 GMT
Message-Id: <201108091240.p79CekDG031497@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	cnicutar@freebsd.org using -f
From: Catalin Nicutar <cnicutar@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 197422 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Aug 2011 12:40:47 -0000

http://p4web.freebsd.org/@@197422?ac=10

Change 197422 by cnicutar@cnicutar_cronos on 2011/08/09 12:40:43

	Fix inheriting received UTO for accepting sockets.

Affected files ...

.. //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_syncache.c#3 edit

Differences ...

==== //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_syncache.c#3 (text+ko) ====

@@ -831,10 +831,10 @@
 			tp->t_flags |= TF_SND_UTO;
 			tp->snd_uto = sc->sc_snd_uto;
 		}
-		if (sc->sc_flags & SCF_RCV_UTO) {
+		if (sc->sc_flags & SCF_RCV_UTO)
 			tp->t_flags |= TF_RCV_UTO;
-			tp->rcv_uto = sc->sc_rcv_uto;
-		}
+		/* Regardless of SCF_RCV_UTO. */
+		tp->rcv_uto = sc->sc_rcv_uto;
 	}
 
 	if (sc->sc_flags & SCF_ECN)
@@ -1086,11 +1086,10 @@
 		to->to_flags |= TOF_UTO;
 	}
 
-	if (tp->t_flags & TF_RCV_UTO) {
-		/* Remember received timeout to pass on. */
-		rcv_uto_tf = 1;
-		rcv_uto = tp->rcv_uto;
-	}
+	/* Remember received UTO regardless of disposition and clear it. */
+	rcv_uto_tf = tp->t_flags & TF_RCV_UTO;
+	rcv_uto = tp->rcv_uto;
+	tp->rcv_uto = 0;
 
 	/* By the time we drop the lock these should no longer be used. */
 	so = NULL;
@@ -1305,11 +1304,10 @@
 		sc->sc_flags |= SCF_SND_UTO;
 	}
 
-	/* Inherit received UTO. */
-	if (rcv_uto_tf) {
-		sc->sc_rcv_uto = rcv_uto;
+	/* Inherit received UTO, regardless of disposition. */
+	if (rcv_uto_tf)
 		sc->sc_flags |= SCF_RCV_UTO;
-	}
+	sc->sc_rcv_uto = rcv_uto;
 
 	if (V_tcp_syncookies) {
 		syncookie_generate(sch, sc, &flowtmp);