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
retrieving revision 1.21.4.2
retrieving revision 1.22
diff -u -p -r1.21.4.2 -r1.22
--- src/sys/kern/uipc_socket.c	1996/12/11 03:27:58	1.21.4.2
+++ src/sys/kern/uipc_socket.c	1996/05/22 13:54:58	1.22
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.21.4.2 1996/12/11 03:27:58 mycroft Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.22 1996/05/22 13:54:58 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1990, 1993
@@ -243,7 +243,6 @@ soconnect(so, nam)
 	register struct socket *so;
 	struct mbuf *nam;
 {
-	struct proc *p = curproc;		/* XXX */
 	int s;
 	int error;
 
@@ -262,7 +261,8 @@ soconnect(so, nam)
 		error = EISCONN;
 	else
 		error = (*so->so_proto->pr_usrreq)(so, PRU_CONNECT,
-		    (struct mbuf *)0, nam, (struct mbuf *)0, p);
+		    (struct mbuf *)0, nam, (struct mbuf *)0,
+		    (struct proc *)0);
 	splx(s);
 	return (error);
 }
@@ -429,7 +429,7 @@ restart:
 				} else
 					len = min(MCLBYTES, resid);
 #endif
-				space -= len;
+				space -= MCLBYTES;
 			} else {
 nopages:
 				len = min(min(mlen, resid), space);
@@ -459,8 +459,8 @@ nopages:
 			    so->so_options |= SO_DONTROUTE;
 		    s = splsoftnet();				/* XXX */
 		    error = (*so->so_proto->pr_usrreq)(so,
-			(flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND,
-			top, addr, control, p);
+			(flags & MSG_OOB) ?  PRU_SENDOOB : PRU_SEND,
+			top, addr, control, (struct proc *)0);
 		    splx(s);
 		    if (dontroute)
 			    so->so_options &= ~SO_DONTROUTE;