diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/uipc_mbuf.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index a03fa007b76..0b6964b008d 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_mbuf.c,v 1.188 2014/07/08 07:10:12 dlg Exp $ */ +/* $OpenBSD: uipc_mbuf.c,v 1.189 2014/07/09 11:22:53 dlg Exp $ */ /* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */ /* @@ -327,9 +327,7 @@ m_clget(struct mbuf *m, int how, struct ifnet *ifp, u_int pktlen) m->m_flags |= M_EXT|M_CLUSTER; m->m_ext.ext_size = mclpools[pi].pr_size; m->m_ext.ext_free = NULL; - m->m_ext.ext_arg = NULL; - m->m_ext.ext_backend = pi; - m->m_ext.ext_ifidx = 0; + m->m_ext.ext_arg = &mclpools[pi]; MCLINITREFERENCE(m); return (m); } @@ -378,8 +376,7 @@ m_extfree(struct mbuf *m) m->m_ext.ext_prevref->m_ext.ext_nextref = m->m_ext.ext_nextref; } else if (m->m_flags & M_CLUSTER) { - pool_put(&mclpools[m->m_ext.ext_backend], - m->m_ext.ext_buf); + pool_put(m->m_ext.ext_arg, m->m_ext.ext_buf); } else if (m->m_ext.ext_free) (*(m->m_ext.ext_free))(m->m_ext.ext_buf, m->m_ext.ext_size, m->m_ext.ext_arg); @@ -1238,9 +1235,7 @@ m_print(void *v, if (m->m_flags & M_EXT) { (*pr)("m_ext.ext_buf: %p\tm_ext.ext_size: %u\n", m->m_ext.ext_buf, m->m_ext.ext_size); - (*pr)("m_ext.ext_type: %x\tm_ext.ext_backend: %i\n", - m->m_ext.ext_type, m->m_ext.ext_backend); - (*pr)("m_ext.ext_ifidx: %u\n", m->m_ext.ext_ifidx); + (*pr)("m_ext.ext_type: %x\n", m->m_ext.ext_type); (*pr)("m_ext.ext_free: %p\tm_ext.ext_arg: %p\n", m->m_ext.ext_free, m->m_ext.ext_arg); (*pr)("m_ext.ext_nextref: %p\tm_ext.ext_prevref: %p\n", |