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.2
retrieving revision 1.56
diff -u -p -r1.54.2.2 -r1.56
--- src/sys/kern/uipc_socket.c	2001/04/09 01:57:58	1.54.2.2
+++ src/sys/kern/uipc_socket.c	2001/04/13 23:30:10	1.56
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.54.2.2 2001/04/09 01:57:58 nathanw Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.56 2001/04/13 23:30:10 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1990, 1993
@@ -39,7 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/lwp.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/malloc.h>
@@ -82,7 +81,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
@@ -274,7 +273,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();
@@ -357,7 +356,7 @@ sosend(struct socket *so, struct mbuf *a
 	long		space, len, resid;
 	int		clen, error, s, dontroute, mlen, atomic;
 
-	p = curproc->l_proc;		/* XXX */
+	p = curproc;		/* XXX */
 	clen = 0;
 	atomic = sosendallatonce(so) || top;
 	if (uio)
@@ -864,7 +863,7 @@ sorflush(struct socket *so)
 	pr = so->so_proto;
 	sb->sb_flags |= SB_NOINTR;
 	(void) sblock(sb, M_WAITOK);
-	s = splimp();
+	s = splnet();
 	socantrcvmore(so);
 	sbunlock(sb);
 	asb = *sb;