Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.54.2.6
retrieving revision 1.62
diff -u -p -r1.54.2.6 -r1.62
--- src/sys/kern/uipc_socket.c	2001/11/14 19:16:46	1.54.2.6
+++ src/sys/kern/uipc_socket.c	2002/03/08 20:48:41	1.62
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.54.2.6 2001/11/14 19:16:46 nathanw Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.62 2002/03/08 20:48:41 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1990, 1993
@@ -36,13 +36,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.54.2.6 2001/11/14 19:16:46 nathanw Exp $");
-
-#include "opt_compat_sunos.h"
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.62 2002/03/08 20:48:41 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/lwp.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/malloc.h>
@@ -66,7 +63,7 @@ soinit(void)
 {
 
 	pool_init(&socket_pool, sizeof(struct socket), 0, 0, 0,
-	    "sockpl", 0, NULL, NULL, M_SOCKET);
+	    "sockpl", NULL);
 }
 
 /*
@@ -85,7 +82,7 @@ socreate(int dom, struct socket **aso, i
 	struct socket	*so;
 	int		error, s;
 
-	p = curproc->l_proc;	/* XXX */
+	p = curproc;		/* XXX */
 	if (proto)
 		prp = pffindproto(dom, proto, type);
 	else
@@ -113,13 +110,6 @@ socreate(int dom, struct socket **aso, i
 		splx(s);
 		return (error);
 	}
-#ifdef COMPAT_SUNOS
-	{
-		extern struct emul emul_sunos;
-		if (p->p_emul == &emul_sunos && type == SOCK_DGRAM)
-			so->so_options |= SO_BROADCAST;
-	}
-#endif
 	splx(s);
 	*aso = so;
 	return (0);
@@ -277,7 +267,7 @@ soconnect(struct socket *so, struct mbuf
 	struct proc	*p;
 	int		s, error;
 
-	p = curproc->l_proc;		/* XXX */
+	p = curproc;		/* XXX */
 	if (so->so_options & SO_ACCEPTCONN)
 		return (EOPNOTSUPP);
 	s = splsoftnet();
@@ -360,7 +350,7 @@ sosend(struct socket *so, struct mbuf *a
 	long		space, len, resid, clen, mlen;
 	int		error, s, dontroute, atomic;
 
-	p = curproc->l_proc;		/* XXX */
+	p = curproc;		/* XXX */
 	clen = 0;
 	atomic = sosendallatonce(so) || top;
 	if (uio)