From owner-p4-projects@FreeBSD.ORG  Mon Jun 29 03:35:57 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9D98A106566C; Mon, 29 Jun 2009 03:35:56 +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 4F67D1065673
	for <perforce@FreeBSD.org>; Mon, 29 Jun 2009 03:35:56 +0000 (UTC)
	(envelope-from fangwang@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D8BC8FC19
	for <perforce@FreeBSD.org>; Mon, 29 Jun 2009 03:35:56 +0000 (UTC)
	(envelope-from fangwang@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5T3Zu5t039189
	for <perforce@FreeBSD.org>; Mon, 29 Jun 2009 03:35:56 GMT
	(envelope-from fangwang@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5T3Zup4039187
	for perforce@freebsd.org; Mon, 29 Jun 2009 03:35:56 GMT
	(envelope-from fangwang@FreeBSD.org)
Date: Mon, 29 Jun 2009 03:35:56 GMT
Message-Id: <200906290335.n5T3Zup4039187@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fangwang@FreeBSD.org using -f
From: Fang Wang <fangwang@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 165364 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Mon, 29 Jun 2009 03:35:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=165364

Change 165364 by fangwang@fangwang_utobsd on 2009/06/29 03:34:56

	Fix compile error.

Affected files ...

.. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_syncache.c#8 edit
.. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_usrreq.c#4 edit

Differences ...

==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_syncache.c#8 (text+ko) ====

@@ -776,10 +776,6 @@
 			tp->uto_flags |= TCPUTO_RCVD;
 			tp->rcv_uto = sc->sc_peer_uto;
 		}
-		if (sc->sc_flags & SCF_SENT_UTO) {
-			tp->uto_flags |= TCPUTO_SENT;
-			tp->snd_uto = sc->sc_uto;
-		}
 	}
 
 	if (sc->sc_flags & SCF_ECN)

==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_usrreq.c#4 (text+ko) ====

@@ -1374,8 +1374,15 @@
 				return (error);
 
 			INP_WLOCK_RECHECK(inp);
-			if (tu.uto > 0 && tu.uto <= 0x8FFF * 60) {
-				if (optval > 0x8FFF) {
+			if (tu.flags & ENABLE_UTO)
+				tp->uto_flags |= TCPUTO_ENABLE;
+			if (tu.flags & STORE_UTO)
+				tp->uto_flags |= TCPUTO_NEED;
+			if ( tu.flags & ENABLE_CHANGE)
+				tp->uto_flags |= TCPUTO_CHANGEABLE;
+			if (tu.flags & STORE_UTO &&
+			    tu.uto > 0 && tu.uto <= 0x8FFF * 60) {
+				if (tu.uto > 0x8FFF) {
 					tp->snd_uto = tu.uto / 60;
 					tp->snd_uto <<= 1;
 					tp->snd_uto |= 1;
@@ -1383,10 +1390,6 @@
 					tp->snd_uto = tu.uto;
 					tp->snd_uto <<= 1;
 				}
-				if (tu.flags & ENABLE_UTO)
-					tp->uto_flags |= TCPUTO_ENABLE;
-				if (tu.flags & STORE_UTO)
-					tp->uto_flags |= TCPUTO_NEED;
 				if (tp->uto_flags & TCPUTO_ENABLE &&
 				    tp->uto_flags & TCPUTO_NEED) {
 					tp->t_uto_impl = min(tcp_uto_max, 
@@ -1395,8 +1398,7 @@
 					tp->uto_flags &= ~TCPUTO_CHANGEABLE;
 					tp->uto_flags |= TCPUTO_IMPL;
 				}
-				if (tu.flags & ENABLE_CHANGE)
-					tp->uto_flags |= TCPUTO_CHANGEABLE;
+			}
 			else
 				error = EINVAL;
 			INP_WUNLOCK(inp);