From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Tue, 31 May 2005 14:11:43 +0000 (+0000)
Subject: Remove M_EXT_OLD, rename m_ext.ext_nref.new to m_ext.ext_ref and
X-Git-Tag: v2.0.1~7222
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/b542cd49b9692781cbe13000969cda559c42b2f6

Remove M_EXT_OLD, rename m_ext.ext_nref.new to m_ext.ext_ref and
m_ext.ext_nfree.new to m_ext.ext_free.
---

diff --git a/sys/dev/atm/en/midway.c b/sys/dev/atm/en/midway.c
index af089cb861..a2949c09ca 100644
--- a/sys/dev/atm/en/midway.c
+++ b/sys/dev/atm/en/midway.c
@@ -33,7 +33,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/en/midway.c,v 1.19.2.1 2003/01/23 21:06:42 sam Exp $
- * $DragonFly: src/sys/dev/atm/en/midway.c,v 1.16 2005/02/10 00:07:23 joerg Exp $
+ * $DragonFly: src/sys/dev/atm/en/midway.c,v 1.17 2005/05/31 14:11:42 joerg Exp $
  */
 
 /*
@@ -1707,7 +1707,7 @@ STATIC int en_makeexclusive(sc, mm, prev)
     m = *mm;
     
     if (m->m_flags & M_EXT) {
-	if (m->m_ext.ext_nfree.any) {
+	if (m->m_ext.ext_free) {
 	    /* external buffer isn't an ordinary mbuf cluster! */
 	    printf("%s: mfix: special buffer! can't make a copy!\n",
 		   sc->sc_dev.dv_xname);
diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c
index 15feaaf9a4..9e6ccf32b3 100644
--- a/sys/dev/netif/bge/if_bge.c
+++ b/sys/dev/netif/bge/if_bge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.3.2.29 2003/12/01 21:06:59 ambrisko Exp $
- * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.37 2005/05/27 15:36:09 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.38 2005/05/31 14:11:42 joerg Exp $
  *
  */
 
@@ -751,8 +751,8 @@ bge_newbuf_jumbo(struct bge_softc *sc, int i, struct mbuf *m)
 		/* Attach the buffer to the mbuf. */
 		m_new->m_ext.ext_arg = buf;
 		m_new->m_ext.ext_buf = buf->bge_buf;
-		m_new->m_ext.ext_nfree.new = bge_jfree;
-		m_new->m_ext.ext_nref.new = bge_jref;
+		m_new->m_ext.ext_free = bge_jfree;
+		m_new->m_ext.ext_ref = bge_jref;
 		m_new->m_ext.ext_size = BGE_JUMBO_FRAMELEN;
 
 		m_new->m_data = m_new->m_ext.ext_buf;
diff --git a/sys/dev/netif/lge/if_lge.c b/sys/dev/netif/lge/if_lge.c
index b1c18fbac1..780ef4c0a8 100644
--- a/sys/dev/netif/lge/if_lge.c
+++ b/sys/dev/netif/lge/if_lge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.5.2.2 2001/12/14 19:49:23 jlemon Exp $
- * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.26 2005/05/27 15:36:09 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.27 2005/05/31 14:11:42 joerg Exp $
  */
 
 /*
@@ -716,8 +716,8 @@ lge_newbuf(struct lge_softc *sc, struct lge_rx_desc *c, struct mbuf *m)
 		/* Attach the buffer to the mbuf */
 		m_new->m_ext.ext_arg = buf;
 		m_new->m_ext.ext_buf = buf->lge_buf;
-		m_new->m_ext.ext_nfree.new = lge_jfree;
-		m_new->m_ext.ext_nref.new = lge_jref;
+		m_new->m_ext.ext_free = lge_jfree;
+		m_new->m_ext.ext_ref = lge_jref;
 		m_new->m_ext.ext_size = LGE_JUMBO_FRAMELEN;
 
 		m_new->m_data = m_new->m_ext.ext_buf;
