diff options
| author | glebius <glebius@FreeBSD.org> | 2011-04-14 14:54:22 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2011-04-14 14:54:22 +0000 |
| commit | 3a11690b7112767d7db63e836e48397fbdcdcca6 (patch) | |
| tree | 6f34943c2c3a490b375000244ea4748cf8a89df7 /sys/kern/uipc_sockbuf.c | |
| parent | b1187e01aa3cc40f78e0fb71a9f9eaa2b5348560 (diff) | |
| download | FreeBSD-src-3a11690b7112767d7db63e836e48397fbdcdcca6.zip FreeBSD-src-3a11690b7112767d7db63e836e48397fbdcdcca6.tar.gz | |
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
Diffstat (limited to 'sys/kern/uipc_sockbuf.c')
| -rw-r--r-- | sys/kern/uipc_sockbuf.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index 2060a2e..2d86d74 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -528,9 +528,6 @@ sbappendstream_locked(struct sockbuf *sb, struct mbuf *m) 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; |
