From 9aae7a399a2eccbc351404e965270c7e11b519f7 Mon Sep 17 00:00:00 2001 From: Ryan Thomas McBride Date: Sat, 17 Apr 2004 10:18:13 +0000 Subject: Don't forget to apply the M_CLUSTER flag when copying flags in m_pullup2(). Fixes pr3740. Confirmed with pb@, ok markus@. --- sys/kern/uipc_mbuf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sys') diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 1bbc6b0b3b0..13c00cb32d5 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_mbuf.c,v 1.65 2004/04/01 23:56:05 tedu Exp $ */ +/* $OpenBSD: uipc_mbuf.c,v 1.66 2004/04/17 10:18:12 mcbride Exp $ */ /* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */ /* @@ -683,7 +683,8 @@ m_pullup2(n, len) if (n->m_flags & M_PKTHDR) { /* Too many adverse side effects. */ /* M_MOVE_PKTHDR(m, n); */ - m->m_flags = (n->m_flags & M_COPYFLAGS) | M_EXT; + m->m_flags = (n->m_flags & M_COPYFLAGS) | + M_EXT | M_CLUSTER; M_MOVE_HDR(m, n); /* n->m_data is cool. */ } -- cgit v1.2.3