From owner-svn-src-head@freebsd.org  Fri Jan  8 17:27:24 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F5A6A67AD2;
 Fri,  8 Jan 2016 17:27:24 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 700561275;
 Fri,  8 Jan 2016 17:27:24 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u08HRN4Q018063;
 Fri, 8 Jan 2016 17:27:23 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u08HRNmw018062;
 Fri, 8 Jan 2016 17:27:23 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201601081727.u08HRNmw018062@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 8 Jan 2016 17:27:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r293427 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Jan 2016 17:27:24 -0000

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: {