svn commit: r200504 - stable/8/sys/kern

[Robert Watson]

Author: rwatson
Date: Mon Dec 14 10:48:19 2009
New Revision: 200504
URL: http://svn.freebsd.org/changeset/base/200504

Log:
  Merge r197720 from head to stable/8:
  
    Don't comment on stream socket handling in sosend_dgram, since that's
    not handled.

Modified:
  stable/8/sys/kern/uipc_socket.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/kern/uipc_socket.c
==============================================================================
--- stable/8/sys/kern/uipc_socket.c	Mon Dec 14 07:18:31 2009	(r200503)
+++ stable/8/sys/kern/uipc_socket.c	Mon Dec 14 10:48:19 2009	(r200504)
@@ -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;