svn commit: r248886 - head/sys/kern

[Gleb Smirnoff]

Author: glebius
Date: Fri Mar 29 14:06:04 2013
New Revision: 248886
URL: http://svnweb.freebsd.org/changeset/base/248886

Log:
  Once ng_ksocket(4) is fixed, re-apply r194662. See this revision for
  longer description.
  
  Discussed with:	andre, rwatson
  Sponsored by:	Nginx, Inc.

Modified:
  head/sys/kern/uipc_sockbuf.c

Modified: head/sys/kern/uipc_sockbuf.c
==============================================================================
--- head/sys/kern/uipc_sockbuf.c	Fri Mar 29 14:04:26 2013	(r248885)
+++ head/sys/kern/uipc_sockbuf.c	Fri Mar 29 14:06:04 2013	(r248886)
@@ -528,6 +528,9 @@ 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;