From owner-svn-src-stable-8@FreeBSD.ORG  Thu Apr 21 08:13:44 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 72DE4106566C;
	Thu, 21 Apr 2011 08:13:44 +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 61BAA8FC1C;
	Thu, 21 Apr 2011 08:13:44 +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 p3L8DiuY086719;
	Thu, 21 Apr 2011 08:13:44 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3L8Div3086717;
	Thu, 21 Apr 2011 08:13:44 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201104210813.p3L8Div3086717@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 21 Apr 2011 08:13:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220912 - stable/8/sys/kern
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Apr 2011 08:13:44 -0000

Author: glebius
Date: Thu Apr 21 08:13:44 2011
New Revision: 220912
URL: http://svn.freebsd.org/changeset/base/220912

Log:
  Merge from head/ 220622:
    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>

Modified:
  stable/8/sys/kern/uipc_sockbuf.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)

Modified: stable/8/sys/kern/uipc_sockbuf.c
==============================================================================
--- stable/8/sys/kern/uipc_sockbuf.c	Thu Apr 21 07:26:14 2011	(r220911)
+++ stable/8/sys/kern/uipc_sockbuf.c	Thu Apr 21 08:13:44 2011	(r220912)
@@ -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;