From owner-p4-projects@FreeBSD.ORG  Sun Jul 19 17:35:44 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 079641065676; Sun, 19 Jul 2009 17:35:44 +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 BA1361065673
	for <perforce@FreeBSD.org>; Sun, 19 Jul 2009 17:35:43 +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 A7A208FC14
	for <perforce@FreeBSD.org>; Sun, 19 Jul 2009 17:35:43 +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 n6JHZhPV086059
	for <perforce@FreeBSD.org>; Sun, 19 Jul 2009 17:35:43 GMT
	(envelope-from fangwang@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6JHZh7k086057
	for perforce@freebsd.org; Sun, 19 Jul 2009 17:35:43 GMT
	(envelope-from fangwang@FreeBSD.org)
Date: Sun, 19 Jul 2009 17:35:43 GMT
Message-Id: <200907191735.n6JHZh7k086057@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 166277 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: Sun, 19 Jul 2009 17:35:45 -0000

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

Change 166277 by fangwang@fangwang_utobsd on 2009/07/19 17:35:11

	Fix bug.

Affected files ...

.. //depot/projects/soc2009/tcputo/src/contrib/tcpdump/print-tcp.c#3 edit
.. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_usrreq.c#7 edit

Differences ...

==== //depot/projects/soc2009/tcputo/src/contrib/tcpdump/print-tcp.c#3 (text+ko) ====

@@ -618,10 +618,11 @@
                                 datalen = 2;
                                 LENCHECK(datalen);
                                 uint utoval = EXTRACT_16BITS(cp);
-                                if (utoval & (~(uint)0 - 1))
-                                        utoval = utoval >> 1;
+                                (void)printf("0x%x", utoval);
+                                if (utoval & 0x0001)
+                                        utoval = (utoval >> 1) * 60;
                                 else
-                                        utoval = (utoval >> 1) * 60;
+                                        utoval >>= 1;
                                 (void)printf(" %u", utoval);
                                 break;
 

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

@@ -1382,8 +1382,8 @@
 				tp->uto_flags |= TCPUTO_ENABLE;
 			if (tu.flags & STORE_UTO) {
 				tp->uto_flags |= TCPUTO_NEED;
-				if (tu.uto > 0 && tu.uto <= 0x8FFF * 60) {
-					if (tu.uto > 0x8FFF) {
+				if (tu.uto > 0 && tu.uto <= 0x7FFF * 60) {
+					if (tu.uto > 0x7FFF) {
 						tp->snd_uto = tu.uto / 60;
 						tp->snd_uto <<= 1;
 						tp->snd_uto |= 1;