From owner-freebsd-net@FreeBSD.ORG  Thu Apr 14 15:00:25 2011
Return-Path: <owner-freebsd-net@FreeBSD.ORG>
Delivered-To: freebsd-net@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 718231065673
	for <freebsd-net@hub.freebsd.org>; Thu, 14 Apr 2011 15:00:25 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 459148FC17
	for <freebsd-net@hub.freebsd.org>; Thu, 14 Apr 2011 15:00:25 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p3EF0Phb074493
	for <freebsd-net@freefall.freebsd.org>; Thu, 14 Apr 2011 15:00:25 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p3EF0P56074491;
	Thu, 14 Apr 2011 15:00:25 GMT (envelope-from gnats)
Date: Thu, 14 Apr 2011 15:00:25 GMT
Message-Id: <201104141500.p3EF0P56074491@freefall.freebsd.org>
To: freebsd-net@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: kern/154676: commit references a PR
X-BeenThere: freebsd-net@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: Networking and TCP/IP with FreeBSD <freebsd-net.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-net>
List-Post: <mailto:freebsd-net@freebsd.org>
List-Help: <mailto:freebsd-net-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Apr 2011 15:00:25 -0000

The following reply was made to PR kern/154676; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/154676: commit references a PR
Date: Thu, 14 Apr 2011 14:54:35 +0000 (UTC)

 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;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"