From owner-p4-projects@FreeBSD.ORG Mon Jun 15 16:24:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 098FF10656C3; Mon, 15 Jun 2009 16:24:42 +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 BB46A10656C1 for ; Mon, 15 Jun 2009 16:24:41 +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 A94068FC13 for ; Mon, 15 Jun 2009 16:24:41 +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 n5FGOfwL084281 for ; Mon, 15 Jun 2009 16:24:41 GMT (envelope-from fangwang@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5FGOfUv084279 for perforce@freebsd.org; Mon, 15 Jun 2009 16:24:41 GMT (envelope-from fangwang@FreeBSD.org) Date: Mon, 15 Jun 2009 16:24:41 GMT Message-Id: <200906151624.n5FGOfUv084279@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fangwang@FreeBSD.org using -f From: Fang Wang To: Perforce Change Reviews Cc: Subject: PERFORCE change 164431 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jun 2009 16:24:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=164431 Change 164431 by fangwang@fangwang_utobsd on 2009/06/15 16:24:29 Fix compile error. Affected files ... .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_syncache.c#5 edit .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_timer.c#4 edit Differences ... ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_syncache.c#5 (text+ko) ==== @@ -1398,7 +1398,7 @@ } optlen = tcp_addoptions(&to, (u_char *)(th + 1)); - if ((to->to_flags & TOF_UTO) == 0 && + if ((to.to_flags & TOF_UTO) == 0 && (sc->sc_flags & SCF_UTO) == 1) { sc->sc_flags &= ~SCF_UTO; sc->sc_flags |= SCF_SENT_UTO; ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_timer.c#4 (text+ko) ==== @@ -512,7 +512,7 @@ * to a longer retransmit interval and retransmit one segment. */ if ((++tp->t_rxtshift > TCP_MAXRXTSHIFT && (tp->uto_flags & TCPUTO_IMPL) == 0) || - (tp->t_uto_left == 0 && tp->uto_flags & TCPUTO_IMPL) { + (tp->t_uto_left == 0 && tp->uto_flags & TCPUTO_IMPL)) { tp->t_rxtshift = TCP_MAXRXTSHIFT; TCPSTAT_INC(tcps_timeoutdrop); tp = tcp_drop(tp, tp->t_softerror ?