[src/netbsd-2-0]: src/sys/kern Pullup rev 1.89 (requested by is in ticket #895)

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/084c558cca92
branches:  netbsd-2-0
changeset: 562767:084c558cca92
user:      jmc <jmc%NetBSD.org@localhost>
date:      Fri Oct 08 03:05:26 2004 +0000

description:
Pullup rev 1.89 (requested by is in ticket #895)

Some code likes to mix MT_HEADER and MT_DATA. Revert this assertion until
the usage of MT_HEADER vs. MT_DATA is better defined and implemented.

diffstat:

 sys/kern/uipc_mbuf.c |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r e6df6e6663c6 -r 084c558cca92 sys/kern/uipc_mbuf.c
--- a/sys/kern/uipc_mbuf.c      Fri Oct 08 03:04:27 2004 +0000
+++ b/sys/kern/uipc_mbuf.c      Fri Oct 08 03:05:26 2004 +0000
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.80.2.4 2004/09/11 22:06:58 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.80.2.5 2004/10/08 03:05:26 jmc Exp $");
 
 #include "opt_mbuftrace.h"
 
@@ -695,7 +695,6 @@
  * Concatenate mbuf chain n to m.
  * n might be copied into m (when n->m_len is small), therefore data portion of
  * n could be copied into an mbuf of different mbuf type.
- * Therefore both chains should be of the same type (e.g. MT_DATA).
  * Any m_pkthdr is not updated.
  */
 void
@@ -710,7 +709,6 @@
                        m->m_next = n;
                        return;
                }
-               KASSERT(n->m_len == 0 || m->m_type == n->m_type);
                /* splat the data from one into the other */
                memcpy(mtod(m, caddr_t) + m->m_len, mtod(n, caddr_t),
                    (u_int)n->m_len);