From: Bill Joy <root@ucbvax.Berkeley.EDU>
Date: Fri, 8 Jan 1982 14:13:35 +0000 (-0800)
Subject: minor bug fixes
X-Git-Tag: BSD-4_1_snap-Snapshot-Development~228
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/2156d53c445f7d87e69c13bdb48ee597af1329b4?hp=b8977237dc6119679eae962f6e6c3cc27767f7bf

minor bug fixes

SCCS-vsn: sys/kern/uipc_socket.c 4.22
---

diff --git a/usr/src/sys/kern/uipc_socket.c b/usr/src/sys/kern/uipc_socket.c
index 5821c08c0a..2cd2c0cee3 100644
--- a/usr/src/sys/kern/uipc_socket.c
+++ b/usr/src/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/*	uipc_socket.c	4.21	81/12/22	*/
+/*	uipc_socket.c	4.22	82/01/07	*/
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -393,13 +393,13 @@ restart:
 		if (len == m->m_len) {
 			eor = (int)m->m_act;
 			sbfree(&so->so_rcv, m);
+			so->so_rcv.sb_mb = m->m_next;
 		}
 		splx(s);
 		iomove(mtod(m, caddr_t), len, B_READ);
 		s = splnet();
 		if (len == m->m_len) {
 			MFREE(m, n);
-			so->so_rcv.sb_mb = n;
 		} else {
 			m->m_off += len;
 			m->m_len -= len;
@@ -432,7 +432,7 @@ soioctl(so, cmd, cmdp)
 {
 
 COUNT(SOIOCTL);
-	switch (cmdp) {
+	switch (cmd) {
 
 	case SIOCDONE: {
 		int flags;
@@ -446,7 +446,7 @@ COUNT(SOIOCTL);
 			sbflush(&so->so_rcv);
 		}
 		if (flags & FWRITE)
-			(*so->so_proto->pr_usrreq)(so, PRU_DISCONNECT, (struct mbuf *)0, 0);
+			u.u_error = (*so->so_proto->pr_usrreq)(so, PRU_DISCONNECT, (struct mbuf *)0, 0);
 		return;
 	}