From owner-p4-projects@FreeBSD.ORG  Tue Jun 16 10:00:31 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8F4CE1065673; Tue, 16 Jun 2009 10:00:30 +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 4CDD1106566C
	for <perforce@FreeBSD.org>; Tue, 16 Jun 2009 10:00:30 +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 3A8F18FC1E
	for <perforce@FreeBSD.org>; Tue, 16 Jun 2009 10:00:30 +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 n5GA0U8L029809
	for <perforce@FreeBSD.org>; Tue, 16 Jun 2009 10:00:30 GMT
	(envelope-from fangwang@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5GA0UMO029807
	for perforce@freebsd.org; Tue, 16 Jun 2009 10:00:30 GMT
	(envelope-from fangwang@FreeBSD.org)
Date: Tue, 16 Jun 2009 10:00:30 GMT
Message-Id: <200906161000.n5GA0UMO029807@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 164488 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: Tue, 16 Jun 2009 10:00:32 -0000

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

Change 164488 by fangwang@fangwang_utobsd on 2009/06/16 09:59:52

	Fix panic problem.

Affected files ...

.. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_syncache.c#6 edit

Differences ...

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

@@ -978,6 +978,8 @@
 	u_int32_t flowtmp;
 	int win, sb_hiwat, ip_ttl, ip_tos, noopt;
 	char *s;
+	u_int8_t uto_flags;
+	u_int16_t snd_uto;
 #ifdef INET6
 	int autoflowlabel = 0;
 #endif
@@ -1011,6 +1013,9 @@
 	sb_hiwat = so->so_rcv.sb_hiwat;
 	noopt = (tp->t_flags & TF_NOOPT);
 
+	uto_flags = tp->uto_flags;
+	snd_uto = tp->snd_uto;
+
 	/* By the time we drop the lock these should no longer be used. */
 	so = NULL;
 	tp = NULL;
@@ -1221,8 +1226,8 @@
 		sc->sc_peer_uto = to->to_uto;
 		sc->sc_flags |= SCF_RCVD_UTO;
 	}
-	if (tp->uto_flags & TCPUTO_NEED) {
-		sc->sc_uto = tp->snd_uto;
+	if (uto_flags & TCPUTO_NEED) {
+		sc->sc_uto = snd_uto;
 		sc->sc_flags = SCF_UTO;
 	}