From owner-svn-src-projects@FreeBSD.ORG  Thu Oct  8 21:34:40 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A2BF01065670;
	Thu,  8 Oct 2009 21:34:40 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 92CD18FC19;
	Thu,  8 Oct 2009 21:34:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n98LYeHv033928;
	Thu, 8 Oct 2009 21:34:40 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n98LYeq4033926;
	Thu, 8 Oct 2009 21:34:40 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200910082134.n98LYeq4033926@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 8 Oct 2009 21:34:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197873 - projects/capabilities8/sys/kern
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Oct 2009 21:34:40 -0000

Author: rwatson
Date: Thu Oct  8 21:34:40 2009
New Revision: 197873
URL: http://svn.freebsd.org/changeset/base/197873

Log:
  Manually merge r197720 from head to capabilities8:
  
    Don't comment on stream socket handling in sosend_dgram, since that's
    not handled.

Modified:
  projects/capabilities8/sys/kern/uipc_socket.c

Modified: projects/capabilities8/sys/kern/uipc_socket.c
==============================================================================
--- projects/capabilities8/sys/kern/uipc_socket.c	Thu Oct  8 21:32:29 2009	(r197872)
+++ projects/capabilities8/sys/kern/uipc_socket.c	Thu Oct  8 21:34:40 2009	(r197873)
@@ -961,9 +961,6 @@ sosend_dgram(struct socket *so, struct s
 	 * must use a signed comparison of space and resid.  On the other
 	 * hand, a negative resid causes us to loop sending 0-length
 	 * segments to the protocol.
-	 *
-	 * Also check to make sure that MSG_EOR isn't used on SOCK_STREAM
-	 * type sockets since that's an error.
 	 */
 	if (resid < 0) {
 		error = EINVAL;