PERFORCE change 45576 for review

[Scott Long]

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

Change 45576 by scottl at 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);
 }