From owner-p4-projects@FreeBSD.ORG  Sun Jan 18 18:52:44 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8EC0A16A4D0; Sun, 18 Jan 2004 18:52:44 -0800 (PST)
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 68E3816A4CE
	for <perforce@freebsd.org>; Sun, 18 Jan 2004 18:52:44 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 929B743D1D
	for <perforce@freebsd.org>; Sun, 18 Jan 2004 18:52:43 -0800 (PST)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0J2qh0B060215
	for <perforce@freebsd.org>; Sun, 18 Jan 2004 18:52:43 -0800 (PST)
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0J2qhMu060212
	for perforce@freebsd.org; Sun, 18 Jan 2004 18:52:43 -0800 (PST)
	(envelope-from scottl@freebsd.org)
Date: Sun, 18 Jan 2004 18:52:43 -0800 (PST)
Message-Id: <200401190252.i0J2qhMu060212@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45576 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, 19 Jan 2004 02:52:45 -0000

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

Change 45576 by scottl@scottl_netperf_socket on 2004/01/18 18:51:50

	Fix two more mis-merges.

Affected files ...

.. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#3 integrate
.. //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#2 integrate

Differences ...

==== //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#3 (text+ko) ====

@@ -541,7 +541,6 @@
 	struct socket *so;
 	struct tcpcb *tp;
 
-	GIANT_REQUIRED;			/* XXX until socket locking */
 	INP_INFO_WLOCK_ASSERT(&tcbinfo);
 
 	/*

==== //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#2 (text+ko) ====

@@ -1302,7 +1302,7 @@
 	sipx->sipx_len = sizeof *sipx;
 	sipx->sipx_family = AF_IPX;
 	sipx->sipx_addr = ipxp->ipxp_faddr;
-	*nam = dup_sockaddr((struct sockaddr *)sipx, 0);
+	*nam = sodupsockaddr((struct sockaddr *)sipx, M_NOWAIT);
 	return (0);
 }