diff --git a/sys/dev/netif/lnc/if_lnc.c b/sys/dev/netif/lnc/if_lnc.c
index 16fcf09356..28ee665f2d 100644
--- a/sys/dev/netif/lnc/if_lnc.c
+++ b/sys/dev/netif/lnc/if_lnc.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.89 2001/07/04 13:00:19 nyan Exp $
- * $DragonFly: src/sys/dev/netif/lnc/Attic/if_lnc.c,v 1.18 2005/05/27 15:36:09 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/lnc/Attic/if_lnc.c,v 1.19 2005/05/31 14:11:42 joerg Exp $
  */
 
 /*
@@ -1564,7 +1564,7 @@ mbuf_dump_chain(struct mbuf * m)
 				    (void *)m->M_dat.MH.MH_dat.MH_ext.ext_buf);
 				log(LOG_DEBUG,
 				    "M_dat.MH.MH_dat.MH_ext.ext_free %p\n",
-				    (void *)m->M_dat.MH.MH_dat.MH_ext.ext_nfree.old);
+				    (void *)m->M_dat.MH.MH_dat.MH_ext.ext_free);
 				log(LOG_DEBUG,
 				    "M_dat.MH.MH_dat.MH_ext.ext_size %d\n",
 				    m->M_dat.MH.MH_dat.MH_ext.ext_size);
diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c
index 0b0a3a9424..54ea3d8fb6 100644
--- a/sys/dev/netif/nge/if_nge.c
+++ b/sys/dev/netif/nge/if_nge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.26 2005/05/27 15:08:11 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.27 2005/05/31 14:11:42 joerg Exp $
  */
 
 /*
@@ -1070,8 +1070,8 @@ nge_newbuf(struct nge_softc *sc, struct nge_desc *c, struct mbuf *m)
 		/* Attach the buffer to the mbuf */
 		m_new->m_ext.ext_arg = buf;
 		m_new->m_ext.ext_buf = buf->nge_buf;
-		m_new->m_ext.ext_nfree.new = nge_jfree;
-		m_new->m_ext.ext_nref.new = nge_jref;
+		m_new->m_ext.ext_free = nge_jfree;
+		m_new->m_ext.ext_ref = nge_jref;
 		m_new->m_ext.ext_size = NGE_JUMBO_FRAMELEN;
 
 		m_new->m_data = m_new->m_ext.ext_buf;
diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c
index 6a7189655c..881e6fe831 100644
--- a/sys/dev/netif/sk/if_sk.c
+++ b/sys/dev/netif/sk/if_sk.c
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $
- * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.34 2005/05/30 11:56:00 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.35 2005/05/31 14:11:42 joerg Exp $
  */
 
 /*
@@ -824,8 +824,8 @@ sk_newbuf(struct sk_if_softc *sc_if, struct sk_chain *c, struct mbuf *m)
 		/* Attach the buffer to the mbuf */
 		m_new->m_ext.ext_arg = buf;
 		m_new->m_ext.ext_buf = buf->sk_buf;
-		m_new->m_ext.ext_nfree.new = sk_jfree;
-		m_new->m_ext.ext_nref.new = sk_jref;
+		m_new->m_ext.ext_free = sk_jfree;
+		m_new->m_ext.ext_ref = sk_jref;
 		m_new->m_ext.ext_size = SK_JUMBO_FRAMELEN;
 
 		m_new->m_data = m_new->m_ext.ext_buf;
diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c
index 39feb7ec19..8da22df314 100644
--- a/sys/dev/netif/ti/if_ti.c
+++ b/sys/dev/netif/ti/if_ti.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $
- * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.24 2005/05/31 12:29:05 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.25 2005/05/31 14:11:43 joerg Exp $
  */
 
 /*
@@ -778,8 +778,8 @@ ti_newbuf_jumbo(struct ti_softc *sc, int i, struct mbuf *m)
 
 		/* Attach the buffer to the mbuf. */
 		m_new->m_ext.ext_arg = buf;
-		m_new->m_ext.ext_nfree.new = ti_jfree;
-		m_new->m_ext.ext_nref.new = ti_jref;
+		m_new->m_ext.ext_free = ti_jfree;
+		m_new->m_ext.ext_ref = ti_jref;
 		m_new->m_ext.ext_size = TI_JUMBO_FRAMELEN;
 
 		m_new->m_data = m_new->m_ext.ext_buf;
diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c
index 06670c6f54..f509102f0e 100644
--- a/sys/dev/netif/wb/if_wb.c
+++ b/sys/dev/netif/wb/if_wb.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $
- * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.23 2005/05/31 12:31:21 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.24 2005/05/31 14:11:43 joerg Exp $
  */
 
 /*
@@ -972,11 +972,11 @@ wb_newbuf(struct wb_softc *sc, struct wb_chain_onefrag *c, struct mbuf *m)
 			return(ENOBUFS);
 
 		m_new->m_data = m_new->m_ext.ext_buf = c->wb_buf;
-		m_new->m_flags |= M_EXT | M_EXT_OLD;
+		m_new->m_flags |= M_EXT;
 		m_new->m_ext.ext_size = m_new->m_pkthdr.len =
 		    m_new->m_len = WB_BUFBYTES;
-		m_new->m_ext.ext_nfree.new = wb_bfree;
-		m_new->m_ext.ext_nref.new = wb_bfree;
+		m_new->m_ext.ext_free = wb_bfree;
+		m_new->m_ext.ext_ref = wb_bfree;
 	} else {
 		m_new = m;
 		m_new->m_len = m_new->m_pkthdr.len = WB_BUFBYTES;
diff --git a/sys/emulation/ndis/kern_ndis.c b/sys/emulation/ndis/kern_ndis.c
index 11476da9b4..1bf42c9dcc 100644
--- a/sys/emulation/ndis/kern_ndis.c
+++ b/sys/emulation/ndis/kern_ndis.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.57 2004/07/11 00:19:30 wpaul Exp $
- * $DragonFly: src/sys/emulation/ndis/kern_ndis.c,v 1.5 2004/11/17 18:59:21 dillon Exp $
+ * $DragonFly: src/sys/emulation/ndis/kern_ndis.c,v 1.6 2005/05/31 14:11:43 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -975,8 +975,8 @@ ndis_ptom(m0, p)
 		}
 		m->m_len = buf->nb_bytecount;
 		m->m_data = MDL_VA(buf);
-		m->m_ext.ext_nfree.new = ndis_extfree_packet;
-		m->m_ext.ext_nref.new = ndis_extref_packet;
+		m->m_ext.ext_free = ndis_extfree_packet;
+		m->m_ext.ext_ref = ndis_extref_packet;
 		m->m_ext.ext_arg = p;
 		m->m_ext.ext_buf = m->m_data;
 		m->m_ext.ext_size = m->m_len;
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 3f18a2e8e3..1e7f841e9e 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -82,7 +82,7 @@
  *
  * @(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.51.2.24 2003/04/15 06:59:29 silby Exp $
- * $DragonFly: src/sys/kern/uipc_mbuf.c,v 1.39 2005/05/29 16:32:20 hsu Exp $
+ * $DragonFly: src/sys/kern/uipc_mbuf.c,v 1.40 2005/05/31 14:11:43 joerg Exp $
  */
 
 #include "opt_param.h"
