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.56
diff -u -p -r1.54.2.6 -r1.56
--- src/sys/kern/uipc_socket.c	2001/11/14 19:16:46	1.54.2.6
+++ 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.6 2001/11/14 19:16:46 nathanw Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.56 2001/04/13 23:30:10 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1990, 1993
@@ -35,14 +35,10 @@
  *	@(#)uipc_socket.c	8.6 (Berkeley) 5/2/95
  */
 
-#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"
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/lwp.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/malloc.h>
@@ -85,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
@@ -277,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,10 +353,10 @@ sosend(struct socket *so, struct mbuf *a
 {
 	struct proc	*p;
 	struct mbuf	**mp, *m;
-	long		space, len, resid, clen, mlen;
-	int		error, s, dontroute, atomic;
+	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)
@@ -451,19 +447,19 @@ sosend(struct socket *so, struct mbuf *a
 						goto nopages;
 					mlen = MCLBYTES;
 #ifdef	MAPPED_MBUFS
-					len = lmin(MCLBYTES, resid);
+					len = min(MCLBYTES, resid);
 #else
 					if (atomic && top == 0) {
-						len = lmin(MCLBYTES - max_hdr,
+						len = min(MCLBYTES - max_hdr,
 						    resid);
 						m->m_data += max_hdr;
 					} else
-						len = lmin(MCLBYTES, resid);
+						len = min(MCLBYTES, resid);
 #endif
 					space -= len;
 				} else {
 nopages:
-					len = lmin(lmin(mlen, resid), space);
+					len = min(min(mlen, resid), space);
 					space -= len;
 					/*
 					 * For datagram protocols, leave room
@@ -740,8 +736,6 @@ soreceive(struct socket *so, struct mbuf
 			splx(s);
 			error = uiomove(mtod(m, caddr_t) + moff, (int)len, uio);
 			s = splsoftnet();
-			if (error)
-				goto release;
 		} else
 			uio->uio_resid -= len;
 		if (len == m->m_len - moff) {