From owner-p4-projects@FreeBSD.ORG  Sun Aug 14 16:30:21 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E8AAE106566C; Sun, 14 Aug 2011 16:30:20 +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 AAD41106564A
	for <perforce@freebsd.org>; Sun, 14 Aug 2011 16:30:20 +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 980A58FC12
	for <perforce@freebsd.org>; Sun, 14 Aug 2011 16:30:20 +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 p7EGUKCt036454
	for <perforce@freebsd.org>; Sun, 14 Aug 2011 16:30:20 GMT
	(envelope-from cnicutar@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p7EGUK7h036451
	for perforce@freebsd.org; Sun, 14 Aug 2011 16:30:20 GMT
	(envelope-from cnicutar@freebsd.org)
Date: Sun, 14 Aug 2011 16:30:20 GMT
Message-Id: <201108141630.p7EGUK7h036451@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 197643 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: Sun, 14 Aug 2011 16:30:21 -0000

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

Change 197643 by cnicutar@cnicutar_cronos on 2011/08/14 16:29:39

	Fix UTO inheritance bug introduced in @197422.

Affected files ...

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

Differences ...

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

@@ -1052,7 +1052,7 @@
 	 * we need to inherit the current disposition (i.e. will the resulting
 	 * socket accept suggestions?).
 	 */
-	uint8_t rcv_uto_tf = 0;
+	uint16_t rcv_uto_tf;
 	uint32_t rcv_uto = 0;
 
 	INP_INFO_WLOCK_ASSERT(&V_tcbinfo);
@@ -1087,7 +1087,7 @@
 	}
 
 	/* Remember received UTO regardless of disposition and clear it. */
-	rcv_uto_tf = tp->t_flags & TF_RCV_UTO;
+	rcv_uto_tf = (tp->t_flags & TF_RCV_UTO) ? SCF_RCV_UTO : 0;
 	rcv_uto = tp->rcv_uto;
 	tp->rcv_uto = 0;
 
@@ -1305,8 +1305,7 @@
 	}
 
 	/* Inherit received UTO, regardless of disposition. */
-	if (rcv_uto_tf)
-		sc->sc_flags |= SCF_RCV_UTO;
+	sc->sc_flags |= rcv_uto_tf;
 	sc->sc_rcv_uto = rcv_uto;
 
 	if (V_tcp_syncookies) {