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

Reply via email to