From owner-p4-projects@FreeBSD.ORG  Tue Sep  2 17:18:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 94DEA106567D; Tue,  2 Sep 2008 17:18:00 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 57AF81065671
	for <perforce@FreeBSD.org>; Tue,  2 Sep 2008 17:18:00 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4ACD08FC25
	for <perforce@FreeBSD.org>; Tue,  2 Sep 2008 17:18:00 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82HI0fj034272
	for <perforce@FreeBSD.org>; Tue, 2 Sep 2008 17:18:00 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m82HI0NO034270
	for perforce@freebsd.org; Tue, 2 Sep 2008 17:18:00 GMT
	(envelope-from ed@FreeBSD.org)
Date: Tue, 2 Sep 2008 17:18:00 GMT
Message-Id: <200809021718.m82HI0NO034270@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten <ed@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 149067 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Sep 2008 17:18:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=149067

Change 149067 by ed@ed_dull on 2008/09/02 17:17:00

	IFC my ttydisc fix.

Affected files ...

.. //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#19 integrate
.. //depot/projects/mpsafetty/sys/kern/uipc_socket.c#3 integrate

Differences ...

==== //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#19 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/tty_ttydisc.c,v 1.2 2008/08/29 15:02:50 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/tty_ttydisc.c,v 1.3 2008/09/02 17:13:11 ed Exp $");
 
 #include <sys/param.h>
 #include <sys/fcntl.h>
@@ -1100,6 +1100,7 @@
 		ttyhook_getc_capture(tp, buf, len);
 
 	ttydisc_wakeup_watermark(tp);
+
 	atomic_add_long(&tty_nout, len);
 
 	return (len);

==== //depot/projects/mpsafetty/sys/kern/uipc_socket.c#3 (text+ko) ====

@@ -95,7 +95,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.313 2008/07/21 00:49:34 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.314 2008/09/02 16:55:21 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_mac.h"
@@ -1857,7 +1857,6 @@
 	int flags, len, error, offset;
 	struct protosw *pr = so->so_proto;
 	struct mbuf *nextrecord;
-	int orig_resid = uio->uio_resid;
 
 	if (psa != NULL)
 		*psa = NULL;
@@ -1935,7 +1934,6 @@
 		SBLASTRECORDCHK(&so->so_rcv);
 		SBLASTMBUFCHK(&so->so_rcv);
 
-		/* XXXRW: sbwait() may not be as happy without sblock(). */
 		error = sbwait(&so->so_rcv);
 		SOCKBUF_UNLOCK(&so->so_rcv);
 		if (error)
@@ -1968,7 +1966,6 @@
 	if (pr->pr_flags & PR_ADDR) {
 		KASSERT(m->m_type == MT_SONAME,
 		    ("m->m_type == %d", m->m_type));
-		orig_resid = 0;
 		if (psa != NULL)
 			*psa = sodupsockaddr(mtod(m, struct sockaddr *),
 			    M_NOWAIT);
@@ -2048,13 +2045,11 @@
 			else
 				m_freem(cm);
 			if (controlp != NULL) {
-				orig_resid = 0;
 				while (*controlp != NULL)
 					controlp = &(*controlp)->m_next;
 			}
 			cm = cmn;
 		}
-		orig_resid = 0;	/* XXXRW: why this? */
 	}
 
 	KASSERT(m->m_type == MT_DATA, ("soreceive_dgram: !data"));