svn commit: r220912 - stable/8/sys/kern
Gleb Smirnoff
glebius at FreeBSD.org
Thu Apr 21 08:13:44 UTC 2011
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;
More information about the svn-src-stable
mailing list