@@ -889,8 +889,6 @@ m_mclget(struct mbuf *m, int how)
 {
 	mbcluster_t mcl;
 
-	KKASSERT((m->m_flags & M_EXT_OLD) == 0);
-
 	/*
 	 * Allocate a cluster, return if we can't get one.
 	 */
@@ -925,8 +923,8 @@ m_mclget(struct mbuf *m, int how)
 	 */
 	m->m_ext.ext_arg = mcl;
 	m->m_ext.ext_buf = mcl->mcl_data;
-	m->m_ext.ext_nref.new = m_mclref;
-	m->m_ext.ext_nfree.new = m_mclfree;
+	m->m_ext.ext_ref = m_mclref;
+	m->m_ext.ext_free = m_mclfree;
 	m->m_ext.ext_size = MCLBYTES;
 
 	m->m_data = m->m_ext.ext_buf;
@@ -974,12 +972,9 @@ m_mclref(void *arg)
 static __inline void
 m_extref(const struct mbuf *m)
 {
-	KKASSERT(m->m_ext.ext_nfree.any != NULL);
+	KKASSERT(m->m_ext.ext_free != NULL);
 	crit_enter();
-	if (m->m_flags & M_EXT_OLD)
-		m->m_ext.ext_nref.old(m->m_ext.ext_buf, m->m_ext.ext_size);
-	else
-		m->m_ext.ext_nref.new(m->m_ext.ext_arg); 
+	m->m_ext.ext_ref(m->m_ext.ext_arg); 
 	crit_exit();
 }
 
@@ -1015,7 +1010,7 @@ m_free(struct mbuf *m)
 	n = m->m_next;
 	m->m_next = NULL;
 	if (m->m_flags & M_EXT) {
-		KKASSERT(m->m_ext.ext_nfree.any != NULL);
+		KKASSERT(m->m_ext.ext_free != NULL);
 		if (mcl_pool_count < mcl_pool_max && m && m->m_next == NULL &&
 		    (m->m_flags & (M_PKTHDR|M_EXT_CLUSTER)) == (M_PKTHDR|M_EXT_CLUSTER) &&
 		    m->m_type == MT_DATA && M_EXT_WRITABLE(m) ) {
@@ -1025,14 +1020,11 @@ m_free(struct mbuf *m)
 			++mcl_pool_count;
 			m = NULL;
 		} else {
-			if (m->m_flags & M_EXT_OLD)
-				m->m_ext.ext_nfree.old(m->m_ext.ext_buf, m->m_ext.ext_size);
-			else
-				m->m_ext.ext_nfree.new(m->m_ext.ext_arg);
+			m->m_ext.ext_free(m->m_ext.ext_arg);
 			m->m_flags = 0;
 			m->m_ext.ext_arg = NULL;
-			m->m_ext.ext_nref.new = NULL;
-			m->m_ext.ext_nfree.new = NULL;
+			m->m_ext.ext_ref = NULL;
+			m->m_ext.ext_free = NULL;
 		}
 	}
 	if (m) {
@@ -1144,8 +1136,7 @@ m_copym(const struct mbuf *m, int off0, int len, int wait)
 			n->m_data = m->m_data + off;
 			m_extref(m);
 			n->m_ext = m->m_ext;
-			n->m_flags |= m->m_flags & 
-					(M_EXT | M_EXT_OLD | M_EXT_CLUSTER);
+			n->m_flags |= m->m_flags & (M_EXT | M_EXT_CLUSTER);
 		} else {
 			bcopy(mtod(m, caddr_t)+off, mtod(n, caddr_t),
 			    (unsigned)n->m_len);
@@ -1191,7 +1182,7 @@ m_copypacket(struct mbuf *m, int how)
 		n->m_data = m->m_data;
 		m_extref(m);
 		n->m_ext = m->m_ext;
-		n->m_flags |= m->m_flags & (M_EXT | M_EXT_OLD | M_EXT_CLUSTER);
+		n->m_flags |= m->m_flags & (M_EXT | M_EXT_CLUSTER);
 	} else {
 		n->m_data = n->m_pktdat + (m->m_data - m->m_pktdat );
 		bcopy(mtod(m, char *), mtod(n, char *), n->m_len);
@@ -1211,8 +1202,7 @@ m_copypacket(struct mbuf *m, int how)
 			n->m_data = m->m_data;
 			m_extref(m);
 			n->m_ext = m->m_ext;
-			n->m_flags |= m->m_flags &
-					 (M_EXT | M_EXT_OLD | M_EXT_CLUSTER);
+			n->m_flags |= m->m_flags & (M_EXT | M_EXT_CLUSTER);
 		} else {
 			bcopy(mtod(m, char *), mtod(n, char *), n->m_len);
 		}
@@ -1538,7 +1528,7 @@ extpacket:
 		n->m_data = m->m_data + len;
 		m_extref(m);
 		n->m_ext = m->m_ext;
-		n->m_flags |= m->m_flags & (M_EXT | M_EXT_OLD | M_EXT_CLUSTER);
+		n->m_flags |= m->m_flags & (M_EXT | M_EXT_CLUSTER);
 	} else {
 		bcopy(mtod(m, caddr_t) + len, mtod(n, caddr_t), remain);
 	}
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 394f70581d..9ac5cf7354 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -35,7 +35,7 @@
  *
  *	@(#)uipc_syscalls.c	8.4 (Berkeley) 2/21/94
  * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.65.2.17 2003/04/04 17:11:16 tegge Exp $
- * $DragonFly: src/sys/kern/uipc_syscalls.c,v 1.52 2005/05/29 16:32:20 hsu Exp $
+ * $DragonFly: src/sys/kern/uipc_syscalls.c,v 1.53 2005/05/31 14:11:43 joerg Exp $
  */
 
 #include "opt_ktrace.h"
@@ -1608,15 +1608,15 @@ retry_lookup:
 		sfm->sf = sf;
 		sfm->mref_count = 1;
 
-		m->m_ext.ext_nfree.new = sf_buf_mfree;
-		m->m_ext.ext_nref.new = sf_buf_mref;
+		m->m_ext.ext_free = sf_buf_mfree;
+		m->m_ext.ext_ref = sf_buf_mref;
 		m->m_ext.ext_arg = sfm;
 		m->m_ext.ext_buf = (void *)sf->kva;
 		m->m_ext.ext_size = PAGE_SIZE;
 		m->m_data = (char *) sf->kva + pgoff;
 		m->m_flags |= M_EXT;
 		m->m_pkthdr.len = m->m_len = xfsize;
-		KKASSERT((m->m_flags & (M_EXT_OLD|M_EXT_CLUSTER)) == 0);
+		KKASSERT((m->m_flags & (M_EXT_CLUSTER)) == 0);
 
 		if (mheader != NULL) {
 			hbytes = mheader->m_pkthdr.len;
diff --git a/sys/netproto/ipsec/key_debug.c b/sys/netproto/ipsec/key_debug.c
index dcf966d338..81287a8105 100644
--- a/sys/netproto/ipsec/key_debug.c
+++ b/sys/netproto/ipsec/key_debug.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netipsec/key_debug.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $	*/
-/*	$DragonFly: src/sys/netproto/ipsec/key_debug.c,v 1.6 2004/10/15 22:59:10 hsu Exp $	*/
+/*	$DragonFly: src/sys/netproto/ipsec/key_debug.c,v 1.7 2005/05/31 14:11:43 joerg Exp $	*/
 /*	$KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $	*/
 
 /*
@@ -643,8 +643,8 @@ kdebug_mbufhdr(m)
 	if (m->m_flags & M_EXT) {
 		printf("  m_ext{ ext_buf:%p ext_free:%p "
 		       "ext_size:%u ext_ref:%p }\n",
-			m->m_ext.ext_buf, m->m_ext.ext_nfree.any,
-			m->m_ext.ext_size, m->m_ext.ext_nref.any);
+			m->m_ext.ext_buf, m->m_ext.ext_free,
+			m->m_ext.ext_size, m->m_ext.ext_ref);
 	}
 
 	return;
diff --git a/sys/netproto/key/key_debug.c b/sys/netproto/key/key_debug.c
index c17fc878a9..70737094b6 100644
--- a/sys/netproto/key/key_debug.c
+++ b/sys/netproto/key/key_debug.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netkey/key_debug.c,v 1.10.2.5 2002/04/28 05:40:28 suz Exp $	*/
-/*	$DragonFly: src/sys/netproto/key/key_debug.c,v 1.5 2004/07/29 08:46:22 dillon Exp $	*/
+/*	$DragonFly: src/sys/netproto/key/key_debug.c,v 1.6 2005/05/31 14:11:43 joerg Exp $	*/
 /*	$KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $	*/
 
 /*
@@ -643,8 +643,8 @@ kdebug_mbufhdr(m)
 	if (m->m_flags & M_EXT) {
 		printf("  m_ext{ ext_buf:%p ext_free:%p "
 		       "ext_size:%u ext_ref:%p }\n",
-			m->m_ext.ext_buf, m->m_ext.ext_nfree.any,
-			m->m_ext.ext_size, m->m_ext.ext_nref.any);
+			m->m_ext.ext_buf, m->m_ext.ext_free,
+			m->m_ext.ext_size, m->m_ext.ext_ref);
 	}
 
 	return;
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 35b3f0c850..d378a8c7c3 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -34,7 +34,7 @@
  *
  *	@(#)mbuf.h	8.5 (Berkeley) 2/19/95
  * $FreeBSD: src/sys/sys/mbuf.h,v 1.44.2.17 2003/04/15 06:15:02 silby Exp $
- * $DragonFly: src/sys/sys/mbuf.h,v 1.26 2005/05/29 16:32:20 hsu Exp $
+ * $DragonFly: src/sys/sys/mbuf.h,v 1.27 2005/05/31 14:11:43 joerg Exp $
  */
 
 #ifndef _SYS_MBUF_H_
@@ -121,17 +121,9 @@ struct pkthdr {
  */
 struct m_ext {
 	caddr_t	ext_buf;		/* start of buffer */
-	union {
-	    void (*old)(caddr_t, u_int);
-	    void (*new)(void *arg);
-	    void *any;
-	} ext_nfree;
-	u_int	ext_size;		/* size of buffer, for ext_nfree */
-	union {
-	    void (*old)(caddr_t, u_int);
-	    void (*new)(void *arg);
-	    void *any;
-	} ext_nref;
+	void	(*ext_free)(void *);
+	u_int	ext_size;		/* size of buffer, for ext_free */
+	void	(*ext_ref)(void *);
 	void	*ext_arg;
 };
 
@@ -189,7 +181,6 @@ struct mbuf {
 #define	M_FRAG		0x0400	/* packet is a fragment of a larger packet */
 #define	M_FIRSTFRAG	0x0800	/* packet is first fragment */
 #define	M_LASTFRAG	0x1000	/* packet is last fragment */
-#define M_EXT_OLD	0x2000	/* new ext function format */
 #define M_EXT_CLUSTER	0x4000	/* standard cluster else special */
 
 /*