From owner-p4-projects@FreeBSD.ORG  Mon May  5 15:52:27 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 308C937B47B; Mon,  5 May 2003 15:52:24 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AD89637B47C
	for <perforce@freebsd.org>; Mon,  5 May 2003 15:52:23 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 648F144086
	for <perforce@freebsd.org>; Mon,  5 May 2003 15:51:17 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45MpA0U017476
	for <perforce@freebsd.org>; Mon, 5 May 2003 15:51:10 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45MpAvs017473
	for perforce@freebsd.org; Mon, 5 May 2003 15:51:10 -0700 (PDT)
Date: Mon, 5 May 2003 15:51:10 -0700 (PDT)
Message-Id: <200305052251.h45MpAvs017473@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 30642 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 05 May 2003 22:52:32 -0000

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

Change 30642 by rwatson@rwatson_tislabs on 2003/05/05 15:50:27

	Restore older ordering of zeroing pcb pointer in socket to
	minimize diff against -current.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#31 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#31 (text+ko) ====

@@ -1648,11 +1648,11 @@
 	}
 	tcp_discardcb(tp);
 	so = inp->inp_socket;
+	so->so_pcb = NULL;
 	tw->tw_cred = crhold(so->so_cred);
 	tw->tw_so_options = so->so_options;
 	if (acknow)
 		tcp_twrespond(tw, so, NULL, TH_ACK);
-	so->so_pcb = NULL;
 	sotryfree(so);
 	inp->inp_socket = NULL;
 	inp->inp_ppcb = (caddr_t)tw;