From owner-svn-src-head@FreeBSD.ORG  Thu Apr 14 14:54:22 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E5E0B106564A;
	Thu, 14 Apr 2011 14:54:22 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D3BA68FC08;
	Thu, 14 Apr 2011 14:54:22 +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 p3EEsMas037438;
	Thu, 14 Apr 2011 14:54:22 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3EEsMAJ037436;
	Thu, 14 Apr 2011 14:54:22 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201104141454.p3EEsMAJ037436@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 14 Apr 2011 14:54:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220622 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Apr 2011 14:54:23 -0000

Author: glebius
Date: Thu Apr 14 14:54:22 2011
New Revision: 220622
URL: http://svn.freebsd.org/changeset/base/220622

Log:
  Revert r194662, since it breaks ng_ksocket(4) and may break
  other socket consumers with alternate sb_upcall.
  
  PR:		kern/154676
  Submitted by:	Arnaud Lacombe <lacombar gmail.com>
  MFC after:	7 days

Modified:
  head/sys/kern/uipc_sockbuf.c

Modified: head/sys/kern/uipc_sockbuf.c
==============================================================================
--- head/sys/kern/uipc_sockbuf.c	Thu Apr 14 14:25:47 2011	(r220621)
+++ head/sys/kern/uipc_sockbuf.c	Thu Apr 14 14:54:22 2011	(r220622)
@@ -528,9 +528,6 @@ sbappendstream_locked(struct sockbuf *sb
 
 	SBLASTMBUFCHK(sb);
 
-	/* Remove all packet headers and mbuf tags to get a pure data chain. */
-	m_demote(m, 1);
-	
 	sbcompress(sb, m, sb->sb_mbtail);
 
 	sb->sb_lastrecord = sb->sb_mb;