svn commit: r293427 - head/sys/kern

[Gleb Smirnoff]

Author: glebius
Date: Fri Jan  8 17:27:23 2016
New Revision: 293427
URL: https://svnweb.freebsd.org/changeset/base/293427

Log:
  Revert r293405: it breaks socket buffer INVARIANTS when sending control
  data over local sockets.

Modified:
  head/sys/kern/uipc_usrreq.c

Modified: head/sys/kern/uipc_usrreq.c
==============================================================================
--- head/sys/kern/uipc_usrreq.c	Fri Jan  8 16:50:04 2016	(r293426)
+++ head/sys/kern/uipc_usrreq.c	Fri Jan  8 17:27:23 2016	(r293427)
@@ -981,7 +981,7 @@ uipc_send(struct socket *so, int flags, 
 				    control))
 					control = NULL;
 			} else
-				sbappendstream_locked(&so2->so_rcv, m, flags);
+				sbappend_locked(&so2->so_rcv, m);
 			break;
 
 		case SOCK_SEQPACKET: {