Index: src/sys/contrib/dev/oltr/if_oltr.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/dev/oltr/if_oltr.c,v
retrieving revision 1.24
diff -u -r1.24 if_oltr.c
--- src/sys/contrib/dev/oltr/if_oltr.c	19 Feb 2003 05:46:59 -0000	1.24
+++ src/sys/contrib/dev/oltr/if_oltr.c	21 Feb 2003 16:35:42 -0000
@@ -1404,14 +1404,14 @@
 	
 	if (sc->state > OL_CLOSED) {
 		if (ReceiveStatus == TRLLD_RCV_OK) {
-			MGETHDR(m0, M_DONTWAIT, MT_DATA);
+			MGETHDR(m0, MB_DONTWAIT, MT_DATA);
 			mbuf_size = MHLEN - 2;
 			if (!m0) {
 				ifp->if_ierrors++;
 				goto dropped;
 			}
 			if (ByteCount + 2 > MHLEN) {
-				MCLGET(m0, M_DONTWAIT);
+				MCLGET(m0, MB_DONTWAIT);
 				mbuf_size = MCLBYTES - 2;
 				if (!(m0->m_flags & M_EXT)) {
 					m_freem(m0);
@@ -1446,7 +1446,7 @@
 					frag_offset = 0;
 				}
 				if ((mbuf_offset == mbuf_size) && (frame_len > 0)) {
-					MGET(m1, M_DONTWAIT, MT_DATA);
+					MGET(m1, MB_DONTWAIT, MT_DATA);
 					mbuf_size = MHLEN;
 					if (!m1) {
 						ifp->if_ierrors++;
@@ -1454,7 +1454,7 @@
 						goto dropped;
 					}
 					if (frame_len > MHLEN) {
-						MCLGET(m1, M_DONTWAIT);
+						MCLGET(m1, MB_DONTWAIT);
 						mbuf_size = MCLBYTES;
 						if (!(m1->m_flags & M_EXT)) {
 							m_freem(m0);
Index: src/sys/contrib/ipfilter/netinet/fil.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/ipfilter/netinet/fil.c,v
retrieving revision 1.36
diff -u -r1.36 fil.c
--- src/sys/contrib/ipfilter/netinet/fil.c	19 Feb 2003 05:47:00 -0000	1.36
+++ src/sys/contrib/ipfilter/netinet/fil.c	21 Feb 2003 16:35:46 -0000
@@ -1209,7 +1209,7 @@
 		mc = dupmsg(m);
 # else
 #  if defined(__OpenBSD__) && (OpenBSD >= 199905)
-		mc = m_copym2(m, 0, M_COPYALL, M_DONTWAIT);
+		mc = m_copym2(m, 0, M_COPYALL, MB_DONTWAIT);
 #  else
 		mc = m_copy(m, 0, M_COPYALL);
 #  endif
@@ -1608,7 +1608,7 @@
 		off -= mlen;
 		totlen += mlen;
 		if (m->m_next == 0) {
-			n = m_getclr(M_DONTWAIT, m->m_type);
+			n = m_getclr(MB_DONTWAIT, m->m_type);
 			if (n == 0)
 				goto out;
 			n->m_len = min(MLEN, len + off);
@@ -1627,7 +1627,7 @@
 		if (len == 0)
 			break;
 		if (m->m_next == 0) {
-			n = m_get(M_DONTWAIT, m->m_type);
+			n = m_get(MB_DONTWAIT, m->m_type);
 			if (n == 0)
 				break;
 			n->m_len = min(MLEN, len);
Index: src/sys/contrib/ipfilter/netinet/ip_fil.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/ipfilter/netinet/ip_fil.c,v
retrieving revision 1.38
diff -u -r1.38 ip_fil.c
--- src/sys/contrib/ipfilter/netinet/ip_fil.c	19 Feb 2003 05:47:00 -0000	1.38
+++ src/sys/contrib/ipfilter/netinet/ip_fil.c	21 Feb 2003 16:35:48 -0000
@@ -1199,9 +1199,9 @@
 	if (tcp->th_flags & TH_RST)
 		return -1;		/* feedback loop */
 # if	(BSD < 199306) || defined(__sgi)
-	m = m_get(M_DONTWAIT, MT_HEADER);
+	m = m_get(MB_DONTWAIT, MT_HEADER);
 # else
-	m = m_gethdr(M_DONTWAIT, MT_HEADER);
+	m = m_gethdr(MB_DONTWAIT, MT_HEADER);
 # endif
 	if (m == NULL)
 		return ENOBUFS;
@@ -1377,10 +1377,10 @@
 
 # if	(BSD < 199306) || defined(__sgi)
 		avail = MLEN;
-		m = m_get(M_DONTWAIT, MT_HEADER);
+		m = m_get(MB_DONTWAIT, MT_HEADER);
 # else
 		avail = MHLEN;
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
+		m = m_gethdr(MB_DONTWAIT, MT_HEADER);
 # endif
 		if (m == NULL)
 			return ENOBUFS;
@@ -1404,11 +1404,11 @@
 		if (type == ICMP6_DST_UNREACH)
 			code = icmptoicmp6unreach[code];
 
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
+		MGETHDR(m, MB_DONTWAIT, MT_HEADER);
 		if (!m)
 			return ENOBUFS;
 
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_freem(m);
 			return ENOBUFS;
@@ -1604,7 +1604,7 @@
 	 * problem.
 	 */
 	if (M_WRITABLE(m) == 0) {
-		if ((m0 = m_dup(m, M_DONTWAIT)) != NULL) {
+		if ((m0 = m_dup(m, MB_DONTWAIT)) != NULL) {
 			m_freem(*mpp);
 			*mpp = m0;
 			m = m0;
@@ -1787,9 +1787,9 @@
 	mhlen = sizeof (struct ip);
 	for (off = hlen + len; off < ip->ip_len; off += len) {
 # ifdef	MGETHDR
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
+		MGETHDR(m, MB_DONTWAIT, MT_HEADER);
 # else
-		MGET(m, M_DONTWAIT, MT_HEADER);
+		MGET(m, MB_DONTWAIT, MT_HEADER);
 # endif
 		if (m == 0) {
 			error = ENOBUFS;
Index: src/sys/dev/an/if_an.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/an/if_an.c,v
retrieving revision 1.47
diff -u -r1.47 if_an.c
--- src/sys/dev/an/if_an.c	19 Feb 2003 05:47:00 -0000	1.47
+++ src/sys/dev/an/if_an.c	21 Feb 2003 16:35:53 -0000
@@ -921,12 +921,12 @@
 			/* dump raw 802.11 packet to bpf and skip ip stack */
 			BPF_TAP(ifp, bpf_buf, len);
 		} else {
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, MB_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				ifp->if_ierrors++;
 				return;
 			}
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, MB_DONTWAIT);
 			if (!(m->m_flags & M_EXT)) {
 				m_freem(m);
 				ifp->if_ierrors++;
@@ -1006,12 +1006,12 @@
 			if (an_rx_desc.an_done && !an_rx_desc.an_valid) {
 				buf = sc->an_rx_buffer[count].an_dma_vaddr;
 
-				MGETHDR(m, M_DONTWAIT, MT_DATA);
+				MGETHDR(m, MB_DONTWAIT, MT_DATA);
 				if (m == NULL) {
 					ifp->if_ierrors++;
 					return;
 				}
-				MCLGET(m, M_DONTWAIT);
+				MCLGET(m, MB_DONTWAIT);
 				if (!(m->m_flags & M_EXT)) {
 					m_freem(m);
 					ifp->if_ierrors++;
Index: src/sys/dev/ar/if_ar.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ar/if_ar.c,v
retrieving revision 1.56
diff -u -r1.56 if_ar.c
--- src/sys/dev/ar/if_ar.c	19 Feb 2003 05:47:00 -0000	1.56
+++ src/sys/dev/ar/if_ar.c	21 Feb 2003 16:35:55 -0000
@@ -1678,7 +1678,7 @@
 	while(ar_packet_avail(sc, &len, &rxstat)) {
 		TRC(printf("apa: len %d, rxstat %x\n", len, rxstat));
 		if(((rxstat & SCA_DESC_ERRORS) == 0) && (len < MCLBYTES)) {
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, MB_DONTWAIT, MT_DATA);
 			if(m == NULL) {
 				/* eat packet if get mbuf fail!! */
 				ar_eat_packet(sc, 1);
@@ -1693,7 +1693,7 @@
 #endif	/* NETGRAPH */
 			m->m_pkthdr.len = m->m_len = len;
 			if(len > MHLEN) {
-				MCLGET(m, M_DONTWAIT);
+				MCLGET(m, MB_DONTWAIT);
 				if((m->m_flags & M_EXT) == 0) {
 					m_freem(m);
 					ar_eat_packet(sc, 1);
Index: src/sys/dev/awi/awi.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/awi/awi.c,v
retrieving revision 1.26
diff -u -r1.26 awi.c
--- src/sys/dev/awi/awi.c	19 Feb 2003 05:47:01 -0000	1.26
+++ src/sys/dev/awi/awi.c	21 Feb 2003 16:35:59 -0000
@@ -1243,7 +1243,7 @@
 		    llc->llc_snap.org_code[2] = 0;
 		llc->llc_snap.ether_type = eh.ether_type;
 	}
-	M_PREPEND(m0, sizeof(struct ieee80211_frame), M_DONTWAIT);
+	M_PREPEND(m0, sizeof(struct ieee80211_frame), MB_DONTWAIT);
 	if (m0 == NULL)
 		return NULL;
 	wh = mtod(m0, struct ieee80211_frame *);
@@ -1321,7 +1321,7 @@
 		off = 0;
 		while (m0->m_pkthdr.len > off) {
 			if (n0 == NULL) {
-				MGETHDR(n, M_DONTWAIT, MT_DATA);
+				MGETHDR(n, MB_DONTWAIT, MT_DATA);
 				if (n == NULL) {
 					m_freem(m0);
 					return NULL;
@@ -1329,7 +1329,7 @@
 				M_MOVE_PKTHDR(n, m0);
 				n->m_len = MHLEN;
 			} else {
-				MGET(n, M_DONTWAIT, MT_DATA);
+				MGET(n, MB_DONTWAIT, MT_DATA);
 				if (n == NULL) {
 					m_freem(m0);
 					m_freem(n0);
@@ -1338,7 +1338,7 @@
 				n->m_len = MLEN;
 			}
 			if (m0->m_pkthdr.len - off >= MINCLSIZE) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, MB_DONTWAIT);
 				if (n->m_flags & M_EXT)
 					n->m_len = n->m_ext.ext_size;
 			}
@@ -1549,14 +1549,14 @@
 
 	while (len > 0) {
 		if (top == NULL) {
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, MB_DONTWAIT, MT_DATA);
 			if (m == NULL)
 				return NULL;
 			m->m_pkthdr.rcvif = sc->sc_ifp;
 			m->m_pkthdr.len = len;
 			m->m_len = MHLEN;
 		} else {
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, MB_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				m_freem(top);
 				return NULL;
@@ -1564,7 +1564,7 @@
 			m->m_len = MLEN;
 		}
 		if (len >= MINCLSIZE) {
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, MB_DONTWAIT);
 			if (m->m_flags & M_EXT)
 				m->m_len = m->m_ext.ext_size;
 		}
@@ -2232,7 +2232,7 @@
 	struct ieee80211_frame *wh;
 	u_int8_t *deauth;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	if (ifp->if_flags & IFF_DEBUG)
@@ -2269,7 +2269,7 @@
 	struct ieee80211_frame *wh;
 	u_int8_t *auth;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	sc->sc_status = AWI_ST_AUTH;
@@ -2370,7 +2370,7 @@
 	u_int16_t capinfo, lintval;
 	u_int8_t *asreq;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	sc->sc_status = AWI_ST_ASSOC;
Index: src/sys/dev/awi/awi_wep.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/awi/awi_wep.c,v
retrieving revision 1.12
diff -u -r1.12 awi_wep.c
--- src/sys/dev/awi/awi_wep.c	19 Feb 2003 05:47:01 -0000	1.12
+++ src/sys/dev/awi/awi_wep.c	21 Feb 2003 16:36:00 -0000
@@ -319,7 +319,7 @@
 	ctx = sc->sc_wep_ctx;
 	m = m0;
 	left = m->m_pkthdr.len;
-	MGET(n, M_DONTWAIT, m->m_type);
+	MGET(n, MB_DONTWAIT, m->m_type);
 	n0 = n;
 	if (n == NULL)
 		goto fail;
@@ -333,7 +333,7 @@
 	}
 	n->m_len = MHLEN;
 	if (n->m_pkthdr.len >= MINCLSIZE) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, MB_DONTWAIT);
 		if (n->m_flags & M_EXT)
 			n->m_len = n->m_ext.ext_size;
 	}
@@ -382,13 +382,13 @@
 		if (len > n->m_len - noff) {
 			len = n->m_len - noff;
 			if (len == 0) {
-				MGET(n->m_next, M_DONTWAIT, n->m_type);
+				MGET(n->m_next, MB_DONTWAIT, n->m_type);
 				if (n->m_next == NULL)
 					goto fail;
 				n = n->m_next;
 				n->m_len = MLEN;
 				if (left >= MINCLSIZE) {
-					MCLGET(n, M_DONTWAIT);
+					MCLGET(n, MB_DONTWAIT);
 					if (n->m_flags & M_EXT)
 						n->m_len = n->m_ext.ext_size;
 				}
@@ -418,7 +418,7 @@
 			n->m_len = noff + sizeof(crcbuf);
 		else {
 			n->m_len = noff;
-			MGET(n->m_next, M_DONTWAIT, n->m_type);
+			MGET(n->m_next, MB_DONTWAIT, n->m_type);
 			if (n->m_next == NULL)
 				goto fail;
 			n = n->m_next;
Index: src/sys/dev/bge/if_bge.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/bge/if_bge.c,v
retrieving revision 1.31
diff -u -r1.31 if_bge.c
--- src/sys/dev/bge/if_bge.c	19 Feb 2003 05:47:01 -0000	1.31
+++ src/sys/dev/bge/if_bge.c	21 Feb 2003 16:36:04 -0000
@@ -719,12 +719,12 @@
 	struct bge_rx_bd	*r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, MB_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -765,7 +765,7 @@
 		caddr_t			*buf = NULL;
 
 		/* Allocate the mbuf. */
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
Index: src/sys/dev/cm/smc90cx6.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/cm/smc90cx6.c,v
retrieving revision 1.9
diff -u -r1.9 smc90cx6.c
--- src/sys/dev/cm/smc90cx6.c	19 Feb 2003 05:47:02 -0000	1.9
+++ src/sys/dev/cm/smc90cx6.c	21 Feb 2003 16:36:04 -0000
@@ -628,7 +628,7 @@
 	splx(s);
 
 	/* Allocate header mbuf */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 
 	if (m == 0) {
 		/*
@@ -665,7 +665,7 @@
 	 */
 	if ((len + 2 + 2) > MHLEN) {
 		/* attach an mbuf cluster */
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 
 		/* Insist on getting a cluster */
 		if ((m->m_flags & M_EXT) == 0) {
Index: src/sys/dev/cnw/if_cnw.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/cnw/if_cnw.c,v
retrieving revision 1.9
diff -u -r1.9 if_cnw.c
--- src/sys/dev/cnw/if_cnw.c	19 Feb 2003 05:47:02 -0000	1.9
+++ src/sys/dev/cnw/if_cnw.c	21 Feb 2003 16:36:07 -0000
@@ -941,7 +941,7 @@
 	bufbytes = 0;
 	bufptr = 0; /* XXX make gcc happy */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == 0)
 		return (0);
 #if !defined(__FreeBSD__)
@@ -956,7 +956,7 @@
 
 	while (totbytes > 0) {
 		if (top) {
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, MB_DONTWAIT, MT_DATA);
 			if (m == 0) {
 				m_freem(top);
 				return (0);
@@ -964,7 +964,7 @@
 			mbytes = MLEN;
 		}
 		if (totbytes >= MINCLSIZE) {
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, MB_DONTWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_free(m);
 				m_freem(top);
Index: src/sys/dev/cs/if_cs.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/cs/if_cs.c,v
retrieving revision 1.24
diff -u -r1.24 if_cs.c
--- src/sys/dev/cs/if_cs.c	19 Feb 2003 05:47:02 -0000	1.24
+++ src/sys/dev/cs/if_cs.c	21 Feb 2003 16:36:08 -0000
@@ -780,12 +780,12 @@
 		return -1;
 	}
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m==NULL)
 		return -1;
 
 	if (length > MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 		if (!(m->m_flags & M_EXT)) {
 			m_freem(m);
 			return -1;
Index: src/sys/dev/ed/if_ed.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ed/if_ed.c,v
retrieving revision 1.215
diff -u -r1.215 if_ed.c
--- src/sys/dev/ed/if_ed.c	19 Feb 2003 05:47:03 -0000	1.215
+++ src/sys/dev/ed/if_ed.c	21 Feb 2003 16:36:12 -0000
@@ -2679,7 +2679,7 @@
 	struct mbuf *m;
 
 	/* Allocate a header mbuf */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	m->m_pkthdr.rcvif = ifp;
@@ -2693,7 +2693,7 @@
 	 */
 	if ((len + 2) > MHLEN) {
 		/* Attach an mbuf cluster */
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 
 		/* Insist on getting a cluster */
 		if ((m->m_flags & M_EXT) == 0) {
Index: src/sys/dev/em/if_em.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/em/if_em.c,v
retrieving revision 1.19
diff -u -r1.19 if_em.c
--- src/sys/dev/em/if_em.c	19 Feb 2003 05:47:03 -0000	1.19
+++ src/sys/dev/em/if_em.c	21 Feb 2003 16:36:17 -0000
@@ -1802,12 +1802,12 @@
 	ifp = &adapter->interface_data.ac_if;
 
 	if (mp == NULL) {
-		MGETHDR(mp, M_DONTWAIT, MT_DATA);
+		MGETHDR(mp, MB_DONTWAIT, MT_DATA);
 		if (mp == NULL) {
 			adapter->mbuf_alloc_failed++;
 			return(ENOBUFS);
 		}
-		MCLGET(mp, M_DONTWAIT);
+		MCLGET(mp, MB_DONTWAIT);
 		if ((mp->m_flags & M_EXT) == 0) {
 			m_freem(mp);
 			adapter->mbuf_cluster_failed++;
Index: src/sys/dev/en/midway.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/en/midway.c,v
retrieving revision 1.34
diff -u -r1.34 midway.c
--- src/sys/dev/en/midway.c	19 Feb 2003 05:47:04 -0000	1.34
+++ src/sys/dev/en/midway.c	21 Feb 2003 16:36:21 -0000
@@ -601,7 +601,7 @@
   struct mbuf *top, **mp;
   *drqneed = 0;
 
-  MGETHDR(m, M_DONTWAIT, MT_DATA);
+  MGETHDR(m, MB_DONTWAIT, MT_DATA);
   if (m == NULL)
     return(NULL);
   m->m_pkthdr.rcvif = &sc->enif;
@@ -613,7 +613,7 @@
   /* if (top != NULL) then we've already got 1 mbuf on the chain */
   while (totlen > 0) {
     if (top) {
-      MGET(m, M_DONTWAIT, MT_DATA);
+      MGET(m, MB_DONTWAIT, MT_DATA);
       if (!m) {
 	m_freem(top);	
 	return(NULL);	/* out of mbufs */
@@ -621,7 +621,7 @@
       m->m_len = MLEN;
     }
     if (totlen >= MINCLSIZE) {
-      MCLGET(m, M_DONTWAIT);
+      MCLGET(m, MB_DONTWAIT);
       if ((m->m_flags & M_EXT) == 0) {
 	m_free(m);
 	m_freem(top);
@@ -1770,12 +1770,12 @@
       m->m_data = (caddr_t)d;
     } else {
       /* can't write to an M_EXT mbuf since it may be shared */
-      MGET(new, M_DONTWAIT, MT_DATA);
+      MGET(new, MB_DONTWAIT, MT_DATA);
       if (!new) {
         EN_COUNT(sc->mfixfail);
         return(0);
       }
-      MCLGET(new, M_DONTWAIT);
+      MCLGET(new, MB_DONTWAIT);
       if ((new->m_flags & M_EXT) == 0) {
         m_free(new);
         EN_COUNT(sc->mfixfail);
@@ -1837,14 +1837,14 @@
 	
 	if (MEXT_IS_REF(m)) {
 	    /* make a real copy of the M_EXT mbuf since it is shared */
-	    MGET(new, M_DONTWAIT, MT_DATA);
+	    MGET(new, MB_DONTWAIT, MT_DATA);
 	    if (!new) {
 		EN_COUNT(sc->mfixfail);
 		return(0);
 	    }
 	    if (m->m_flags & M_PKTHDR)
 		M_MOVE_PKTHDR(new, m);
-	    MCLGET(new, M_DONTWAIT);
+	    MCLGET(new, MB_DONTWAIT);
 	    if ((new->m_flags & M_EXT) == 0) {
 		m_free(new);
 		EN_COUNT(sc->mfixfail);
Index: src/sys/dev/ep/if_ep.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ep/if_ep.c,v
retrieving revision 1.112
diff -u -r1.112 if_ep.c
--- src/sys/dev/ep/if_ep.c	19 Feb 2003 05:47:04 -0000	1.112
+++ src/sys/dev/ep/if_ep.c	21 Feb 2003 16:36:22 -0000
@@ -686,11 +686,11 @@
     rx_fifo = rx_fifo2 = status & RX_BYTES_MASK;
 
     if (EP_FTST(sc, F_RX_FIRST)) {
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (!m)
 	    goto out;
 	if (rx_fifo >= MINCLSIZE)
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, MB_DONTWAIT);
 	sc->top = sc->mcur = top = m;
 #define EROUND  ((sizeof(struct ether_header) + 3) & ~3)
 #define EOFF    (EROUND - sizeof(struct ether_header))
@@ -714,11 +714,11 @@
 	lenthisone = min(rx_fifo, M_TRAILINGSPACE(m));
 	if (lenthisone == 0) {	/* no room in this one */
 	    mcur = m;
-	    MGET(m, M_DONTWAIT, MT_DATA);
+	    MGET(m, MB_DONTWAIT, MT_DATA);
 	    if (!m)
 		goto out;
 	    if (rx_fifo >= MINCLSIZE)
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 	    m->m_len = 0;
 	    mcur->m_next = m;
 	    lenthisone = min(rx_fifo, M_TRAILINGSPACE(m));
Index: src/sys/dev/ex/if_ex.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ex/if_ex.c,v
retrieving revision 1.41
diff -u -r1.41 if_ex.c
--- src/sys/dev/ex/if_ex.c	19 Feb 2003 05:47:04 -0000	1.41
+++ src/sys/dev/ex/if_ex.c	21 Feb 2003 16:36:24 -0000
@@ -695,7 +695,7 @@
 		QQQ = pkt_len = inw(iobase + IO_PORT_REG);
 
 		if (rx_status & RCV_OK_bit) {
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, MB_DONTWAIT, MT_DATA);
 			ipkt = m;
 			if (ipkt == NULL) {
 				ifp->if_iqdrops++;
@@ -706,7 +706,7 @@
 
 				while (pkt_len > 0) {
 					if (pkt_len > MINCLSIZE) {
-						MCLGET(m, M_DONTWAIT);
+						MCLGET(m, MB_DONTWAIT);
 						if (m->m_flags & M_EXT) {
 							m->m_len = MCLBYTES;
 						} else {
@@ -731,7 +731,7 @@
 					pkt_len -= m->m_len;
 
 					if (pkt_len > 0) {
-						MGET(m->m_next, M_DONTWAIT, MT_DATA);
+						MGET(m->m_next, MB_DONTWAIT, MT_DATA);
 						if (m->m_next == NULL) {
 							m_freem(ipkt);
 							ifp->if_iqdrops++;
Index: src/sys/dev/fe/if_fe.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/fe/if_fe.c,v
retrieving revision 1.76
diff -u -r1.76 if_fe.c
--- src/sys/dev/fe/if_fe.c	19 Feb 2003 05:47:04 -0000	1.76
+++ src/sys/dev/fe/if_fe.c	21 Feb 2003 16:36:26 -0000
@@ -1847,13 +1847,13 @@
 	 */
 
 	/* Allocate an mbuf with packet header info.  */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return -1;
 
 	/* Attach a cluster if this packet doesn't fit in a normal mbuf.  */
 	if (len > MHLEN - NFS_MAGIC_OFFSET) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 		if (!(m->m_flags & M_EXT)) {
 			m_freem(m);
 			return -1;
Index: src/sys/dev/firewire/if_fwe.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/firewire/if_fwe.c,v
retrieving revision 1.10
diff -u -r1.10 if_fwe.c
--- src/sys/dev/firewire/if_fwe.c	19 Feb 2003 05:47:05 -0000	1.10
+++ src/sys/dev/firewire/if_fwe.c	21 Feb 2003 16:36:27 -0000
@@ -469,7 +469,7 @@
 		xfer->act.hand = fwe_output_callback;
 
 		/* keep ip packet alignment for alpha */
-		M_PREPEND(m, ALIGN_PAD, M_DONTWAIT);
+		M_PREPEND(m, ALIGN_PAD, MB_DONTWAIT);
 		fp = (struct fw_pkt *)&xfer->dst; /* XXX */
 		xfer->dst = *((int32_t *)&fwe->pkt_hdr);
 		fp->mode.stream.len = htons(m->m_pkthdr.len);
@@ -547,7 +547,7 @@
 	while ((xfer = STAILQ_FIRST(&xferq->q)) != NULL) {
 		STAILQ_REMOVE_HEAD(&xferq->q, link);
 		xferq->queued --;
-		MGETHDR(m, M_DONTWAIT, MT_DATA);
+		MGETHDR(m, MB_DONTWAIT, MT_DATA);
 		if (m == NULL) {
 			printf("MGETHDR failed\n");
 			fw_xfer_free(xfer);
Index: src/sys/dev/fxp/if_fxp.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/fxp/if_fxp.c,v
retrieving revision 1.147
diff -u -r1.147 if_fxp.c
--- src/sys/dev/fxp/if_fxp.c	19 Feb 2003 05:47:05 -0000	1.147
+++ src/sys/dev/fxp/if_fxp.c	21 Feb 2003 16:36:30 -0000
@@ -1069,13 +1069,13 @@
 			 * mbuf chain first. Bail out if we can't get the
 			 * new buffers.
 			 */
-			MGETHDR(mn, M_DONTWAIT, MT_DATA);
+			MGETHDR(mn, MB_DONTWAIT, MT_DATA);
 			if (mn == NULL) {
 				m_freem(mb_head);
 				break;
 			}
 			if (mb_head->m_pkthdr.len > MHLEN) {
-				MCLGET(mn, M_DONTWAIT);
+				MCLGET(mn, MB_DONTWAIT);
 				if ((mn->m_flags & M_EXT) == 0) {
 					m_freem(mn);
 					m_freem(mb_head);
@@ -1873,7 +1873,7 @@
 	struct mbuf *m;
 	struct fxp_rfa *rfa, *p_rfa;
 
-	m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) { /* try to recycle the old mbuf instead */
 		if (oldm == NULL)
 			return 1;
Index: src/sys/dev/gem/if_gem.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/gem/if_gem.c,v
retrieving revision 1.15
diff -u -r1.15 if_gem.c
--- src/sys/dev/gem/if_gem.c	19 Feb 2003 05:47:05 -0000	1.15
+++ src/sys/dev/gem/if_gem.c	21 Feb 2003 16:36:33 -0000
@@ -1422,7 +1422,7 @@
 	struct mbuf *m;
 	int error;
 
-	m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
Index: src/sys/dev/gx/if_gx.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/gx/if_gx.c,v
retrieving revision 1.9
diff -u -r1.9 if_gx.c
--- src/sys/dev/gx/if_gx.c	19 Feb 2003 05:47:05 -0000	1.9
+++ src/sys/dev/gx/if_gx.c	21 Feb 2003 16:36:35 -0000
@@ -1068,13 +1068,13 @@
 	struct gx_rx_desc *r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			device_printf(gx->gx_dev, 
 			    "mbuf allocation failed -- packet dropped\n");
 			return (ENOBUFS);
 		}
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, MB_DONTWAIT);
 		if ((m_new->m_flags & M_EXT) == 0) {
 			device_printf(gx->gx_dev, 
 			    "cluster allocation failed -- packet dropped\n");
Index: src/sys/dev/hifn/hifn7751.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/hifn/hifn7751.c,v
retrieving revision 1.10
diff -u -r1.10 hifn7751.c
--- src/sys/dev/hifn/hifn7751.c	19 Feb 2003 05:47:05 -0000	1.10
+++ src/sys/dev/hifn/hifn7751.c	21 Feb 2003 16:36:38 -0000
@@ -1667,14 +1667,14 @@
 			totlen = cmd->src_mapsize;
 			if (cmd->src_m->m_flags & M_PKTHDR) {
 				len = MHLEN;
-				MGETHDR(m0, M_DONTWAIT, MT_DATA);
-				if (m0 && !m_dup_pkthdr(m0, cmd->src_m, M_DONTWAIT)) {
+				MGETHDR(m0, MB_DONTWAIT, MT_DATA);
+				if (m0 && !m_dup_pkthdr(m0, cmd->src_m, MB_DONTWAIT)) {
 					m_free(m0);
 					m0 = NULL;
 				}
 			} else {
 				len = MLEN;
-				MGET(m0, M_DONTWAIT, MT_DATA);
+				MGET(m0, MB_DONTWAIT, MT_DATA);
 			}
 			if (m0 == NULL) {
 				hifnstats.hst_nomem_mbuf++;
@@ -1682,7 +1682,7 @@
 				goto err_srcmap;
 			}
 			if (totlen >= MINCLSIZE) {
-				MCLGET(m0, M_DONTWAIT);
+				MCLGET(m0, MB_DONTWAIT);
 				if ((m0->m_flags & M_EXT) == 0) {
 					hifnstats.hst_nomem_mcl++;
 					err = dma->cmdu ? ERESTART : ENOMEM;
@@ -1696,7 +1696,7 @@
 			mlast = m0;
 
 			while (totlen > 0) {
-				MGET(m, M_DONTWAIT, MT_DATA);
+				MGET(m, MB_DONTWAIT, MT_DATA);
 				if (m == NULL) {
 					hifnstats.hst_nomem_mbuf++;
 					err = dma->cmdu ? ERESTART : ENOMEM;
@@ -1705,7 +1705,7 @@
 				}
 				len = MLEN;
 				if (totlen >= MINCLSIZE) {
-					MCLGET(m, M_DONTWAIT);
+					MCLGET(m, MB_DONTWAIT);
 					if ((m->m_flags & M_EXT) == 0) {
 						hifnstats.hst_nomem_mcl++;
 						err = dma->cmdu ? ERESTART : ENOMEM;
Index: src/sys/dev/hme/if_hme.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/hme/if_hme.c,v
retrieving revision 1.13
diff -u -r1.13 if_hme.c
--- src/sys/dev/hme/if_hme.c	19 Feb 2003 05:47:05 -0000	1.13
+++ src/sys/dev/hme/if_hme.c	21 Feb 2003 16:36:41 -0000
@@ -491,7 +491,7 @@
 		hme_discard_rxbuf(sc, ri);
 		return (0);
 	}
-	if ((m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR)) == NULL)
+	if ((m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR)) == NULL)
 		return (ENOBUFS);
 	m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
 	b = mtod(m, uintptr_t);
Index: src/sys/dev/idt/idt.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/idt/idt.c,v
retrieving revision 1.5
diff -u -r1.5 idt.c
--- src/sys/dev/idt/idt.c	19 Feb 2003 05:47:06 -0000	1.5
+++ src/sys/dev/idt/idt.c	21 Feb 2003 16:36:46 -0000
@@ -1171,10 +1171,10 @@
 		idt_sysctl_buflarge = 10;
 
 	while (card_small < idt_sysctl_bufsmall) {	/* 05/25/2001 from fixed */
-		MGETHDR(m1, M_DONTWAIT, MT_DATA);
+		MGETHDR(m1, MB_DONTWAIT, MT_DATA);
 		if (m1 == NULL)
 			break;
-		MGETHDR(m2, M_DONTWAIT, MT_DATA);
+		MGETHDR(m2, MB_DONTWAIT, MT_DATA);
 		if (m2 == NULL) {
 			m_free(m1);
 			break;
@@ -2006,11 +2006,11 @@
 {
 	struct mbuf *m;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return (NULL);
 
-	MCLGET(m, M_DONTWAIT);
+	MCLGET(m, MB_DONTWAIT);
 	if (m->m_flags & M_EXT)
 		return (m);
 
Index: src/sys/dev/ie/if_ie.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ie/if_ie.c,v
retrieving revision 1.87
diff -u -r1.87 if_ie.c
--- src/sys/dev/ie/if_ie.c	19 Feb 2003 05:47:06 -0000	1.87
+++ src/sys/dev/ie/if_ie.c	21 Feb 2003 16:36:49 -0000
@@ -1133,7 +1133,7 @@
 	if (totlen <= 0)
 		return (-1);
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (!m) {
 		ie_drop_packet_buffer(unit, ie);
 		/* XXXX if_ierrors++; */
@@ -1188,7 +1188,7 @@
 		 * single mbuf which may or may not be big enough. Got that?
 		 */
 		if (top) {
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, MB_DONTWAIT, MT_DATA);
 			if (!m) {
 				m_freem(top);
 				ie_drop_packet_buffer(unit, ie);
@@ -1197,7 +1197,7 @@
 			m->m_len = MLEN;
 		}
 		if (resid >= MINCLSIZE) {
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, MB_DONTWAIT);
 			if (m->m_flags & M_EXT)
 				m->m_len = min(resid, MCLBYTES);
 		} else {
Index: src/sys/dev/lge/if_lge.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/lge/if_lge.c,v
retrieving revision 1.17
diff -u -r1.17 if_lge.c
--- src/sys/dev/lge/if_lge.c	19 Feb 2003 05:47:07 -0000	1.17
+++ src/sys/dev/lge/if_lge.c	21 Feb 2003 16:36:51 -0000
@@ -784,7 +784,7 @@
 	caddr_t			*buf = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("lge%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->lge_unit);
Index: src/sys/dev/lmc/if_lmc.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/lmc/if_lmc.c,v
retrieving revision 1.19
diff -u -r1.19 if_lmc.c
--- src/sys/dev/lmc/if_lmc.c	19 Feb 2003 05:47:07 -0000	1.19
+++ src/sys/dev/lmc/if_lmc.c	21 Feb 2003 16:36:53 -0000
@@ -621,9 +621,9 @@
 		 */
 		if (accept || ms == NULL) {
 			struct mbuf *m0;
-			MGETHDR(m0, M_DONTWAIT, MT_DATA);
+			MGETHDR(m0, MB_DONTWAIT, MT_DATA);
 			if (m0 != NULL) {
-				MCLGET(m0, M_DONTWAIT);
+				MCLGET(m0, MB_DONTWAIT);
 				if ((m0->m_flags & M_EXT) == 0) {
 					m_freem(m0);
 					m0 = NULL;
@@ -830,10 +830,10 @@
 {
 	struct mbuf *m0;
 #if MCLBYTES >= LMC_MTU + PPP_HEADER_LEN && !defined(BIG_PACKET)
-	MGETHDR(m0, M_DONTWAIT, MT_DATA);
+	MGETHDR(m0, MB_DONTWAIT, MT_DATA);
 	if (m0 != NULL) {
 		if (m->m_pkthdr.len > MHLEN) {
-			MCLGET(m0, M_DONTWAIT);
+			MCLGET(m0, MB_DONTWAIT);
 			if ((m0->m_flags & M_EXT) == 0) {
 				m_freem(m);
 				m_freem(m0);
@@ -850,9 +850,9 @@
 
 	while (len > 0) {
 		if (mlen == MHLEN) {
-			MGETHDR(*mp, M_DONTWAIT, MT_DATA);
+			MGETHDR(*mp, MB_DONTWAIT, MT_DATA);
 		} else {
-			MGET(*mp, M_DONTWAIT, MT_DATA);
+			MGET(*mp, MB_DONTWAIT, MT_DATA);
 		}
 		if (*mp == NULL) {
 			m_freem(m0);
@@ -860,7 +860,7 @@
 			break;
 		}
 		if (len > MLEN) {
-			MCLGET(*mp, M_DONTWAIT);
+			MCLGET(*mp, MB_DONTWAIT);
 			if (((*mp)->m_flags & M_EXT) == 0) {
 				m_freem(m0);
 				m0 = NULL;
Index: src/sys/dev/lnc/if_lnc.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/lnc/if_lnc.c,v
retrieving revision 1.95
diff -u -r1.95 if_lnc.c
--- src/sys/dev/lnc/if_lnc.c	19 Feb 2003 05:47:07 -0000	1.95
+++ src/sys/dev/lnc/if_lnc.c	21 Feb 2003 16:36:56 -0000
@@ -314,10 +314,10 @@
 		sc->mbufs = m->m_next;
 		/* XXX m->m_data = m->m_ext.ext_buf;*/
 	} else {
-		MGET(m, M_DONTWAIT, MT_DATA);
+		MGET(m, MB_DONTWAIT, MT_DATA);
    	if (!m)
 			return(1);
-        MCLGET(m, M_DONTWAIT);
+        MCLGET(m, MB_DONTWAIT);
    	if (!m->m_ext.ext_buf) {
 			m_free(m);
 			return(1);
@@ -379,7 +379,7 @@
 	int amount;
 
 	/* Get a pkthdr mbuf for the start of packet */
-	MGETHDR(head, M_DONTWAIT, MT_DATA);
+	MGETHDR(head, MB_DONTWAIT, MT_DATA);
 	if (!head) {
 		LNCSTATS(drop_packet)
 		return(0);
@@ -409,13 +409,13 @@
 		if (amount == 0) {
 			/* mbuf must be empty */
 			m_prev = m;
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, MB_DONTWAIT, MT_DATA);
 			if (!m) {
 				m_freem(head);
 				return(0);
 			}
 			if (pkt_len >= MINCLSIZE)
-				MCLGET(m, M_DONTWAIT);
+				MCLGET(m, MB_DONTWAIT);
 			m->m_len = 0;
 			m_prev->m_next = m;
 			amount = min(blen, M_TRAILINGSPACE(m));
@@ -1218,9 +1218,9 @@
 {
 	struct mbuf *new;
 
-	MGET(new, M_DONTWAIT, MT_DATA);
+	MGET(new, MB_DONTWAIT, MT_DATA);
 	if (new) {
-		MCLGET(new, M_DONTWAIT);
+		MCLGET(new, MB_DONTWAIT);
 		if (new->m_ext.ext_buf) {
 			new->m_len = mbuf_to_buffer(m, new->m_data);
 			m_freem(m);
Index: src/sys/dev/musycc/musycc.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/musycc/musycc.c,v
retrieving revision 1.25
diff -u -r1.25 musycc.c
--- src/sys/dev/musycc/musycc.c	19 Feb 2003 05:47:08 -0000	1.25
+++ src/sys/dev/musycc/musycc.c	21 Feb 2003 16:36:57 -0000
@@ -696,9 +696,9 @@
 		m->m_len = m->m_pkthdr.len = status & 0x3fff;
 		error = (status >> 16) & 0xf;
 		if (error == 0) {
-			MGETHDR(m2, M_DONTWAIT, MT_DATA);
+			MGETHDR(m2, MB_DONTWAIT, MT_DATA);
 			if (m2 != NULL) {
-				MCLGET(m2, M_DONTWAIT);
+				MCLGET(m2, MB_DONTWAIT);
 				if((m2->m_flags & M_EXT) != 0) {
 					/* Substitute the mbuf+cluster. */
 					md->m = m2;
@@ -1287,13 +1287,13 @@
 		sc->mdt[ch][i].m = NULL;
 		sc->mdt[ch][i].data = 0;
 
-		MGETHDR(m, M_TRYWAIT, MT_DATA);
+		MGETHDR(m, MB_TRYWAIT, MT_DATA);
 		if (m == NULL)
 			goto errfree;
-		MCLGET(m, M_TRYWAIT);
+		MCLGET(m, MB_TRYWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			/* We've waited mbuf_wait and still got nothing.
-			   We're calling with M_TRYWAIT anyway - a little
+			   We're calling with MB_TRYWAIT anyway - a little
 			   defensive programming costs us very little - if
 			   anything at all in the case of error. */
 			m_free(m);
Index: src/sys/dev/my/if_my.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/my/if_my.c,v
retrieving revision 1.14
diff -u -r1.14 if_my.c
--- src/sys/dev/my/if_my.c	19 Feb 2003 05:47:08 -0000	1.14
+++ src/sys/dev/my/if_my.c	21 Feb 2003 16:37:00 -0000
@@ -1179,14 +1179,14 @@
 	struct mbuf    *m_new = NULL;
 
 	MY_LOCK(sc);
-	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 	if (m_new == NULL) {
 		printf("my%d: no memory for rx list -- packet dropped!\n",
 		       sc->my_unit);
 		MY_UNLOCK(sc);
 		return (ENOBUFS);
 	}
-	MCLGET(m_new, M_DONTWAIT);
+	MCLGET(m_new, MB_DONTWAIT);
 	if (!(m_new->m_flags & M_EXT)) {
 		printf("my%d: no memory for rx list -- packet dropped!\n",
 		       sc->my_unit);
@@ -1451,14 +1451,14 @@
 	 * chain.
 	 */
 	m = m_head;
-	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 	if (m_new == NULL) {
 		printf("my%d: no memory for tx list", sc->my_unit);
 		MY_UNLOCK(sc);
 		return (1);
 	}
 	if (m_head->m_pkthdr.len > MHLEN) {
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, MB_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			printf("my%d: no memory for tx list", sc->my_unit);
Index: src/sys/dev/nge/if_nge.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/nge/if_nge.c,v
retrieving revision 1.42
diff -u -r1.42 if_nge.c
--- src/sys/dev/nge/if_nge.c	19 Feb 2003 05:47:08 -0000	1.42
+++ src/sys/dev/nge/if_nge.c	21 Feb 2003 16:37:03 -0000
@@ -1162,7 +1162,7 @@
 	caddr_t			*buf = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("nge%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->nge_unit);
Index: src/sys/dev/pdq/pdq_freebsd.h
===================================================================
RCS file: /home/ncvs/src/sys/dev/pdq/pdq_freebsd.h,v
retrieving revision 1.4
diff -u -r1.4 pdq_freebsd.h
--- src/sys/dev/pdq/pdq_freebsd.h	19 Feb 2003 05:47:09 -0000	1.4
+++ src/sys/dev/pdq/pdq_freebsd.h	21 Feb 2003 16:37:03 -0000
@@ -186,9 +186,9 @@
 
 #define	PDQ_OS_DATABUF_ALLOC(pdq, b) do { \
     PDQ_OS_DATABUF_T *x_m0; \
-    MGETHDR(x_m0, M_DONTWAIT, MT_DATA); \
+    MGETHDR(x_m0, MB_DONTWAIT, MT_DATA); \
     if (x_m0 != NULL) { \
-	MCLGET(x_m0, M_DONTWAIT);	\
+	MCLGET(x_m0, MB_DONTWAIT);	\
 	if ((x_m0->m_flags & M_EXT) == 0) { \
 	    m_free(x_m0); \
 	    (b) = NULL; \
Index: src/sys/dev/pdq/pdq_ifsubr.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/pdq/pdq_ifsubr.c,v
retrieving revision 1.21
diff -u -r1.21 pdq_ifsubr.c
--- src/sys/dev/pdq/pdq_ifsubr.c	19 Feb 2003 05:47:09 -0000	1.21
+++ src/sys/dev/pdq/pdq_ifsubr.c	21 Feb 2003 16:37:04 -0000
@@ -703,12 +703,12 @@
     struct mbuf *m;
     bus_dmamap_t map;
 
-    MGETHDR(m, M_DONTWAIT, MT_DATA);
+    MGETHDR(m, MB_DONTWAIT, MT_DATA);
     if (m == NULL) {
 	printf("%s: can't alloc small buf\n", sc->sc_dev.dv_xname);
 	return NULL;
     }
-    MCLGET(m, M_DONTWAIT);
+    MCLGET(m, MB_DONTWAIT);
     if ((m->m_flags & M_EXT) == 0) {
 	printf("%s: can't alloc cluster\n", sc->sc_dev.dv_xname);
         m_free(m);
Index: src/sys/dev/pdq/pdqvar.h
===================================================================
RCS file: /home/ncvs/src/sys/dev/pdq/pdqvar.h,v
retrieving revision 1.9
diff -u -r1.9 pdqvar.h
--- src/sys/dev/pdq/pdqvar.h	19 Feb 2003 05:47:09 -0000	1.9
+++ src/sys/dev/pdq/pdqvar.h	21 Feb 2003 16:37:05 -0000
@@ -401,9 +401,9 @@
 #ifndef PDQ_OS_DATABUF_ALLOC
 #define	PDQ_OS_DATABUF_ALLOC(pdq, b) do { \
     PDQ_OS_DATABUF_T *x_m0; \
-    MGETHDR(x_m0, M_DONTWAIT, MT_DATA); \
+    MGETHDR(x_m0, MB_DONTWAIT, MT_DATA); \
     if (x_m0 != NULL) { \
-	MCLGET(x_m0, M_DONTWAIT);	\
+	MCLGET(x_m0, MB_DONTWAIT);	\
 	if ((x_m0->m_flags & M_EXT) == 0) { \
 	    m_free(x_m0); \
 	    (b) = NULL; \
Index: src/sys/dev/ray/if_ray.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ray/if_ray.c,v
retrieving revision 1.61
diff -u -r1.61 if_ray.c
--- src/sys/dev/ray/if_ray.c	19 Feb 2003 05:47:10 -0000	1.61
+++ src/sys/dev/ray/if_ray.c	21 Feb 2003 16:37:11 -0000
@@ -1782,14 +1782,14 @@
 		goto skip_read;
 	}
 
-	MGETHDR(m0, M_DONTWAIT, MT_DATA);
+	MGETHDR(m0, MB_DONTWAIT, MT_DATA);
 	if (m0 == NULL) {
 		RAY_RECERR(sc, "MGETHDR failed");
 		ifp->if_ierrors++;
 		goto skip_read;
 	}
 	if (pktlen > MHLEN) {
-		MCLGET(m0, M_DONTWAIT);
+		MCLGET(m0, MB_DONTWAIT);
 		if (!(m0->m_flags & M_EXT)) {
 			RAY_RECERR(sc, "MCLGET failed");
 			ifp->if_ierrors++;
Index: src/sys/dev/sbni/if_sbni.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sbni/if_sbni.c,v
retrieving revision 1.10
diff -u -r1.10 if_sbni.c
--- src/sys/dev/sbni/if_sbni.c	19 Feb 2003 05:47:10 -0000	1.10
+++ src/sys/dev/sbni/if_sbni.c	21 Feb 2003 16:37:12 -0000
@@ -814,7 +814,7 @@
 {
 	struct mbuf *m;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		if_printf(&sc->arpcom.ac_if, "cannot allocate header mbuf\n");
 		return (0);
@@ -828,7 +828,7 @@
 	 */
 	if (ETHER_MAX_LEN + 2 > MHLEN) {
 		/* Attach an mbuf cluster */
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_freem(m);
 			return (0);
Index: src/sys/dev/sn/if_sn.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sn/if_sn.c,v
retrieving revision 1.24
diff -u -r1.24 if_sn.c
--- src/sys/dev/sn/if_sn.c	19 Feb 2003 05:47:11 -0000	1.24
+++ src/sys/dev/sn/if_sn.c	21 Feb 2003 16:37:14 -0000
@@ -1057,7 +1057,7 @@
 	/*
 	 * Allocate a header mbuf from the kernel.
 	 */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		goto out;
 
@@ -1067,7 +1067,7 @@
 	/*
 	 * Attach an mbuf cluster
 	 */
-	MCLGET(m, M_DONTWAIT);
+	MCLGET(m, MB_DONTWAIT);
 
 	/*
 	 * Insist on getting a cluster
Index: src/sys/dev/snc/dp83932.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/snc/dp83932.c,v
retrieving revision 1.9
diff -u -r1.9 dp83932.c
--- src/sys/dev/snc/dp83932.c	19 Feb 2003 05:47:11 -0000	1.9
+++ src/sys/dev/snc/dp83932.c	21 Feb 2003 16:37:15 -0000
@@ -1121,7 +1121,7 @@
 	 * Our sonic_read() and sonic_get() require it.
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == 0)
 		return (0);
 	m->m_pkthdr.rcvif = &sc->sc_if;
@@ -1132,7 +1132,7 @@
 
 	while (datalen > 0) {
 		if (top) {
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, MB_DONTWAIT, MT_DATA);
 			if (m == 0) {
 				m_freem(top);
 				return (0);
@@ -1140,7 +1140,7 @@
 			len = MLEN;
 		}
 		if (datalen >= MINCLSIZE) {
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, MB_DONTWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				if (top) m_freem(top);
 				return (0);
Index: src/sys/dev/sr/if_sr.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sr/if_sr.c,v
retrieving revision 1.54
diff -u -r1.54 if_sr.c
--- src/sys/dev/sr/if_sr.c	19 Feb 2003 05:47:12 -0000	1.54
+++ src/sys/dev/sr/if_sr.c	21 Feb 2003 16:37:19 -0000
@@ -2088,7 +2088,7 @@
 			       sc->unit, rxstat, len);
 #endif
 
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, MB_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				/*
 				 * eat (flush) packet if get mbuf fail!!
@@ -2106,7 +2106,7 @@
 #endif /* NETGRAPH */
 			m->m_pkthdr.len = m->m_len = len;
 			if (len > MHLEN) {
-				MCLGET(m, M_DONTWAIT);
+				MCLGET(m, MB_DONTWAIT);
 				if ((m->m_flags & M_EXT) == 0) {
 					/*
 					 * We couldn't get a big enough
Index: src/sys/dev/tx/if_tx.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/tx/if_tx.c,v
retrieving revision 1.65
diff -u -r1.65 if_tx.c
--- src/sys/dev/tx/if_tx.c	19 Feb 2003 05:47:14 -0000	1.65
+++ src/sys/dev/tx/if_tx.c	21 Feb 2003 16:37:22 -0000
@@ -577,7 +577,7 @@
 		/* If packet was more than EPIC_MAX_FRAGS parts, */
 		/* recopy packet to new allocated mbuf cluster */
 		if( NULL != m ){
-			m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+			m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
 			if( NULL == m ){
 				m_freem(m0);
 				ifp->if_oerrors++;
@@ -652,7 +652,7 @@
 		m = buf->mbuf;
 
 		/* Try to get mbuf cluster */
-		buf->mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+		buf->mbuf = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
 		if( NULL == buf->mbuf ) { 
 			buf->mbuf = m;
 			desc->status = 0x8000;
@@ -1415,7 +1415,7 @@
 	if ((desc->status & 0x8000) || (buf->mbuf != NULL))
 		return (EBUSY);
 
-	MGETHDR(m0, M_DONTWAIT, MT_DATA);
+	MGETHDR(m0, MB_DONTWAIT, MT_DATA);
 	if (NULL == m0)
 		return (ENOBUFS);
 
@@ -1556,7 +1556,7 @@
 			return EFAULT;
 		}
 
-		buf->mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+		buf->mbuf = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
 		if( NULL == buf->mbuf ) {
 			epic_free_rings(sc);
 			return ENOBUFS;
Index: src/sys/dev/tx/if_txvar.h
===================================================================
RCS file: /home/ncvs/src/sys/dev/tx/if_txvar.h,v
retrieving revision 1.16
diff -u -r1.16 if_txvar.h
--- src/sys/dev/tx/if_txvar.h	19 Feb 2003 05:47:15 -0000	1.16
+++ src/sys/dev/tx/if_txvar.h	21 Feb 2003 16:37:22 -0000
@@ -134,9 +134,9 @@
 
 /* Macro to get either mbuf cluster or nothing */
 #define EPIC_MGETCLUSTER(m)						\
-	{ MGETHDR((m),M_DONTWAIT,MT_DATA);				\
+	{ MGETHDR((m),MB_DONTWAIT,MT_DATA);				\
 	  if (m) {							\
-	    MCLGET((m),M_DONTWAIT);					\
+	    MCLGET((m),MB_DONTWAIT);					\
 	    if( 0 == ((m)->m_flags & M_EXT) ) {				\
 	      m_freem(m);						\
 	      (m) = NULL;						\
Index: src/sys/dev/txp/if_txp.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/txp/if_txp.c,v
retrieving revision 1.14
diff -u -r1.14 if_txp.c
--- src/sys/dev/txp/if_txp.c	19 Feb 2003 05:47:15 -0000	1.14
+++ src/sys/dev/txp/if_txp.c	21 Feb 2003 16:37:24 -0000
@@ -768,13 +768,13 @@
 			 */
 			struct mbuf *mnew;
 
-			MGETHDR(mnew, M_DONTWAIT, MT_DATA);
+			MGETHDR(mnew, MB_DONTWAIT, MT_DATA);
 			if (mnew == NULL) {
 				m_freem(m);
 				goto next;
 			}
 			if (m->m_len > (MHLEN - 2)) {
-				MCLGET(mnew, M_DONTWAIT);
+				MCLGET(mnew, MB_DONTWAIT);
 				if (!(mnew->m_flags & M_EXT)) {
 					m_freem(mnew);
 					m_freem(m);
@@ -847,11 +847,11 @@
 		if (sd->sd_mbuf != NULL)
 			break;
 
-		MGETHDR(sd->sd_mbuf, M_DONTWAIT, MT_DATA);
+		MGETHDR(sd->sd_mbuf, MB_DONTWAIT, MT_DATA);
 		if (sd->sd_mbuf == NULL)
 			goto err_sd;
 
-		MCLGET(sd->sd_mbuf, M_DONTWAIT);
+		MCLGET(sd->sd_mbuf, MB_DONTWAIT);
 		if ((sd->sd_mbuf->m_flags & M_EXT) == 0)
 			goto err_mbuf;
 		sd->sd_mbuf->m_pkthdr.rcvif = ifp;
@@ -1142,11 +1142,11 @@
 
 	for (i = 0; i < RXBUF_ENTRIES; i++) {
 		sd = sc->sc_rxbufs[i].rb_sd;
-		MGETHDR(sd->sd_mbuf, M_DONTWAIT, MT_DATA);
+		MGETHDR(sd->sd_mbuf, MB_DONTWAIT, MT_DATA);
 		if (sd->sd_mbuf == NULL)
 			return(ENOBUFS);
 
-		MCLGET(sd->sd_mbuf, M_DONTWAIT);
+		MCLGET(sd->sd_mbuf, MB_DONTWAIT);
 		if ((sd->sd_mbuf->m_flags & M_EXT) == 0) {
 			m_freem(sd->sd_mbuf);
 			return(ENOBUFS);
Index: src/sys/dev/ubsec/ubsec.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ubsec/ubsec.c,v
retrieving revision 1.15
diff -u -r1.15 ubsec.c
--- src/sys/dev/ubsec/ubsec.c	19 Feb 2003 05:47:15 -0000	1.15
+++ src/sys/dev/ubsec/ubsec.c	21 Feb 2003 16:37:28 -0000
@@ -1332,14 +1332,14 @@
 				totlen = q->q_src_mapsize;
 				if (q->q_src_m->m_flags & M_PKTHDR) {
 					len = MHLEN;
-					MGETHDR(m, M_DONTWAIT, MT_DATA);
-					if (m && !m_dup_pkthdr(m, q->q_src_m, M_DONTWAIT)) {
+					MGETHDR(m, MB_DONTWAIT, MT_DATA);
+					if (m && !m_dup_pkthdr(m, q->q_src_m, MB_DONTWAIT)) {
 						m_free(m);
 						m = NULL;
 					}
 				} else {
 					len = MLEN;
-					MGET(m, M_DONTWAIT, MT_DATA);
+					MGET(m, MB_DONTWAIT, MT_DATA);
 				}
 				if (m == NULL) {
 					ubsecstats.hst_nombuf++;
@@ -1347,7 +1347,7 @@
 					goto errout;
 				}
 				if (totlen >= MINCLSIZE) {
-					MCLGET(m, M_DONTWAIT);
+					MCLGET(m, MB_DONTWAIT);
 					if ((m->m_flags & M_EXT) == 0) {
 						m_free(m);
 						ubsecstats.hst_nomcl++;
@@ -1362,7 +1362,7 @@
 
 				while (totlen > 0) {
 					if (top) {
-						MGET(m, M_DONTWAIT, MT_DATA);
+						MGET(m, MB_DONTWAIT, MT_DATA);
 						if (m == NULL) {
 							m_freem(top);
 							ubsecstats.hst_nombuf++;
@@ -1372,7 +1372,7 @@
 						len = MLEN;
 					}
 					if (top && totlen >= MINCLSIZE) {
-						MCLGET(m, M_DONTWAIT);
+						MCLGET(m, MB_DONTWAIT);
 						if ((m->m_flags & M_EXT) == 0) {
 							*mp = m;
 							m_freem(top);
Index: src/sys/dev/usb/if_aue.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/if_aue.c,v
retrieving revision 1.65
diff -u -r1.65 if_aue.c
--- src/sys/dev/usb/if_aue.c	19 Feb 2003 05:47:15 -0000	1.65
+++ src/sys/dev/usb/if_aue.c	21 Feb 2003 16:37:30 -0000
@@ -812,14 +812,14 @@
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("aue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->aue_unit);
 			return (ENOBUFS);
 		}
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, MB_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			printf("aue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->aue_unit);
Index: src/sys/dev/usb/if_cue.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/if_cue.c,v
retrieving revision 1.31
diff -u -r1.31 if_cue.c
--- src/sys/dev/usb/if_cue.c	19 Feb 2003 05:47:15 -0000	1.31
+++ src/sys/dev/usb/if_cue.c	21 Feb 2003 16:37:31 -0000
@@ -568,14 +568,14 @@
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("cue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->cue_unit);
 			return(ENOBUFS);
 		}
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, MB_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			printf("cue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->cue_unit);
Index: src/sys/dev/usb/if_kue.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/if_kue.c,v
retrieving revision 1.44
diff -u -r1.44 if_kue.c
--- src/sys/dev/usb/if_kue.c	19 Feb 2003 05:47:15 -0000	1.44
+++ src/sys/dev/usb/if_kue.c	21 Feb 2003 16:37:33 -0000
@@ -542,14 +542,14 @@
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("kue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->kue_unit);
 			return(ENOBUFS);
 		}
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, MB_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			printf("kue%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->kue_unit);
Index: src/sys/dev/vx/if_vx.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/vx/if_vx.c,v
retrieving revision 1.42
diff -u -r1.42 if_vx.c
--- src/sys/dev/vx/if_vx.c	19 Feb 2003 05:47:16 -0000	1.42
+++ src/sys/dev/vx/if_vx.c	21 Feb 2003 16:37:35 -0000
@@ -761,7 +761,7 @@
     m = sc->mb[sc->next_mb];
     sc->mb[sc->next_mb] = 0;
     if (m == 0) {
-        MGETHDR(m, M_DONTWAIT, MT_DATA);
+        MGETHDR(m, MB_DONTWAIT, MT_DATA);
         if (m == 0)
             return 0;
     } else {
@@ -800,7 +800,7 @@
             m = sc->mb[sc->next_mb];
             sc->mb[sc->next_mb] = 0;
             if (m == 0) {
-                MGET(m, M_DONTWAIT, MT_DATA);
+                MGET(m, MB_DONTWAIT, MT_DATA);
                 if (m == 0) {
                     splx(sh);
                     m_freem(top);
@@ -812,7 +812,7 @@
             len = MLEN;
         }
         if (totlen >= MINCLSIZE) {
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, MB_DONTWAIT);
 	    if (m->m_flags & M_EXT)
 		len = MCLBYTES;
         }
@@ -993,7 +993,7 @@
     i = sc->last_mb;
     do {
 	if (sc->mb[i] == NULL)
-	    MGET(sc->mb[i], M_DONTWAIT, MT_DATA);
+	    MGET(sc->mb[i], MB_DONTWAIT, MT_DATA);
 	if (sc->mb[i] == NULL)
 	    break;
 	i = (i + 1) % MAX_MBS;
Index: src/sys/dev/wi/if_wi.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/wi/if_wi.c,v
retrieving revision 1.129
diff -u -r1.129 if_wi.c
--- src/sys/dev/wi/if_wi.c	19 Feb 2003 05:47:16 -0000	1.129
+++ src/sys/dev/wi/if_wi.c	21 Feb 2003 16:37:38 -0000
@@ -916,9 +916,9 @@
 		if (sc->sc_drvbpf) {
 			struct mbuf *mb;
 
-			MGETHDR(mb, M_DONTWAIT, m0->m_type);
+			MGETHDR(mb, MB_DONTWAIT, m0->m_type);
 			if (mb != NULL) {
-				(void) m_dup_pkthdr(mb, m0, M_DONTWAIT);
+				(void) m_dup_pkthdr(mb, m0, MB_DONTWAIT);
 				mb->m_next = m0;
 				mb->m_data = (caddr_t)&frmhdr;
 				mb->m_len = sizeof(frmhdr);
@@ -1345,7 +1345,7 @@
 	len = le16toh(frmhdr.wi_dat_len);
 	off = ALIGN(sizeof(struct ieee80211_frame));
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX);
 		ifp->if_ierrors++;
@@ -1353,7 +1353,7 @@
 		return;
 	}
 	if (off + len > MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX);
 			m_freem(m);
@@ -1376,9 +1376,9 @@
 	if (sc->sc_drvbpf) {
 		struct mbuf *mb;
 
-		MGETHDR(mb, M_DONTWAIT, m->m_type);
+		MGETHDR(mb, MB_DONTWAIT, m->m_type);
 		if (mb != NULL) {
-			(void) m_dup_pkthdr(mb, m, M_DONTWAIT);
+			(void) m_dup_pkthdr(mb, m, MB_DONTWAIT);
 			mb->m_next = m;
 			mb->m_data = (caddr_t)&frmhdr;
 			mb->m_len = sizeof(frmhdr);
Index: src/sys/dev/wl/if_wl.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/wl/if_wl.c,v
retrieving revision 1.47
diff -u -r1.47 if_wl.c
--- src/sys/dev/wl/if_wl.c	19 Feb 2003 05:47:17 -0000	1.47
+++ src/sys/dev/wl/if_wl.c	21 Feb 2003 16:37:42 -0000
@@ -966,7 +966,7 @@
     /*
      * Allocate a cluster'd mbuf to receive the packet.
      */
-    m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+    m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
     if (m == NULL) {
 	if (wlhwrst(unit) != TRUE) {
 	    sc->hacr &= ~HACR_INTRON;
Index: src/sys/dev/xe/if_xe.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/xe/if_xe.c,v
retrieving revision 1.36
diff -u -r1.36 if_xe.c
--- src/sys/dev/xe/if_xe.c	19 Feb 2003 05:47:17 -0000	1.36
+++ src/sys/dev/xe/if_xe.c	21 Feb 2003 16:37:45 -0000
@@ -643,7 +643,7 @@
 	if (len & 0x01)
 	  len++;
 
-	MGETHDR(mbp, M_DONTWAIT, MT_DATA);	/* Allocate a header mbuf */
+	MGETHDR(mbp, MB_DONTWAIT, MT_DATA);	/* Allocate a header mbuf */
 	if (mbp != NULL) {
 	  mbp->m_pkthdr.rcvif = ifp;
 	  mbp->m_pkthdr.len = mbp->m_len = len;
@@ -654,7 +654,7 @@
 	   * alignment hack below.
 	   */
 	  if (len + 2 > MHLEN) {
-	    MCLGET(mbp, M_DONTWAIT);
+	    MCLGET(mbp, MB_DONTWAIT);
 	    if ((mbp->m_flags & M_EXT) == 0) {
 	      m_freem(mbp);
 	      mbp = NULL;
Index: src/sys/fs/nwfs/nwfs_subr.c
===================================================================
RCS file: /home/ncvs/src/sys/fs/nwfs/nwfs_subr.c,v
retrieving revision 1.11
diff -u -r1.11 nwfs_subr.c
--- src/sys/fs/nwfs/nwfs_subr.c	3 Feb 2003 19:49:33 -0000	1.11
+++ src/sys/fs/nwfs/nwfs_subr.c	21 Feb 2003 16:37:46 -0000
@@ -60,12 +60,12 @@
 {
 	u_int8_t name_len;
 
-	md_get_mem(&rqp->rp, (caddr_t)target, NCP_INFOSZ, MB_MSYSTEM);
+	md_get_mem(&rqp->rp, (caddr_t)target, NCP_INFOSZ, MBC_MSYSTEM);
 	if (!withname)
 		return 0;
 	md_get_uint8(&rqp->rp, &name_len);
 	target->nameLen = name_len;
-	md_get_mem(&rqp->rp, (caddr_t)target->entryName, name_len, MB_MSYSTEM);
+	md_get_mem(&rqp->rp, (caddr_t)target->entryName, name_len, MBC_MSYSTEM);
 	target->entryName[name_len] = '\0';
 	ncp_path2unix(target->entryName, target->entryName, name_len, &nmp->m.nls);
 	return 0;
@@ -94,7 +94,7 @@
 	error = ncp_request(rqp);
 	if (error)
 		return error;
-	md_get_mem(&rqp->rp, (caddr_t)&np->n_seq, sizeof(np->n_seq), MB_MSYSTEM);
+	md_get_mem(&rqp->rp, (caddr_t)&np->n_seq, sizeof(np->n_seq), MBC_MSYSTEM);
 	ncp_rq_done(rqp);
 	return 0;
 }
@@ -117,7 +117,7 @@
 	mb_put_uint8(&rqp->rq, 0);		/* data stream */
 	mb_put_uint16le(&rqp->rq, 0xffff);	/* Search attribs */
 	mb_put_uint32le(&rqp->rq, IM_ALL);	/* return info mask */
-	mb_put_mem(&rqp->rq, (caddr_t)seq, 9, MB_MSYSTEM);
+	mb_put_mem(&rqp->rq, (caddr_t)seq, 9, MBC_MSYSTEM);
 	mb_put_uint8(&rqp->rq, 2);		/* 2 byte pattern */
 	mb_put_uint8(&rqp->rq, 0xff);		/* following is a wildcard */
 	mb_put_uint8(&rqp->rq, '*');
@@ -125,7 +125,7 @@
 	error = ncp_request(rqp);
 	if (error)
 		return error;
-	md_get_mem(&rqp->rp, (caddr_t)seq, sizeof(*seq), MB_MSYSTEM);
+	md_get_mem(&rqp->rp, (caddr_t)seq, sizeof(*seq), MBC_MSYSTEM);
 	md_get_uint8(&rqp->rp, NULL);		/* skip */
 	error = ncp_extract_file_info(nmp, rqp, target, 1);
 	ncp_rq_done(rqp);
@@ -277,7 +277,7 @@
 	if (error)
 		return error;
 	mb_put_uint8(&rqp->rq, 0);
-	mb_put_mem(&rqp->rq, (caddr_t)fh, 6, MB_MSYSTEM);
+	mb_put_mem(&rqp->rq, (caddr_t)fh, 6, MBC_MSYSTEM);
 	error = ncp_request(rqp);
 	if (error)
 		return error;
@@ -326,12 +326,12 @@
 	mb_put_uint16le(&rqp->rq, oldtype);
 	/* source Handle Path */
 	mb_put_uint8(&rqp->rq, volume);
-	mb_put_mem(&rqp->rq, (c_caddr_t)&fdir, sizeof(fdir), MB_MSYSTEM);
+	mb_put_mem(&rqp->rq, (c_caddr_t)&fdir, sizeof(fdir), MBC_MSYSTEM);
 	mb_put_uint8(&rqp->rq, 1);
 	mb_put_uint8(&rqp->rq, 1);	/* 1 source component */
 	/* dest Handle Path */
 	mb_put_uint8(&rqp->rq, volume);
-	mb_put_mem(&rqp->rq, (c_caddr_t)&tdir, sizeof(tdir), MB_MSYSTEM);
+	mb_put_mem(&rqp->rq, (c_caddr_t)&tdir, sizeof(tdir), MBC_MSYSTEM);
 	mb_put_uint8(&rqp->rq, 1);
 	mb_put_uint8(&rqp->rq, 1);	/* 1 destination component */
 	ncp_rq_pathstring(rqp, oldlen, old_name, nt);
@@ -363,7 +363,7 @@
 	mb_put_uint8(&rqp->rq, 0);	/* reserved */
 	mb_put_uint16le(&rqp->rq, SA_ALL);	/* search attribs: all */
 	mb_put_uint32le(&rqp->rq, info_mask);
-	mb_put_mem(&rqp->rq, (caddr_t)info, sizeof(*info), MB_MSYSTEM);
+	mb_put_mem(&rqp->rq, (caddr_t)info, sizeof(*info), MBC_MSYSTEM);
 	ncp_rq_dbase_path(rqp, volnum, dirent, 0, NULL, NULL);
 	error = ncp_request(rqp);
 	if (!error)
@@ -397,7 +397,7 @@
 			return error;
 		}
 		mb_put_uint8(&rqp->rq, 0);
-		mb_put_mem(&rqp->rq, (caddr_t)&nwn.fh, 6, MB_MSYSTEM);
+		mb_put_mem(&rqp->rq, (caddr_t)&nwn.fh, 6, MBC_MSYSTEM);
 		mb_put_uint32be(&rqp->rq, vap->va_size);
 		mb_put_uint16be(&rqp->rq, 0);
 		error = ncp_request(rqp);
@@ -455,7 +455,7 @@
 	if (len > NCP_VOLNAME_LEN) {
 		error = ENAMETOOLONG;
 	} else {
-		md_get_mem(&rqp->rp, (caddr_t)&target->volume_name, len, MB_MSYSTEM);
+		md_get_mem(&rqp->rp, (caddr_t)&target->volume_name, len, MBC_MSYSTEM);
 	}
 	ncp_rq_done(rqp);
 	return error;
Index: src/sys/fs/smbfs/smbfs_smb.c
===================================================================
RCS file: /home/ncvs/src/sys/fs/smbfs/smbfs_smb.c,v
retrieving revision 1.10
diff -u -r1.10 smbfs_smb.c
--- src/sys/fs/smbfs/smbfs_smb.c	19 Feb 2003 05:47:19 -0000	1.10
+++ src/sys/fs/smbfs/smbfs_smb.c	21 Feb 2003 16:37:48 -0000
@@ -107,7 +107,7 @@
 	mb_put_uint8(mbp, 0xff);	/* secondary command */
 	mb_put_uint8(mbp, 0);		/* MBZ */
 	mb_put_uint16le(mbp, 0);
-	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MBC_MSYSTEM);
 	mb_put_uint8(mbp, ltype);	/* locktype */
 	mb_put_uint8(mbp, 0);		/* oplocklevel - 0 seems is NO_OPLOCK */
 	mb_put_uint32le(mbp, 0);	/* timeout - break immediately */
@@ -340,7 +340,7 @@
 		return error;
 	mbp = &t2p->t2_tparam;
 	mb_init(mbp);
-	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MBC_MSYSTEM);
 	mb_put_uint16le(mbp, SMB_SET_FILE_END_OF_FILE_INFO);
 	mb_put_uint32le(mbp, 0);
 	mbp = &t2p->t2_tdata;
@@ -370,7 +370,7 @@
 		return (error);
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
-	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MBC_MSYSTEM);
 	smb_rq_wend(rqp);
 	smb_rq_bstart(rqp);
 	smb_rq_bend(rqp);
@@ -407,7 +407,7 @@
 		return error;
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
-	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MBC_MSYSTEM);
 	mb_put_uint16le(mbp, 0);
 	mb_put_uint32le(mbp, newsize);
 	mb_put_uint16le(mbp, 0);
@@ -499,7 +499,7 @@
 	} else
 		time = 0;
 	mb_put_uint32le(mbp, time);		/* mtime */
-	mb_put_mem(mbp, NULL, 5 * 2, MB_MZERO);
+	mb_put_mem(mbp, NULL, 5 * 2, MBC_MZERO);
 	smb_rq_wend(rqp);
 	smb_rq_bstart(rqp);
 	mb_put_uint8(mbp, SMB_DT_ASCII);
@@ -644,7 +644,7 @@
 	tzoff = SSTOVC(ssp)->vc_sopt.sv_tz;
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
-	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MBC_MSYSTEM);
 	mb_put_uint32le(mbp, 0);		/* creation time */
 
 	if (atime)
@@ -689,7 +689,7 @@
 	svtz = SSTOVC(ssp)->vc_sopt.sv_tz;
 	mbp = &t2p->t2_tparam;
 	mb_init(mbp);
-	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&np->n_fid, 2, MBC_MSYSTEM);
 	mb_put_uint16le(mbp, SMB_SET_FILE_BASIC_INFO);
 	mb_put_uint32le(mbp, 0);
 	mbp = &t2p->t2_tdata;
@@ -783,7 +783,7 @@
 		return error;
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
-	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MBC_MSYSTEM);
 	if (mtime) {
 		smb_time_local2server(mtime, SSTOVC(ssp)->vc_sopt.sv_tz, &time);
 	} else
@@ -1026,7 +1026,7 @@
 		mb_put_uint8(mbp, 0);	/* file name length */
 		mb_put_uint8(mbp, SMB_DT_VARIABLE);
 		mb_put_uint16le(mbp, SMB_SKEYLEN);
-		mb_put_mem(mbp, ctx->f_skey, SMB_SKEYLEN, MB_MSYSTEM);
+		mb_put_mem(mbp, ctx->f_skey, SMB_SKEYLEN, MBC_MSYSTEM);
 	}
 	smb_rq_bend(rqp);
 	error = smb_rq_simple(rqp);
@@ -1101,13 +1101,13 @@
 	}
 	rqp = ctx->f_rq;
 	smb_rq_getreply(rqp, &mbp);
-	md_get_mem(mbp, ctx->f_skey, SMB_SKEYLEN, MB_MSYSTEM);
+	md_get_mem(mbp, ctx->f_skey, SMB_SKEYLEN, MBC_MSYSTEM);
 	md_get_uint8(mbp, &battr);
 	md_get_uint16le(mbp, &time);
 	md_get_uint16le(mbp, &date);
 	md_get_uint32le(mbp, &size);
 	cp = ctx->f_name;
-	md_get_mem(mbp, cp, sizeof(ctx->f_fname), MB_MSYSTEM);
+	md_get_mem(mbp, cp, sizeof(ctx->f_fname), MBC_MSYSTEM);
 	cp[sizeof(ctx->f_fname) - 1] = 0;
 	cp += strlen(cp) - 1;
 	while (*cp == ' ' && cp >= ctx->f_name)
@@ -1177,13 +1177,13 @@
 		ctx->f_t2 = t2p;
 		mbp = &t2p->t2_tparam;
 		mb_init(mbp);
-		mb_put_mem(mbp, (caddr_t)&ctx->f_Sid, 2, MB_MSYSTEM);
+		mb_put_mem(mbp, (caddr_t)&ctx->f_Sid, 2, MBC_MSYSTEM);
 		mb_put_uint16le(mbp, ctx->f_limit);
 		mb_put_uint16le(mbp, ctx->f_infolevel);
 		mb_put_uint32le(mbp, 0);		/* resume key */
 		mb_put_uint16le(mbp, flags);
 		if (ctx->f_rname)
-			mb_put_mem(mbp, ctx->f_rname, strlen(ctx->f_rname) + 1, MB_MSYSTEM);
+			mb_put_mem(mbp, ctx->f_rname, strlen(ctx->f_rname) + 1, MBC_MSYSTEM);
 		else
 			mb_put_uint8(mbp, 0);	/* resume file name */
 #if 0
@@ -1251,7 +1251,7 @@
 		return error;
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
-	mb_put_mem(mbp, (caddr_t)&ctx->f_Sid, 2, MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&ctx->f_Sid, 2, MBC_MSYSTEM);
 	smb_rq_wend(rqp);
 	smb_rq_bstart(rqp);
 	smb_rq_bend(rqp);
@@ -1345,13 +1345,13 @@
 	}
 	nmlen = min(size, SMB_MAXFNAMELEN);
 	cp = ctx->f_name;
-	error = md_get_mem(mbp, cp, nmlen, MB_MSYSTEM);
+	error = md_get_mem(mbp, cp, nmlen, MBC_MSYSTEM);
 	if (error)
 		return error;
 	if (next) {
 		cnt = next - nmlen - fxsz;
 		if (cnt > 0)
-			md_get_mem(mbp, NULL, cnt, MB_MSYSTEM);
+			md_get_mem(mbp, NULL, cnt, MBC_MSYSTEM);
 		else if (cnt < 0) {
 			SMBERROR("out of sync\n");
 			return EBADRPC;
Index: src/sys/i386/isa/if_cx.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_cx.c,v
retrieving revision 1.38
diff -u -r1.38 if_cx.c
--- src/sys/i386/isa/if_cx.c	19 Feb 2003 05:47:22 -0000	1.38
+++ src/sys/i386/isa/if_cx.c	21 Feb 2003 16:37:50 -0000
@@ -136,11 +136,11 @@
 {
 	struct mbuf *m, *o, *p;
 
-	MGETHDR (m, M_DONTWAIT, MT_DATA);
+	MGETHDR (m, MB_DONTWAIT, MT_DATA);
 	if (! m)
 		return (0);
 	if (len >= MINCLSIZE)
-		MCLGET (m, M_DONTWAIT);
+		MCLGET (m, MB_DONTWAIT);
 	m->m_pkthdr.len = len;
 	m->m_len = 0;
 
@@ -153,13 +153,13 @@
 		if (! n) {
 			/* Allocate new mbuf. */
 			o = p;
-			MGET (p, M_DONTWAIT, MT_DATA);
+			MGET (p, MB_DONTWAIT, MT_DATA);
 			if (! p) {
 				m_freem (m);
 				return (0);
 			}
 			if (len >= MINCLSIZE)
-				MCLGET (p, M_DONTWAIT);
+				MCLGET (p, MB_DONTWAIT);
 			p->m_len = 0;
 			o->m_next = p;
 
Index: src/sys/i386/isa/if_el.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_el.c,v
retrieving revision 1.59
diff -u -r1.59 if_el.c
--- src/sys/i386/isa/if_el.c	19 Feb 2003 05:47:22 -0000	1.59
+++ src/sys/i386/isa/if_el.c	21 Feb 2003 16:37:52 -0000
@@ -671,7 +671,7 @@
         cp = buf;
         epkt = cp + totlen;
 
-        MGETHDR(m, M_DONTWAIT, MT_DATA);
+        MGETHDR(m, MB_DONTWAIT, MT_DATA);
         if (m == 0)
                 return (0);
         m->m_pkthdr.rcvif = ifp;
@@ -681,7 +681,7 @@
         mp = &top;
         while (totlen > 0) {
                 if (top) {
-                        MGET(m, M_DONTWAIT, MT_DATA);
+                        MGET(m, MB_DONTWAIT, MT_DATA);
                         if (m == 0) {
                                 m_freem(top);
                                 return (0);
@@ -690,7 +690,7 @@
                 }
                 len = min(totlen, epkt - cp);
                 if (len >= MINCLSIZE) {
-                        MCLGET(m, M_DONTWAIT);
+                        MCLGET(m, MB_DONTWAIT);
                         if (m->m_flags & M_EXT)
                                 m->m_len = len = min(len, MCLBYTES);
                         else
Index: src/sys/i386/isa/if_le.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_le.c,v
retrieving revision 1.72
diff -u -r1.72 if_le.c
--- src/sys/i386/isa/if_le.c	19 Feb 2003 05:47:22 -0000	1.72
+++ src/sys/i386/isa/if_le.c	21 Feb 2003 16:37:54 -0000
@@ -386,7 +386,7 @@
     struct ifnet *ifp = &sc->le_if;
     struct mbuf *m;
 
-    MGETHDR(m, M_DONTWAIT, MT_DATA);
+    MGETHDR(m, MB_DONTWAIT, MT_DATA);
     if (m == NULL) {
 	ifp->if_ierrors++;
 	return;
@@ -394,14 +394,14 @@
     m->m_pkthdr.len = total_len;
     m->m_pkthdr.rcvif = ifp;
     if (total_len + LE_XTRA > MHLEN /* >= MINCLSIZE */) {
-	MCLGET(m, M_DONTWAIT);
+	MCLGET(m, MB_DONTWAIT);
 	if ((m->m_flags & M_EXT) == 0) {
 	    m_free(m);
 	    ifp->if_ierrors++;
 	    return;
 	}
     } else if (total_len + LE_XTRA > MHLEN && MINCLSIZE == (MHLEN+MLEN)) {
-	MGET(m->m_next, M_DONTWAIT, MT_DATA);
+	MGET(m->m_next, MB_DONTWAIT, MT_DATA);
 	if (m->m_next == NULL) {
 	    m_free(m);
 	    ifp->if_ierrors++;
Index: src/sys/i386/isa/if_rdp.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_rdp.c,v
retrieving revision 1.18
diff -u -r1.18 if_rdp.c
--- src/sys/i386/isa/if_rdp.c	19 Feb 2003 05:47:22 -0000	1.18
+++ src/sys/i386/isa/if_rdp.c	21 Feb 2003 16:37:56 -0000
@@ -1095,7 +1095,7 @@
 	size_t s;
 
 	/* Allocate a header mbuf */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 	m->m_pkthdr.rcvif = ifp;
@@ -1109,7 +1109,7 @@
 	 */
 	if ((len + ETHER_ALIGN) > MHLEN) {
 		/* Attach an mbuf cluster */
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 
 		/* Insist on getting a cluster */
 		if ((m->m_flags & M_EXT) == 0) {
Index: src/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
===================================================================
RCS file: /home/ncvs/src/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c,v
retrieving revision 1.11
diff -u -r1.11 i4b_ihfc_l1if.c
--- src/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c	19 Feb 2003 05:47:23 -0000	1.11
+++ src/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c	21 Feb 2003 16:37:57 -0000
@@ -121,7 +121,7 @@
 
 	/* "Allow" I-frames (-hp) */
 
-	if (freeflag == MBUF_DONTFREE)	m = m_copypacket(m, M_DONTWAIT);
+	if (freeflag == MBUF_DONTFREE)	m = m_copypacket(m, MB_DONTWAIT);
 
 	if (!_IF_QFULL(&S_IFQUEUE) && m)
 	{
Index: src/sys/i4b/layer2/i4b_mbuf.c
===================================================================
RCS file: /home/ncvs/src/sys/i4b/layer2/i4b_mbuf.c,v
retrieving revision 1.15
diff -u -r1.15 i4b_mbuf.c
--- src/sys/i4b/layer2/i4b_mbuf.c	19 Feb 2003 05:47:24 -0000	1.15
+++ src/sys/i4b/layer2/i4b_mbuf.c	21 Feb 2003 16:37:57 -0000
@@ -78,7 +78,7 @@
 		return(NULL);
 	}
 
-	MGETHDR(m, M_DONTWAIT, MT_I4B_D);	/* get mbuf with pkthdr */
+	MGETHDR(m, MB_DONTWAIT, MT_I4B_D);	/* get mbuf with pkthdr */
 
 	/* did we actually get the mbuf ? */
 
@@ -94,7 +94,7 @@
 
 	if(len >= MHLEN)
 	{
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 
 		if(!(m->m_flags & M_EXT))
 		{
@@ -155,7 +155,7 @@
 		return(NULL);
 	}
 
-	MGETHDR(m, M_DONTWAIT, MT_I4B_B);	/* get mbuf with pkthdr */
+	MGETHDR(m, MB_DONTWAIT, MT_I4B_B);	/* get mbuf with pkthdr */
 
 	/* did we actually get the mbuf ? */
 
@@ -171,7 +171,7 @@
 
 	if(len >= MHLEN)
 	{
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 
 		if(!(m->m_flags & M_EXT))
 		{
Index: src/sys/kern/subr_mbuf.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/subr_mbuf.c,v
retrieving revision 1.40
diff -u -r1.40 subr_mbuf.c
--- src/sys/kern/subr_mbuf.c	20 Feb 2003 04:26:58 -0000	1.40
+++ src/sys/kern/subr_mbuf.c	21 Feb 2003 16:38:01 -0000
@@ -517,7 +517,7 @@
 		pcpu_cnt = MB_GET_PCPU_LIST_NUM(&mb_list_mbuf, i);
 		MB_LOCK_CONT(pcpu_cnt);
 		for (j = 0; j < NMB_MBUF_INIT; j++) {
-			if (mb_pop_cont(&mb_list_mbuf, M_DONTWAIT, pcpu_cnt)
+			if (mb_pop_cont(&mb_list_mbuf, MB_DONTWAIT, pcpu_cnt)
 			    == NULL)
 				goto bad;
 		}
@@ -526,7 +526,7 @@
 		pcpu_cnt = MB_GET_PCPU_LIST_NUM(&mb_list_clust, i);
 		MB_LOCK_CONT(pcpu_cnt);
 		for (j = 0; j < NMB_CLUST_INIT; j++) {
-			if (mb_pop_cont(&mb_list_clust, M_DONTWAIT, pcpu_cnt)
+			if (mb_pop_cont(&mb_list_clust, MB_DONTWAIT, pcpu_cnt)
 			    == NULL)
 				goto bad;
 		}
@@ -567,15 +567,15 @@
 
 	bucket = malloc(sizeof(struct mb_bucket) +
 	    mb_list->ml_objbucks * sizeof(void *), M_MBUF,
-	    how == M_TRYWAIT ? M_WAITOK : M_NOWAIT);
+	    how == MB_TRYWAIT ? M_WAITOK : M_NOWAIT);
 	if (bucket == NULL)
 		return (NULL);
 
 	p = (caddr_t)kmem_malloc(mb_list->ml_map, mb_list->ml_objsize * 
-	    mb_list->ml_objbucks, how == M_TRYWAIT ? M_WAITOK : M_NOWAIT);
+	    mb_list->ml_objbucks, how == MB_TRYWAIT ? M_WAITOK : M_NOWAIT);
 	if (p == NULL) {
 		free(bucket, M_MBUF);
-		if (how == M_TRYWAIT)
+		if (how == MB_TRYWAIT)
 			mb_list->ml_mapfull = 1;
 		return (NULL);
 	}
@@ -602,7 +602,7 @@
  * The general case is very easy.  Complications only arise if our PCPU
  * container is empty.  Things get worse if the PCPU container is empty,
  * the general container is empty, and we've run out of address space
- * in our map; then we try to block if we're willing to (M_TRYWAIT).
+ * in our map; then we try to block if we're willing to (MB_TRYWAIT).
  */
 static __inline
 void *
@@ -706,7 +706,7 @@
 				else
 					*pers_list=cnt_lst->mb_cont.mc_numowner;
 			} else {
-				if (how == M_TRYWAIT) {
+				if (how == MB_TRYWAIT) {
 					/*
 				 	 * Absolute worst-case scenario.
 					 * We block if we're willing to, but
@@ -740,7 +740,7 @@
 
 /*
  * This is the worst-case scenario called only if we're allocating with
- * M_TRYWAIT.  We first drain all the protocols, then try to find an mbuf
+ * MB_TRYWAIT.  We first drain all the protocols, then try to find an mbuf
  * by looking in every PCPU container.  If we're still unsuccesful, we
  * try the general container one last time and possibly block on our
  * starved cv.
@@ -1167,8 +1167,8 @@
  * Allocate and return a single (normal) mbuf.  NULL is returned on failure.
  *
  * Arguments:
- *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_DONTWAIT to never block.
+ *  - how: MB_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  MB_DONTWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
@@ -1195,8 +1195,8 @@
  *  - m: existing chain to which to append new chain (optional).
  *  - len: total length of data to append, either in mbufs or clusters
  *    (we allocate whatever combination yields the best fit).
- *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_DONTWAIT to never block.
+ *  - how: MB_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  MB_DONTWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
@@ -1285,8 +1285,8 @@
  * Allocate and return a single M_PKTHDR mbuf.  NULL is returned on failure.
  *
  * Arguments:
- *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_DONTWAIT to never block.
+ *  - how: MB_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  MB_DONTWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
@@ -1312,8 +1312,8 @@
  * returned on failure.
  *
  * Arguments:
- *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_DONTWAIT to never block.
+ *  - how: MB_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  MB_DONTWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
@@ -1334,8 +1334,8 @@
  * returned on failure.
  *
  * Arguments:
- *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_DONTWAIT to never block.
+ *  - how: MB_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  MB_DONTWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  */
 struct mbuf *
@@ -1458,8 +1458,8 @@
  * NULL on failure. 
  *
  * Arguments:
- *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_DONTWAIT to never block.
+ *  - how: MB_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  MB_DONTWAIT to never block.
  *  - type: the type of the mbuf being allocated.
  *  - flags: any flags to pass to the mbuf being allocated; if this includes
  *    the M_PKTHDR bit, then the mbuf is configured as a M_PKTHDR mbuf.
@@ -1510,8 +1510,8 @@
  *
  * Arguments:
  *  - mb: the existing mbuf to which to attach the allocated cluster.
- *  - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
- *    if really starved for memory.  M_DONTWAIT to never block.
+ *  - how: MB_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
+ *    if really starved for memory.  MB_DONTWAIT to never block.
  */
 void
 m_clget(struct mbuf *mb, int how)
Index: src/sys/kern/subr_mchain.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/subr_mchain.c,v
retrieving revision 1.14
diff -u -r1.14 subr_mchain.c
--- src/sys/kern/subr_mchain.c	19 Feb 2003 10:12:42 -0000	1.14
+++ src/sys/kern/subr_mchain.c	21 Feb 2003 16:38:01 -0000
@@ -58,7 +58,7 @@
 {
 	struct mbuf *m;
 
-	m = m_gethdr(M_TRYWAIT, MT_DATA);
+	m = m_gethdr(MB_TRYWAIT, MT_DATA);
 	if (m == NULL) 
 		return ENOBUFS;
 	m->m_len = 0;
@@ -115,7 +115,7 @@
 		panic("mb_reserve: size = %d\n", size);
 	m = mbp->mb_cur;
 	if (mbp->mb_mleft < size) {
-		mn = m_get(M_TRYWAIT, MT_DATA);
+		mn = m_get(MB_TRYWAIT, MT_DATA);
 		if (mn == NULL)
 			return NULL;
 		mbp->mb_cur = m->m_next = mn;
@@ -133,49 +133,49 @@
 int
 mb_put_uint8(struct mbchain *mbp, u_int8_t x)
 {
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MBC_MSYSTEM);
 }
 
 int
 mb_put_uint16be(struct mbchain *mbp, u_int16_t x)
 {
 	x = htobe16(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MBC_MSYSTEM);
 }
 
 int
 mb_put_uint16le(struct mbchain *mbp, u_int16_t x)
 {
 	x = htole16(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MBC_MSYSTEM);
 }
 
 int
 mb_put_uint32be(struct mbchain *mbp, u_int32_t x)
 {
 	x = htobe32(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MBC_MSYSTEM);
 }
 
 int
 mb_put_uint32le(struct mbchain *mbp, u_int32_t x)
 {
 	x = htole32(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MBC_MSYSTEM);
 }
 
 int
 mb_put_int64be(struct mbchain *mbp, int64_t x)
 {
 	x = htobe64(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MBC_MSYSTEM);
 }
 
 int
 mb_put_int64le(struct mbchain *mbp, int64_t x)
 {
 	x = htole64(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MBC_MSYSTEM);
 }
 
 int
@@ -192,7 +192,7 @@
 	while (size > 0) {
 		if (mleft == 0) {
 			if (m->m_next == NULL) {
-				m = m_getm(m, size, M_TRYWAIT, MT_DATA);
+				m = m_getm(m, size, MB_TRYWAIT, MT_DATA);
 				if (m == NULL)
 					return ENOBUFS;
 			} else
@@ -203,24 +203,24 @@
 		cplen = mleft > size ? size : mleft;
 		dst = mtod(m, caddr_t) + m->m_len;
 		switch (type) {
-		    case MB_MCUSTOM:
+		    case MBC_MCUSTOM:
 			error = mbp->mb_copy(mbp, source, dst, cplen);
 			if (error)
 				return error;
 			break;
-		    case MB_MINLINE:
+		    case MBC_MINLINE:
 			for (src = source, count = cplen; count; count--)
 				*dst++ = *src++;
 			break;
-		    case MB_MSYSTEM:
+		    case MBC_MSYSTEM:
 			bcopy(source, dst, cplen);
 			break;
-		    case MB_MUSER:
+		    case MBC_MUSER:
 			error = copyin(source, dst, cplen);
 			if (error)
 				return error;
 			break;
-		    case MB_MZERO:
+		    case MBC_MZERO:
 			bzero(dst, cplen);
 			break;
 		}
@@ -259,7 +259,7 @@
 	long left;
 	int mtype, error;
 
-	mtype = (uiop->uio_segflg == UIO_SYSSPACE) ? MB_MSYSTEM : MB_MUSER;
+	mtype = (uiop->uio_segflg == UIO_SYSSPACE) ? MBC_MSYSTEM : MBC_MUSER;
 
 	while (size > 0 && uiop->uio_resid) {
 		if (uiop->uio_iovcnt <= 0 || uiop->uio_iov == NULL)
@@ -293,7 +293,7 @@
 {
 	struct mbuf *m;
 
-	m = m_gethdr(M_TRYWAIT, MT_DATA);
+	m = m_gethdr(MB_TRYWAIT, MT_DATA);
 	if (m == NULL) 
 		return ENOBUFS;
 	m->m_len = 0;
@@ -360,13 +360,13 @@
 int
 md_get_uint8(struct mdchain *mdp, u_int8_t *x)
 {
-	return md_get_mem(mdp, x, 1, MB_MINLINE);
+	return md_get_mem(mdp, x, 1, MBC_MINLINE);
 }
 
 int
 md_get_uint16(struct mdchain *mdp, u_int16_t *x)
 {
-	return md_get_mem(mdp, (caddr_t)x, 2, MB_MINLINE);
+	return md_get_mem(mdp, (caddr_t)x, 2, MBC_MINLINE);
 }
 
 int
@@ -393,7 +393,7 @@
 int
 md_get_uint32(struct mdchain *mdp, u_int32_t *x)
 {
-	return md_get_mem(mdp, (caddr_t)x, 4, MB_MINLINE);
+	return md_get_mem(mdp, (caddr_t)x, 4, MBC_MINLINE);
 }
 
 int
@@ -423,7 +423,7 @@
 int
 md_get_int64(struct mdchain *mdp, int64_t *x)
 {
-	return md_get_mem(mdp, (caddr_t)x, 8, MB_MINLINE);
+	return md_get_mem(mdp, (caddr_t)x, 8, MBC_MINLINE);
 }
 
 int
@@ -478,15 +478,15 @@
 		if (target == NULL)
 			continue;
 		switch (type) {
-		    case MB_MUSER:
+		    case MBC_MUSER:
 			error = copyout(s, target, count);
 			if (error)
 				return error;
 			break;
-		    case MB_MSYSTEM:
+		    case MBC_MSYSTEM:
 			bcopy(s, target, count);
 			break;
-		    case MB_MINLINE:
+		    case MBC_MINLINE:
 			while (count--)
 				*target++ = *s++;
 			continue;
@@ -501,10 +501,10 @@
 {
 	struct mbuf *m = mdp->md_cur, *rm;
 
-	rm = m_copym(m, mdp->md_pos - mtod(m, u_char*), size, M_TRYWAIT);
+	rm = m_copym(m, mdp->md_pos - mtod(m, u_char*), size, MB_TRYWAIT);
 	if (rm == NULL)
 		return EBADRPC;
-	md_get_mem(mdp, NULL, size, MB_MZERO);
+	md_get_mem(mdp, NULL, size, MBC_MZERO);
 	*ret = rm;
 	return 0;
 }
@@ -516,7 +516,7 @@
 	long left;
 	int mtype, error;
 
-	mtype = (uiop->uio_segflg == UIO_SYSSPACE) ? MB_MSYSTEM : MB_MUSER;
+	mtype = (uiop->uio_segflg == UIO_SYSSPACE) ? MBC_MSYSTEM : MBC_MUSER;
 	while (size > 0 && uiop->uio_resid) {
 		if (uiop->uio_iovcnt <= 0 || uiop->uio_iov == NULL)
 			return EFBIG;
Index: src/sys/kern/uipc_mbuf.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/uipc_mbuf.c,v
retrieving revision 1.109
diff -u -r1.109 uipc_mbuf.c
--- src/sys/kern/uipc_mbuf.c	19 Feb 2003 05:47:26 -0000	1.109
+++ src/sys/kern/uipc_mbuf.c	21 Feb 2003 16:38:02 -0000
@@ -164,7 +164,7 @@
 /*
  * Make a copy of an mbuf chain starting "off0" bytes from the beginning,
  * continuing for "len" bytes.  If len is M_COPYALL, copy to end of mbuf.
- * The wait parameter is a choice of M_TRYWAIT/M_DONTWAIT from caller.
+ * The wait parameter is a choice of MB_TRYWAIT/MB_DONTWAIT from caller.
  * Note that the copy is read-only, because clusters are not copied,
  * only their reference counts are incremented.
  */
@@ -522,7 +522,7 @@
 	} else {
 		if (len > MHLEN)
 			goto bad;
-		MGET(m, M_DONTWAIT, n->m_type);
+		MGET(m, MB_DONTWAIT, n->m_type);
 		if (m == NULL)
 			goto bad;
 		m->m_len = 0;
@@ -639,7 +639,7 @@
 	if (off < 0 || off > MHLEN)
 		return (NULL);
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return (NULL);
 	m->m_pkthdr.rcvif = ifp;
@@ -648,7 +648,7 @@
 
 	while (totlen > 0) {
 		if (top) {
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, MB_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				m_freem(top);
 				return (NULL);
@@ -656,7 +656,7 @@
 			len = MLEN;
 		}
 		if (totlen + off >= MINCLSIZE) {
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, MB_DONTWAIT);
 			if (m->m_flags & M_EXT)
 				len = MCLBYTES;
 		} else {
@@ -704,7 +704,7 @@
 		off -= mlen;
 		totlen += mlen;
 		if (m->m_next == NULL) {
-			n = m_get_clrd(M_DONTWAIT, m->m_type);
+			n = m_get_clrd(MB_DONTWAIT, m->m_type);
 			if (n == NULL)
 				goto out;
 			n->m_len = min(MLEN, len + off);
@@ -723,7 +723,7 @@
 		if (len == 0)
 			break;
 		if (m->m_next == NULL) {
-			n = m_get(M_DONTWAIT, m->m_type);
+			n = m_get(MB_DONTWAIT, m->m_type);
 			if (n == NULL)
 				break;
 			n->m_len = min(MLEN, len);
Index: src/sys/kern/uipc_mbuf2.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/uipc_mbuf2.c,v
retrieving revision 1.18
diff -u -r1.18 uipc_mbuf2.c
--- src/sys/kern/uipc_mbuf2.c	19 Feb 2003 05:47:26 -0000	1.18
+++ src/sys/kern/uipc_mbuf2.c	21 Feb 2003 16:38:02 -0000
@@ -171,7 +171,7 @@
 	 * chop the current mbuf into two pieces, set off to 0.
 	 */
 	if (len <= n->m_len - off) {
-		o = m_dup1(n, off, n->m_len - off, M_DONTWAIT);
+		o = m_dup1(n, off, n->m_len - off, MB_DONTWAIT);
 		if (o == NULL) {
 			m_freem(m);
 			return NULL;	/* ENOBUFS */
@@ -230,9 +230,9 @@
 	 * now, we need to do the hard way.  don't m_copy as there's no room
 	 * on both end.
 	 */
-	MGET(o, M_DONTWAIT, m->m_type);
+	MGET(o, MB_DONTWAIT, m->m_type);
 	if (o && len > MLEN) {
-		MCLGET(o, M_DONTWAIT);
+		MCLGET(o, MB_DONTWAIT);
 		if ((o->m_flags & M_EXT) == 0) {
 			m_free(o);
 			o = NULL;
Index: src/sys/kern/uipc_socket.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/uipc_socket.c,v
retrieving revision 1.146
diff -u -r1.146 uipc_socket.c
--- src/sys/kern/uipc_socket.c	20 Feb 2003 03:26:11 -0000	1.146
+++ src/sys/kern/uipc_socket.c	21 Feb 2003 16:38:05 -0000
@@ -625,7 +625,7 @@
 			cow_send = 0;
 #endif /* ZERO_COPY_SOCKETS */
 			if (top == 0) {
-				MGETHDR(m, M_TRYWAIT, MT_DATA);
+				MGETHDR(m, MB_TRYWAIT, MT_DATA);
 				if (m == NULL) {
 					error = ENOBUFS;
 					goto release;
@@ -634,7 +634,7 @@
 				m->m_pkthdr.len = 0;
 				m->m_pkthdr.rcvif = (struct ifnet *)0;
 			} else {
-				MGET(m, M_TRYWAIT, MT_DATA);
+				MGET(m, MB_TRYWAIT, MT_DATA);
 				if (m == NULL) {
 					error = ENOBUFS;
 					goto release;
@@ -656,7 +656,7 @@
 				} 
 				if (!cow_send){
 #endif /* ZERO_COPY_SOCKETS */
-				MCLGET(m, M_TRYWAIT);
+				MCLGET(m, MB_TRYWAIT);
 				if ((m->m_flags & M_EXT) == 0)
 					goto nopages;
 				mlen = MCLBYTES;
@@ -787,7 +787,7 @@
 	else
 		flags = 0;
 	if (flags & MSG_OOB) {
-		m = m_get(M_TRYWAIT, MT_DATA);
+		m = m_get(MB_TRYWAIT, MT_DATA);
 		if (m == NULL)
 			return (ENOBUFS);
 		error = (*pr->pr_usrreqs->pru_rcvoob)(so, m, flags & MSG_PEEK);
@@ -1024,7 +1024,7 @@
 				moff += len;
 			else {
 				if (mp)
-					*mp = m_copym(m, 0, len, M_TRYWAIT);
+					*mp = m_copym(m, 0, len, MB_TRYWAIT);
 				m->m_data += len;
 				m->m_len -= len;
 				so->so_rcv.sb_cc -= len;
@@ -1580,11 +1580,11 @@
 	struct mbuf *m, *m_prev;
 	int sopt_size = sopt->sopt_valsize;
 
-	MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_DATA);
+	MGET(m, sopt->sopt_td ? MB_TRYWAIT : MB_DONTWAIT, MT_DATA);
 	if (m == 0)
 		return ENOBUFS;
 	if (sopt_size > MLEN) {
-		MCLGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT);
+		MCLGET(m, sopt->sopt_td ? MB_TRYWAIT : MB_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			return ENOBUFS;
@@ -1598,13 +1598,13 @@
 	m_prev = m;
 
 	while (sopt_size) {
-		MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_DATA);
+		MGET(m, sopt->sopt_td ? MB_TRYWAIT : MB_DONTWAIT, MT_DATA);
 		if (m == 0) {
 			m_freem(*mp);
 			return ENOBUFS;
 		}
 		if (sopt_size > MLEN) {
-			MCLGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT);
+			MCLGET(m, sopt->sopt_td ? MB_TRYWAIT : MB_DONTWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_freem(*mp);
 				return ENOBUFS;
Index: src/sys/kern/uipc_socket2.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/uipc_socket2.c,v
retrieving revision 1.110
diff -u -r1.110 uipc_socket2.c
--- src/sys/kern/uipc_socket2.c	19 Feb 2003 05:47:26 -0000	1.110
+++ src/sys/kern/uipc_socket2.c	21 Feb 2003 16:38:06 -0000
@@ -315,7 +315,7 @@
 	if ((so->so_state & SS_ASYNC) && so->so_sigio != NULL)
 		pgsigio(&so->so_sigio, SIGIO, 0);
 	if (sb->sb_flags & SB_UPCALL)
-		(*so->so_upcall)(so, so->so_upcallarg, M_DONTWAIT);
+		(*so->so_upcall)(so, so->so_upcallarg, MB_DONTWAIT);
 	if (sb->sb_flags & SB_AIO)
 		aio_swake(so, sb);
 	KNOTE(&sb->sb_sel.si_note, 0);
@@ -626,7 +626,7 @@
 		return (0);
 	if (asa->sa_len > MLEN)
 		return (0);
-	MGET(m, M_DONTWAIT, MT_SONAME);
+	MGET(m, MB_DONTWAIT, MT_SONAME);
 	if (m == 0)
 		return (0);
 	m->m_len = asa->sa_len;
@@ -833,10 +833,10 @@
 
 	if (CMSG_SPACE((u_int)size) > MCLBYTES)
 		return ((struct mbuf *) NULL);
-	if ((m = m_get(M_DONTWAIT, MT_CONTROL)) == NULL)
+	if ((m = m_get(MB_DONTWAIT, MT_CONTROL)) == NULL)
 		return ((struct mbuf *) NULL);
 	if (CMSG_SPACE((u_int)size) > MLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			return ((struct mbuf *) NULL);
Index: src/sys/kern/uipc_syscalls.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/uipc_syscalls.c,v
retrieving revision 1.140
diff -u -r1.140 uipc_syscalls.c
--- src/sys/kern/uipc_syscalls.c	20 Feb 2003 03:26:11 -0000	1.140
+++ src/sys/kern/uipc_syscalls.c	21 Feb 2003 16:38:08 -0000
@@ -672,7 +672,7 @@
 		if (mp->msg_flags == MSG_COMPAT) {
 			register struct cmsghdr *cm;
 
-			M_PREPEND(control, sizeof(*cm), M_TRYWAIT);
+			M_PREPEND(control, sizeof(*cm), MB_TRYWAIT);
 			if (control == 0) {
 				error = ENOBUFS;
 				goto bad;
@@ -1556,7 +1556,7 @@
 #endif
 		return (EINVAL);
 	}
-	m = m_get(M_TRYWAIT, type);
+	m = m_get(MB_TRYWAIT, type);
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_len = buflen;
@@ -1947,7 +1947,7 @@
 		/*
 		 * Get an mbuf header and set it up as having external storage.
 		 */
-		MGETHDR(m, M_TRYWAIT, MT_DATA);
+		MGETHDR(m, MB_TRYWAIT, MT_DATA);
 		if (m == NULL) {
 			error = ENOBUFS;
 			sf_buf_free((void *)sf->kva, NULL);
Index: src/sys/net/bpf.c
===================================================================
RCS file: /home/ncvs/src/sys/net/bpf.c,v
retrieving revision 1.106
diff -u -r1.106 bpf.c
--- src/sys/net/bpf.c	19 Feb 2003 05:47:28 -0000	1.106
+++ src/sys/net/bpf.c	21 Feb 2003 16:38:12 -0000
@@ -207,9 +207,9 @@
 		return (EIO);
 
 	if (len > MHLEN) {
-		m = m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR);
+		m = m_getcl(MB_TRYWAIT, MT_DATA, M_PKTHDR);
 	} else {
-		MGETHDR(m, M_TRYWAIT, MT_DATA);
+		MGETHDR(m, MB_TRYWAIT, MT_DATA);
 	}
 	if (m == NULL)
 		return (ENOBUFS);
Index: src/sys/net/bpf_compat.h
===================================================================
RCS file: /home/ncvs/src/sys/net/bpf_compat.h,v
retrieving revision 1.11
diff -u -r1.11 bpf_compat.h
--- src/sys/net/bpf_compat.h	19 Feb 2003 05:47:28 -0000	1.11
+++ src/sys/net/bpf_compat.h	21 Feb 2003 16:38:13 -0000
@@ -45,7 +45,7 @@
  * a fixed offset from the associated mbuf.  Sorry for this kludge.
  */
 #define malloc(size, type, canwait)				\
-bpf_alloc(size, (canwait & M_NOWAIT) ? M_DONTWAIT : M_TRYWAIT)
+bpf_alloc(size, (canwait & M_NOWAIT) ? MB_DONTWAIT : MB_TRYWAIT)
 
 #define free(cp, type) m_free(*(struct mbuf **)(cp - 8))
 
Index: src/sys/net/bridge.c
===================================================================
RCS file: /home/ncvs/src/sys/net/bridge.c,v
retrieving revision 1.67
diff -u -r1.67 bridge.c
--- src/sys/net/bridge.c	19 Feb 2003 05:47:28 -0000	1.67
+++ src/sys/net/bridge.c	21 Feb 2003 16:38:14 -0000
@@ -799,7 +799,7 @@
 bdg_forward(struct mbuf *m0, struct ifnet *dst)
 {
 #define	EH_RESTORE(_m) do {						   \
-    M_PREPEND((_m), ETHER_HDR_LEN, M_DONTWAIT);			   	   \
+    M_PREPEND((_m), ETHER_HDR_LEN, MB_DONTWAIT);			   	   \
     if ((_m) == NULL) {							   \
 	bdg_dropped++;							   \
 	return NULL;							   \
@@ -976,7 +976,7 @@
 	    struct mbuf *m ;
 
 	    if (shared) {
-		m = m_copypacket(m0, M_DONTWAIT);
+		m = m_copypacket(m0, MB_DONTWAIT);
 		if (m == NULL) {	/* copy failed, give up */
 		    bdg_dropped++;
 		    return NULL;
@@ -1042,7 +1042,7 @@
 		m = m0 ;
 		m0 = NULL ; /* original is gone */
 	    } else {
-		m = m_copypacket(m0, M_DONTWAIT);
+		m = m_copypacket(m0, MB_DONTWAIT);
 		if (m == NULL) {
 		    IFNET_RUNLOCK();
 		    printf("bdg_forward: sorry, m_copypacket failed!\n");
Index: src/sys/net/bsd_comp.c
===================================================================
RCS file: /home/ncvs/src/sys/net/bsd_comp.c,v
retrieving revision 1.20
diff -u -r1.20 bsd_comp.c
--- src/sys/net/bsd_comp.c	19 Feb 2003 05:47:28 -0000	1.20
+++ src/sys/net/bsd_comp.c	21 Feb 2003 16:38:15 -0000
@@ -496,12 +496,12 @@
 	*wptr++ = (v);					\
 	if (wptr >= cp_end) {				\
 	    m->m_len = wptr - mtod(m, u_char *);	\
-	    MGET(m->m_next, M_DONTWAIT, MT_DATA);	\
+	    MGET(m->m_next, MB_DONTWAIT, MT_DATA);	\
 	    m = m->m_next;				\
 	    if (m) {					\
 		m->m_len = 0;				\
 		if (maxolen - olen > MLEN)		\
-		    MCLGET(m, M_DONTWAIT);		\
+		    MCLGET(m, MB_DONTWAIT);		\
 		wptr = mtod(m, u_char *);		\
 		cp_end = wptr + M_TRAILINGSPACE(m);	\
 	    } else					\
@@ -538,12 +538,12 @@
 	maxolen = slen;
 
     /* Allocate one mbuf to start with. */
-    MGET(m, M_DONTWAIT, MT_DATA);
+    MGET(m, MB_DONTWAIT, MT_DATA);
     *mret = m;
     if (m != NULL) {
 	m->m_len = 0;
 	if (maxolen + db->hdrlen > MLEN)
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, MB_DONTWAIT);
 	m->m_data += db->hdrlen;
 	wptr = mtod(m, u_char *);
 	cp_end = wptr + M_TRAILINGSPACE(m);
@@ -872,13 +872,13 @@
     /*
      * Allocate one mbuf to start with.
      */
-    MGETHDR(dmp, M_DONTWAIT, MT_DATA);
+    MGETHDR(dmp, MB_DONTWAIT, MT_DATA);
     if (dmp == NULL)
 	return DECOMP_ERROR;
     mret = dmp;
     dmp->m_len = 0;
     dmp->m_next = NULL;
-    MCLGET(dmp, M_DONTWAIT);
+    MCLGET(dmp, MB_DONTWAIT);
     dmp->m_data += db->hdrlen;
     wptr = mtod(dmp, u_char *);
     space = M_TRAILINGSPACE(dmp) - PPP_HDRLEN + 1;
@@ -987,7 +987,7 @@
 	 */
 	if ((space -= codelen + extra) < 0) {
 	    dmp->m_len = wptr - mtod(dmp, u_char *);
-	    MGET(m, M_DONTWAIT, MT_DATA);
+	    MGET(m, MB_DONTWAIT, MT_DATA);
 	    if (m == NULL) {
 		m_freem(mret);
 		return DECOMP_ERROR;
@@ -995,7 +995,7 @@
 	    m->m_len = 0;
 	    m->m_next = NULL;
 	    dmp->m_next = m;
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, MB_DONTWAIT);
 	    space = M_TRAILINGSPACE(m) - (codelen + extra);
 	    if (space < 0) {
 		/* now that's what I call *compression*. */
Index: src/sys/net/if_arcsubr.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_arcsubr.c,v
retrieving revision 1.11
diff -u -r1.11 if_arcsubr.c
--- src/sys/net/if_arcsubr.c	19 Feb 2003 05:47:28 -0000	1.11
+++ src/sys/net/if_arcsubr.c	21 Feb 2003 16:38:17 -0000
@@ -212,7 +212,7 @@
 	}
 
 	isphds = arc_isphds(atype);
-	M_PREPEND(m, isphds ? ARC_HDRNEWLEN : ARC_HDRLEN, M_DONTWAIT);
+	M_PREPEND(m, isphds ? ARC_HDRNEWLEN : ARC_HDRLEN, MB_DONTWAIT);
 	if (m == 0)
 		senderr(ENOBUFS);
 	ah = mtod(m, struct arc_header *);
@@ -297,13 +297,13 @@
 	/* split out next fragment and return it */
 	if (ac->sflag < ac->fsflag) {
 		/* we CAN'T have short packets here */
-		ac->curr_frag = m_split(m, ARC_MAX_DATA, M_DONTWAIT);
+		ac->curr_frag = m_split(m, ARC_MAX_DATA, MB_DONTWAIT);
 		if (ac->curr_frag == 0) {
 			m_freem(m);
 			return 0;
 		}
 
-		M_PREPEND(m, ARC_HDRNEWLEN, M_DONTWAIT);
+		M_PREPEND(m, ARC_HDRNEWLEN, MB_DONTWAIT);
 		if (m == 0) {
 			m_freem(ac->curr_frag);
 			ac->curr_frag = 0;
@@ -322,7 +322,7 @@
 	    ARC_MAX_FORBID_LEN - ARC_HDRNEWLEN + 2)) {
 		ac->curr_frag = 0;
 
-		M_PREPEND(m, ARC_HDRNEWLEN_EXC, M_DONTWAIT);
+		M_PREPEND(m, ARC_HDRNEWLEN_EXC, MB_DONTWAIT);
 		if (m == 0)
 			return 0;
 
@@ -335,7 +335,7 @@
 	} else {
 		ac->curr_frag = 0;
 
-		M_PREPEND(m, ARC_HDRNEWLEN, M_DONTWAIT);
+		M_PREPEND(m, ARC_HDRNEWLEN, MB_DONTWAIT);
 		if (m == 0)
 			return 0;
 
Index: src/sys/net/if_atmsubr.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_atmsubr.c,v
retrieving revision 1.20
diff -u -r1.20 if_atmsubr.c
--- src/sys/net/if_atmsubr.c	19 Feb 2003 05:47:28 -0000	1.20
+++ src/sys/net/if_atmsubr.c	21 Feb 2003 16:38:17 -0000
@@ -189,7 +189,7 @@
 		sz = sizeof(atmdst);
 		atm_flags = ATM_PH_FLAGS(&atmdst);
 		if (atm_flags & ATM_PH_LLCSNAP) sz += 8; /* sizeof snap == 8 */
-		M_PREPEND(m, sz, M_DONTWAIT);
+		M_PREPEND(m, sz, MB_DONTWAIT);
 		if (m == 0)
 			senderr(ENOBUFS);
 		ad = mtod(m, struct atm_pseudohdr *);
Index: src/sys/net/if_ef.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_ef.c,v
retrieving revision 1.22
diff -u -r1.22 if_ef.c
--- src/sys/net/if_ef.c	19 Feb 2003 05:47:28 -0000	1.22
+++ src/sys/net/if_ef.c	21 Feb 2003 16:38:18 -0000
@@ -430,7 +430,7 @@
 		type = htons(m->m_pkthdr.len);
 		break;
 	    case ETHER_FT_8022:
-		M_PREPEND(m, ETHER_HDR_LEN + 3, M_TRYWAIT);
+		M_PREPEND(m, ETHER_HDR_LEN + 3, MB_TRYWAIT);
 		if (m == NULL) {
 			*mp = NULL;
 			return ENOBUFS;
@@ -453,7 +453,7 @@
 		*hlen += 3;
 		break;
 	    case ETHER_FT_SNAP:
-		M_PREPEND(m, 8, M_TRYWAIT);
+		M_PREPEND(m, 8, MB_TRYWAIT);
 		if (m == NULL) {
 			*mp = NULL;
 			return ENOBUFS;
Index: src/sys/net/if_ethersubr.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_ethersubr.c,v
retrieving revision 1.135
diff -u -r1.135 if_ethersubr.c
--- src/sys/net/if_ethersubr.c	19 Feb 2003 05:47:28 -0000	1.135
+++ src/sys/net/if_ethersubr.c	21 Feb 2003 16:38:19 -0000
@@ -236,7 +236,7 @@
 	    if ( aa->aa_flags & AFA_PHASE2 ) {
 		struct llc llc;
 
-		M_PREPEND(m, sizeof(struct llc), M_TRYWAIT);
+		M_PREPEND(m, sizeof(struct llc), MB_TRYWAIT);
 		llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP;
 		llc.llc_control = LLC_UI;
 		bcopy(at_org_code, llc.llc_snap_org_code, sizeof(at_org_code));
@@ -261,7 +261,7 @@
 			type = htons( m->m_pkthdr.len);
 			break;
 		case 0xe0e0: /* Novell 802.2 and Token-Ring */
-			M_PREPEND(m, 3, M_TRYWAIT);
+			M_PREPEND(m, 3, MB_TRYWAIT);
 			type = htons( m->m_pkthdr.len);
 			cp = mtod(m, u_char *);
 			*cp++ = 0xE0;
@@ -312,7 +312,7 @@
 	 * Add local net header.  If no space in first mbuf,
 	 * allocate another.
 	 */
-	M_PREPEND(m, sizeof (struct ether_header), M_DONTWAIT);
+	M_PREPEND(m, sizeof (struct ether_header), MB_DONTWAIT);
 	if (m == 0)
 		senderr(ENOBUFS);
 	eh = mtod(m, struct ether_header *);
@@ -470,7 +470,7 @@
 		 * Restore Ethernet header, as needed, in case the
 		 * mbuf chain was replaced by ipfw.
 		 */
-		M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT);
+		M_PREPEND(m, ETHER_HDR_LEN, MB_DONTWAIT);
 		if (m == NULL) {
 			*m0 = m;
 			return 0;
@@ -494,7 +494,7 @@
 		 * If shared, make a copy and keep the original.
 		 */
 		if (shared) {
-			m = m_copypacket(m, M_DONTWAIT);
+			m = m_copypacket(m, MB_DONTWAIT);
 			if (m == NULL)
 				return 0;
 		} else {
@@ -893,7 +893,7 @@
 		 * Put back the ethernet header so netgraph has a
 		 * consistent view of inbound packets.
 		 */
-		M_PREPEND(m, sizeof (struct ether_header), M_DONTWAIT);
+		M_PREPEND(m, sizeof (struct ether_header), MB_DONTWAIT);
 		(*ng_ether_input_orphan_p)(ifp, m);
 		return;
 	}
Index: src/sys/net/if_fddisubr.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_fddisubr.c,v
retrieving revision 1.74
diff -u -r1.74 if_fddisubr.c
--- src/sys/net/if_fddisubr.c	19 Feb 2003 05:47:28 -0000	1.74
+++ src/sys/net/if_fddisubr.c	21 Feb 2003 16:38:20 -0000
@@ -203,7 +203,7 @@
 	    if (aa->aa_flags & AFA_PHASE2) {
 		struct llc llc;
 
-		M_PREPEND(m, LLC_SNAPFRAMELEN, M_TRYWAIT);
+		M_PREPEND(m, LLC_SNAPFRAMELEN, MB_TRYWAIT);
 		if (m == 0)
 			senderr(ENOBUFS);
 		llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP;
@@ -290,7 +290,7 @@
 	 */
 	if (type != 0) {
 		struct llc *l;
-		M_PREPEND(m, LLC_SNAPFRAMELEN, M_DONTWAIT);
+		M_PREPEND(m, LLC_SNAPFRAMELEN, MB_DONTWAIT);
 		if (m == 0)
 			senderr(ENOBUFS);
 		l = mtod(m, struct llc *);
@@ -305,7 +305,7 @@
 	 * Add local net header.  If no space in first mbuf,
 	 * allocate another.
 	 */
-	M_PREPEND(m, FDDI_HDR_LEN, M_DONTWAIT);
+	M_PREPEND(m, FDDI_HDR_LEN, MB_DONTWAIT);
 	if (m == 0)
 		senderr(ENOBUFS);
 	fh = mtod(m, struct fddi_header *);
Index: src/sys/net/if_gre.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_gre.c,v
retrieving revision 1.11
diff -u -r1.11 if_gre.c
--- src/sys/net/if_gre.c	19 Feb 2003 05:47:29 -0000	1.11
+++ src/sys/net/if_gre.c	21 Feb 2003 16:38:21 -0000
@@ -294,7 +294,7 @@
 
 			if ((m->m_data - msiz) < m->m_pktdat) {
 				/* need new mbuf */
-				MGETHDR(m0, M_DONTWAIT, MT_HEADER);
+				MGETHDR(m0, MB_DONTWAIT, MT_HEADER);
 				if (m0 == NULL) {
 					_IF_DROP(&ifp->if_snd);
 					m_freem(m);
@@ -348,7 +348,7 @@
 			error = EAFNOSUPPORT;
 			goto end;
 		}
-		M_PREPEND(m, sizeof(struct greip), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct greip), MB_DONTWAIT);
 	} else {
 		_IF_DROP(&ifp->if_snd);
 		m_freem(m);
Index: src/sys/net/if_ieee80211subr.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_ieee80211subr.c,v
retrieving revision 1.5
diff -u -r1.5 if_ieee80211subr.c
--- src/sys/net/if_ieee80211subr.c	19 Feb 2003 05:47:29 -0000	1.5
+++ src/sys/net/if_ieee80211subr.c	21 Feb 2003 16:38:26 -0000
@@ -406,7 +406,7 @@
 		if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
 			eh = mtod(m, struct ether_header *);
 			if (ETHER_IS_MULTICAST(eh->ether_dhost)) {
-				m1 = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
+				m1 = m_copym(m, 0, M_COPYALL, MB_DONTWAIT);
 				if (m1 == NULL)
 					ifp->if_oerrors++;
 				else
@@ -517,7 +517,7 @@
 	if (ni == NULL)
 		ni = &ic->ic_bss;
 	ni->ni_inact = 0;
-	M_PREPEND(m, sizeof(struct ieee80211_frame), M_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ieee80211_frame), MB_DONTWAIT);
 	if (m == NULL)
 		return ENOMEM;
 	wh = mtod(m, struct ieee80211_frame *);
@@ -585,7 +585,7 @@
 	llc->llc_snap.org_code[1] = 0;
 	llc->llc_snap.org_code[2] = 0;
 	llc->llc_snap.ether_type = eh.ether_type;
-	M_PREPEND(m, sizeof(struct ieee80211_frame), M_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ieee80211_frame), MB_DONTWAIT);
 	if (m == NULL)
 		return NULL;
 	wh = mtod(m, struct ieee80211_frame *);
@@ -671,7 +671,7 @@
 		pktlen = m->m_pkthdr.len;
 		while (pktlen > off) {
 			if (n0 == NULL) {
-				MGETHDR(n, M_DONTWAIT, MT_DATA);
+				MGETHDR(n, MB_DONTWAIT, MT_DATA);
 				if (n == NULL) {
 					m_freem(m);
 					return NULL;
@@ -679,7 +679,7 @@
 				M_MOVE_PKTHDR(n, m);
 				n->m_len = MHLEN;
 			} else {
-				MGET(n, M_DONTWAIT, MT_DATA);
+				MGET(n, MB_DONTWAIT, MT_DATA);
 				if (n == NULL) {
 					m_freem(m);
 					m_freem(n0);
@@ -688,7 +688,7 @@
 				n->m_len = MLEN;
 			}
 			if (pktlen - off >= MINCLSIZE) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, MB_DONTWAIT);
 				if (n->m_flags & M_EXT)
 					n->m_len = n->m_ext.ext_size;
 			}
@@ -1407,7 +1407,7 @@
 	 *	[tlv] ssid
 	 *	[tlv] supported rates
 	 */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	m->m_data += sizeof(struct ieee80211_frame);
@@ -1450,7 +1450,7 @@
 	 *	[tlv] supported rates
 	 *	[tlv] parameter set (IBSS)
 	 */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	m->m_data += sizeof(struct ieee80211_frame);
@@ -1503,7 +1503,7 @@
 	u_int16_t *frm;
 	int ret;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	MH_ALIGN(m, 2 * 3);
@@ -1529,7 +1529,7 @@
 	if (ifp->if_flags & IFF_DEBUG)
 		if_printf(ifp, "station %s deauthenticate (reason %d)\n",
 		    ether_sprintf(ni->ni_macaddr), reason);
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	MH_ALIGN(m, 2);
@@ -1555,7 +1555,7 @@
 	 *	[tlv] ssid
 	 *	[tlv] supported rates
 	 */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	m->m_data += sizeof(struct ieee80211_frame);
@@ -1613,7 +1613,7 @@
 	 *	[2] association ID
 	 *	[tlv] supported rates
 	 */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	m->m_data += sizeof(struct ieee80211_frame);
@@ -1659,7 +1659,7 @@
 	if (ifp->if_flags & IFF_DEBUG)
 		if_printf(ifp, "station %s disassociate (reason %d)\n",
 		    ether_sprintf(ni->ni_macaddr), reason);
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 	MH_ALIGN(m, 2);
@@ -2476,7 +2476,7 @@
 	}
 	m = m0;
 	left = m->m_pkthdr.len;
-	MGET(n, M_DONTWAIT, m->m_type);
+	MGET(n, MB_DONTWAIT, m->m_type);
 	n0 = n;
 	if (n == NULL)
 		goto fail;
@@ -2490,7 +2490,7 @@
 	}
 	n->m_len = MHLEN;
 	if (n->m_pkthdr.len >= MINCLSIZE) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, MB_DONTWAIT);
 		if (n->m_flags & M_EXT)
 			n->m_len = n->m_ext.ext_size;
 	}
@@ -2544,13 +2544,13 @@
 		if (len > n->m_len - noff) {
 			len = n->m_len - noff;
 			if (len == 0) {
-				MGET(n->m_next, M_DONTWAIT, n->m_type);
+				MGET(n->m_next, MB_DONTWAIT, n->m_type);
 				if (n->m_next == NULL)
 					goto fail;
 				n = n->m_next;
 				n->m_len = MLEN;
 				if (left >= MINCLSIZE) {
-					MCLGET(n, M_DONTWAIT);
+					MCLGET(n, MB_DONTWAIT);
 					if (n->m_flags & M_EXT)
 						n->m_len = n->m_ext.ext_size;
 				}
@@ -2579,7 +2579,7 @@
 			n->m_len = noff + sizeof(crcbuf);
 		else {
 			n->m_len = noff;
-			MGET(n->m_next, M_DONTWAIT, n->m_type);
+			MGET(n->m_next, MB_DONTWAIT, n->m_type);
 			if (n->m_next == NULL)
 				goto fail;
 			n = n->m_next;
Index: src/sys/net/if_iso88025subr.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_iso88025subr.c,v
retrieving revision 1.26
diff -u -r1.26 if_iso88025subr.c
--- src/sys/net/if_iso88025subr.c	19 Feb 2003 05:47:29 -0000	1.26
+++ src/sys/net/if_iso88025subr.c	21 Feb 2003 16:38:27 -0000
@@ -299,7 +299,7 @@
 		bcopy((caddr_t)&(satoipx_addr(dst).x_host), (caddr_t)edst,
 			sizeof (edst));
 
-		M_PREPEND(m, 3, M_TRYWAIT);
+		M_PREPEND(m, 3, MB_TRYWAIT);
 		if (m == 0)
 			senderr(ENOBUFS);
 		m = m_pullup(m, 3);
@@ -342,7 +342,7 @@
 
 	if (snap_type != 0) {
         	struct llc *l;
-		M_PREPEND(m, sizeof (struct llc), M_DONTWAIT);
+		M_PREPEND(m, sizeof (struct llc), MB_DONTWAIT);
 		if (m == 0)
 			senderr(ENOBUFS);
 		l = mtod(m, struct llc *);
@@ -358,7 +358,7 @@
 	 * Add local net header.  If no space in first mbuf,
 	 * allocate another.
 	 */
-	M_PREPEND(m, ISO88025_HDR_LEN + rif_len, M_DONTWAIT);
+	M_PREPEND(m, ISO88025_HDR_LEN + rif_len, MB_DONTWAIT);
 	if (m == 0)
 		senderr(ENOBUFS);
 
Index: src/sys/net/if_loop.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_loop.c,v
retrieving revision 1.78
diff -u -r1.78 if_loop.c
--- src/sys/net/if_loop.c	19 Feb 2003 05:47:29 -0000	1.78
+++ src/sys/net/if_loop.c	21 Feb 2003 16:38:27 -0000
@@ -215,7 +215,7 @@
 		struct mbuf *n;
 
 		/* XXX MT_HEADER should be m->m_type */
-		MGETHDR(n, M_DONTWAIT, MT_HEADER);
+		MGETHDR(n, MB_DONTWAIT, MT_HEADER);
 		if (!n)
 			goto contiguousfail;
 		M_MOVE_PKTHDR(n, m);
@@ -227,7 +227,7 @@
 		 */
 		m->m_pkthdr.label.l_flags &= ~MAC_FLAG_INITIALIZED;
 #endif
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, MB_DONTWAIT);
 		if (! (n->m_flags & M_EXT)) {
 			m_freem(n);
 			goto contiguousfail;
Index: src/sys/net/if_ppp.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_ppp.c,v
retrieving revision 1.89
diff -u -r1.89 if_ppp.c
--- src/sys/net/if_ppp.c	19 Feb 2003 05:47:29 -0000	1.89
+++ src/sys/net/if_ppp.c	21 Feb 2003 16:38:29 -0000
@@ -831,7 +831,7 @@
      * (This assumes M_LEADINGSPACE is always 0 for a cluster mbuf.)
      */
     if (M_LEADINGSPACE(m0) < PPP_HDRLEN) {
-	m0 = m_prepend(m0, PPP_HDRLEN, M_DONTWAIT);
+	m0 = m_prepend(m0, PPP_HDRLEN, MB_DONTWAIT);
 	if (m0 == 0) {
 	    error = ENOBUFS;
 	    goto bad;
@@ -1411,13 +1411,13 @@
 	}
 
 	/* Copy the PPP and IP headers into a new mbuf. */
-	MGETHDR(mp, M_DONTWAIT, MT_DATA);
+	MGETHDR(mp, MB_DONTWAIT, MT_DATA);
 	if (mp == NULL)
 	    goto bad;
 	mp->m_len = 0;
 	mp->m_next = NULL;
 	if (hlen + PPP_HDRLEN > MHLEN) {
-	    MCLGET(mp, M_DONTWAIT);
+	    MCLGET(mp, MB_DONTWAIT);
 	    if (M_TRAILINGSPACE(mp) < hlen + PPP_HDRLEN) {
 		m_freem(mp);
 		goto bad;	/* lose if big headers and no clusters */
@@ -1475,7 +1475,7 @@
      * whole cluster on it.
      */
     if (ilen <= MHLEN && M_IS_CLUSTER(m)) {
-	MGETHDR(mp, M_DONTWAIT, MT_DATA);
+	MGETHDR(mp, MB_DONTWAIT, MT_DATA);
 	if (mp != NULL) {
 #ifdef MAC
 	    mac_create_mbuf_from_mbuf(m, mp);
Index: src/sys/net/if_sl.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_sl.c,v
retrieving revision 1.109
diff -u -r1.109 if_sl.c
--- src/sys/net/if_sl.c	19 Feb 2003 05:47:29 -0000	1.109
+++ src/sys/net/if_sl.c	21 Feb 2003 16:38:30 -0000
@@ -266,9 +266,9 @@
 
 	MALLOC(sc, struct sl_softc *, sizeof(*sc), M_SL, M_WAITOK | M_ZERO);
 
-	m = m_gethdr(M_TRYWAIT, MT_DATA);
+	m = m_gethdr(MB_TRYWAIT, MT_DATA);
 	if (m != NULL) {
-		MCLGET(m, M_TRYWAIT);
+		MCLGET(m, MB_TRYWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			m = NULL;
@@ -791,7 +791,7 @@
 {
 	struct mbuf *m, *newm;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return (NULL);
 
@@ -803,7 +803,7 @@
 	 * guarantees that packet will fit in a cluster.
 	 */
 	if (len >= MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			/*
 			 * we couldn't get a cluster - if memory's this
Index: src/sys/net/if_spppsubr.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_spppsubr.c,v
retrieving revision 1.100
diff -u -r1.100 if_spppsubr.c
--- src/sys/net/if_spppsubr.c	19 Feb 2003 05:47:29 -0000	1.100
+++ src/sys/net/if_spppsubr.c	21 Feb 2003 16:38:37 -0000
@@ -618,7 +618,7 @@
 				 * enough leading space in the existing mbuf).
 				 */
 				m_adj(m, vjlen);
-				M_PREPEND(m, hlen, M_DONTWAIT);
+				M_PREPEND(m, hlen, MB_DONTWAIT);
 				if (m == NULL)
 					goto drop2;
 				bcopy(iphdr, mtod(m, u_char *), hlen);
@@ -892,7 +892,7 @@
 	/*
 	 * Prepend general data packet PPP header. For now, IP only.
 	 */
-	M_PREPEND (m, PPP_HEADER_LEN, M_DONTWAIT);
+	M_PREPEND (m, PPP_HEADER_LEN, MB_DONTWAIT);
 	if (! m) {
 		if (debug)
 			log(LOG_DEBUG, SPP_FMT "no memory for transmit header\n",
@@ -1357,7 +1357,7 @@
 	getmicrouptime(&tv);
 #endif
 
-	MGETHDR (m, M_DONTWAIT, MT_DATA);
+	MGETHDR (m, MB_DONTWAIT, MT_DATA);
 	if (! m)
 		return;
 	m->m_pkthdr.len = m->m_len = PPP_HEADER_LEN + CISCO_PACKET_LEN;
@@ -1410,7 +1410,7 @@
 
 	if (len > MHLEN - PPP_HEADER_LEN - LCP_HEADER_LEN)
 		len = MHLEN - PPP_HEADER_LEN - LCP_HEADER_LEN;
-	MGETHDR (m, M_DONTWAIT, MT_DATA);
+	MGETHDR (m, MB_DONTWAIT, MT_DATA);
 	if (! m)
 		return;
 	m->m_pkthdr.len = m->m_len = PPP_HEADER_LEN + LCP_HEADER_LEN + len;
@@ -4616,7 +4616,7 @@
 	const char *msg;
 	va_list ap;
 
-	MGETHDR (m, M_DONTWAIT, MT_DATA);
+	MGETHDR (m, MB_DONTWAIT, MT_DATA);
 	if (! m)
 		return;
 	m->m_pkthdr.rcvif = 0;
Index: src/sys/net/if_stf.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_stf.c,v
retrieving revision 1.31
diff -u -r1.31 if_stf.c
--- src/sys/net/if_stf.c	19 Feb 2003 05:47:29 -0000	1.31
+++ src/sys/net/if_stf.c	21 Feb 2003 16:38:38 -0000
@@ -446,7 +446,7 @@
 	}
 #endif /*NBPFILTER > 0*/
 
-	M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ip), MB_DONTWAIT);
 	if (m && m->m_len < sizeof(struct ip))
 		m = m_pullup(m, sizeof(struct ip));
 	if (m == NULL) {
Index: src/sys/net/if_tap.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_tap.c,v
retrieving revision 1.27
diff -u -r1.27 if_tap.c
--- src/sys/net/if_tap.c	19 Feb 2003 05:47:29 -0000	1.27
+++ src/sys/net/if_tap.c	21 Feb 2003 16:38:39 -0000
@@ -839,7 +839,7 @@
 	tlen = uio->uio_resid;
 
 	/* get a header mbuf */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return (ENOBUFS);
 	mlen = MHLEN;
@@ -852,7 +852,7 @@
 		*mp = m;
 		mp = &m->m_next;
 		if (uio->uio_resid > 0) {
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, MB_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				error = ENOBUFS;
 				break;
Index: src/sys/net/if_tun.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_tun.c,v
retrieving revision 1.116
diff -u -r1.116 if_tun.c
--- src/sys/net/if_tun.c	19 Feb 2003 05:47:29 -0000	1.116
+++ src/sys/net/if_tun.c	21 Feb 2003 16:38:40 -0000
@@ -484,7 +484,7 @@
 	/* prepend sockaddr? this may abort if the mbuf allocation fails */
 	if (tp->tun_flags & TUN_LMODE) {
 		/* allocate space for sockaddr */
-		M_PREPEND(m0, dst->sa_len, M_DONTWAIT);
+		M_PREPEND(m0, dst->sa_len, MB_DONTWAIT);
 
 		/* if allocation failed drop packet */
 		if (m0 == NULL) {
@@ -498,7 +498,7 @@
 
 	if (tp->tun_flags & TUN_IFHEAD) {
 		/* Prepend the address family */
-		M_PREPEND(m0, 4, M_DONTWAIT);
+		M_PREPEND(m0, 4, MB_DONTWAIT);
 
 		/* if allocation failed drop packet */
 		if (m0 == NULL) {
@@ -718,7 +718,7 @@
 	tlen = uio->uio_resid;
 
 	/* get a header mbuf */
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return (ENOBUFS);
 	mlen = MHLEN;
@@ -731,7 +731,7 @@
 		*mp = m;
 		mp = &m->m_next;
 		if (uio->uio_resid > 0) {
-			MGET (m, M_DONTWAIT, MT_DATA);
+			MGET (m, MB_DONTWAIT, MT_DATA);
 			if (m == 0) {
 				error = ENOBUFS;
 				break;
Index: src/sys/net/if_vlan.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_vlan.c,v
retrieving revision 1.47
diff -u -r1.47 if_vlan.c
--- src/sys/net/if_vlan.c	19 Feb 2003 05:47:29 -0000	1.47
+++ src/sys/net/if_vlan.c	21 Feb 2003 16:38:41 -0000
@@ -323,7 +323,7 @@
 			struct m_tag *mtag = m_tag_alloc(MTAG_VLAN,
 							 MTAG_VLAN_TAG,
 							 sizeof (u_int),
-							 M_DONTWAIT);
+							 MB_DONTWAIT);
 			if (mtag == NULL) {
 				ifp->if_oerrors++;
 				m_freem(m);
@@ -332,7 +332,7 @@
 			*(u_int*)(mtag+1) = ifv->ifv_tag;
 			m_tag_prepend(m, mtag);
 		} else {
-			M_PREPEND(m, ifv->ifv_encaplen, M_DONTWAIT);
+			M_PREPEND(m, ifv->ifv_encaplen, MB_DONTWAIT);
 			if (m == NULL) {
 				if_printf(ifp, "unable to prepend VLAN header");
 				ifp->if_ierrors++;
Index: src/sys/net/if_vlan_var.h
===================================================================
RCS file: /home/ncvs/src/sys/net/if_vlan_var.h,v
retrieving revision 1.14
diff -u -r1.14 if_vlan_var.h
--- src/sys/net/if_vlan_var.h	19 Feb 2003 05:47:29 -0000	1.14
+++ src/sys/net/if_vlan_var.h	21 Feb 2003 16:38:41 -0000
@@ -98,7 +98,7 @@
 #define	VLAN_INPUT_TAG(_ifp, _m, _t, _errcase) do {		\
 	struct m_tag *mtag;					\
 	mtag = m_tag_alloc(MTAG_VLAN, MTAG_VLAN_TAG,		\
-			   sizeof (u_int), M_DONTWAIT);		\
+			   sizeof (u_int), MB_DONTWAIT);		\
 	if (mtag == NULL) {					\
 		(_ifp)->if_ierrors++;				\
 		m_freem(_m);					\
Index: src/sys/net/ppp_deflate.c
===================================================================
RCS file: /home/ncvs/src/sys/net/ppp_deflate.c,v
retrieving revision 1.20
diff -u -r1.20 ppp_deflate.c
--- src/sys/net/ppp_deflate.c	19 Feb 2003 05:47:29 -0000	1.20
+++ src/sys/net/ppp_deflate.c	21 Feb 2003 16:38:42 -0000
@@ -248,12 +248,12 @@
     /* Allocate one mbuf initially. */
     if (maxolen > orig_len)
 	maxolen = orig_len;
-    MGET(m, M_DONTWAIT, MT_DATA);
+    MGET(m, MB_DONTWAIT, MT_DATA);
     *mret = m;
     if (m != NULL) {
 	m->m_len = 0;
 	if (maxolen + state->hdrlen > MLEN)
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, MB_DONTWAIT);
 	wspace = M_TRAILINGSPACE(m);
 	if (state->hdrlen + PPP_HDRLEN + 2 < wspace) {
 	    m->m_data += state->hdrlen;
@@ -308,12 +308,12 @@
 	    if (m != NULL) {
 		m->m_len = wspace;
 		olen += wspace;
-		MGET(m->m_next, M_DONTWAIT, MT_DATA);
+		MGET(m->m_next, MB_DONTWAIT, MT_DATA);
 		m = m->m_next;
 		if (m != NULL) {
 		    m->m_len = 0;
 		    if (maxolen - olen > MLEN)
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, MB_DONTWAIT);
 		    state->strm.next_out = mtod(m, u_char *);
 		    state->strm.avail_out = wspace = M_TRAILINGSPACE(m);
 		}
@@ -507,13 +507,13 @@
     ++state->seqno;
 
     /* Allocate an output mbuf. */
-    MGETHDR(mo, M_DONTWAIT, MT_DATA);
+    MGETHDR(mo, MB_DONTWAIT, MT_DATA);
     if (mo == NULL)
 	return DECOMP_ERROR;
     mo_head = mo;
     mo->m_len = 0;
     mo->m_next = NULL;
-    MCLGET(mo, M_DONTWAIT);
+    MCLGET(mo, MB_DONTWAIT);
     ospace = M_TRAILINGSPACE(mo);
     if (state->hdrlen + PPP_HDRLEN < ospace) {
 	mo->m_data += state->hdrlen;
@@ -582,13 +582,13 @@
 	    } else {
 		mo->m_len = ospace;
 		olen += ospace;
-		MGET(mo->m_next, M_DONTWAIT, MT_DATA);
+		MGET(mo->m_next, MB_DONTWAIT, MT_DATA);
 		mo = mo->m_next;
 		if (mo == NULL) {
 		    m_freem(mo_head);
 		    return DECOMP_ERROR;
 		}
-		MCLGET(mo, M_DONTWAIT);
+		MCLGET(mo, MB_DONTWAIT);
 		state->strm.next_out = mtod(mo, u_char *);
 		state->strm.avail_out = ospace = M_TRAILINGSPACE(mo);
 	    }
Index: src/sys/net/ppp_tty.c
===================================================================
RCS file: /home/ncvs/src/sys/net/ppp_tty.c,v
retrieving revision 1.56
diff -u -r1.56 ppp_tty.c
--- src/sys/net/ppp_tty.c	19 Feb 2003 05:47:29 -0000	1.56
+++ src/sys/net/ppp_tty.c	21 Feb 2003 16:38:44 -0000
@@ -396,7 +396,7 @@
 
     s = spltty();
     for (mp = &m0; uio->uio_resid; mp = &m->m_next) {
-	MGET(m, M_TRYWAIT, MT_DATA);
+	MGET(m, MB_TRYWAIT, MT_DATA);
 	if ((*mp = m) == NULL) {
 	    m_freem(m0);
 	    splx(s);
@@ -404,7 +404,7 @@
 	}
 	m->m_len = 0;
 	if (uio->uio_resid >= MCLBYTES / 2)
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, MB_DONTWAIT);
 	len = M_TRAILINGSPACE(m);
 	if (len > uio->uio_resid)
 	    len = uio->uio_resid;
@@ -808,11 +808,11 @@
     mp = &sc->sc_m;
     for (len = sc->sc_mru + PPP_HDRLEN + PPP_FCSLEN; len > 0; ){
 	if ((m = *mp) == NULL) {
-	    MGETHDR(m, M_DONTWAIT, MT_DATA);
+	    MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	    if (m == NULL)
 		break;
 	    *mp = m;
-	    MCLGET(m, M_DONTWAIT);
+	    MCLGET(m, MB_DONTWAIT);
 	}
 	len -= M_DATASIZE(m);
 	mp = &m->m_next;
Index: src/sys/net/raw_cb.c
===================================================================
RCS file: /home/ncvs/src/sys/net/raw_cb.c,v
retrieving revision 1.25
diff -u -r1.25 raw_cb.c
--- src/sys/net/raw_cb.c	19 Feb 2003 05:47:29 -0000	1.25
+++ src/sys/net/raw_cb.c	21 Feb 2003 16:38:44 -0000
@@ -139,7 +139,7 @@
 	if (ifnet == 0)
 		return (EADDRNOTAVAIL);
 	rp = sotorawcb(so);
-	nam = m_copym(nam, 0, M_COPYALL, M_TRYWAIT);
+	nam = m_copym(nam, 0, M_COPYALL, MB_TRYWAIT);
 	rp->rcb_laddr = mtod(nam, struct sockaddr *);
 	return (0);
 }
Index: src/sys/net/route.c
===================================================================
RCS file: /home/ncvs/src/sys/net/route.c,v
retrieving revision 1.79
diff -u -r1.79 route.c
--- src/sys/net/route.c	19 Feb 2003 05:47:29 -0000	1.79
+++ src/sys/net/route.c	21 Feb 2003 16:38:46 -0000
@@ -1071,7 +1071,7 @@
 		 * (Assuming we have a mask)
 		 */
 		if (netmask != NULL) {
-			m = m_get(M_DONTWAIT, MT_SONAME);
+			m = m_get(MB_DONTWAIT, MT_SONAME);
 			if (m == NULL)
 				return(ENOBUFS);
 			deldst = mtod(m, struct sockaddr *);
Index: src/sys/net/rtsock.c
===================================================================
RCS file: /home/ncvs/src/sys/net/rtsock.c,v
retrieving revision 1.88
diff -u -r1.88 rtsock.c
--- src/sys/net/rtsock.c	19 Feb 2003 05:47:29 -0000	1.88
+++ src/sys/net/rtsock.c	21 Feb 2003 16:38:47 -0000
@@ -608,9 +608,9 @@
 	}
 	if (len > MCLBYTES)
 		panic("rt_msg1");
-	m = m_gethdr(M_DONTWAIT, MT_DATA);
+	m = m_gethdr(MB_DONTWAIT, MT_DATA);
 	if (m && len > MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			m = NULL;
Index: src/sys/netatalk/aarp.c
===================================================================
RCS file: /home/ncvs/src/sys/netatalk/aarp.c,v
retrieving revision 1.19
diff -u -r1.19 aarp.c
--- src/sys/netatalk/aarp.c	19 Feb 2003 05:47:30 -0000	1.19
+++ src/sys/netatalk/aarp.c	21 Feb 2003 16:38:48 -0000
@@ -127,7 +127,7 @@
     struct llc		*llc;
     struct sockaddr	sa;
 
-    if (( m = m_gethdr( M_DONTWAIT, MT_DATA )) == NULL ) {
+    if (( m = m_gethdr( MB_DONTWAIT, MT_DATA )) == NULL ) {
 	return;
     }
 #ifdef MAC
@@ -166,7 +166,7 @@
 	bcopy((caddr_t)atmulticastaddr, (caddr_t)eh->ether_dhost,
 		sizeof( eh->ether_dhost ));
 	eh->ether_type = htons(sizeof(struct llc) + sizeof(struct ether_aarp));
-	M_PREPEND( m, sizeof( struct llc ), M_TRYWAIT );
+	M_PREPEND( m, sizeof( struct llc ), MB_TRYWAIT );
 	llc = mtod( m, struct llc *);
 	llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP;
 	llc->llc_control = LLC_UI;
@@ -440,7 +440,7 @@
     if ( aa->aa_flags & AFA_PHASE2 ) {
 	eh->ether_type = htons( sizeof( struct llc ) +
 		sizeof( struct ether_aarp ));
-	M_PREPEND( m, sizeof( struct llc ), M_DONTWAIT );
+	M_PREPEND( m, sizeof( struct llc ), MB_DONTWAIT );
 	if ( m == NULL ) {
 	    return;
 	}
@@ -551,7 +551,7 @@
 	aa->aa_ch = timeout( aarpprobe, (caddr_t)ac, hz / 5 );
     }
 
-    if (( m = m_gethdr( M_DONTWAIT, MT_DATA )) == NULL ) {
+    if (( m = m_gethdr( MB_DONTWAIT, MT_DATA )) == NULL ) {
 	return;
     }
 #ifdef MAC
@@ -579,7 +579,7 @@
 		sizeof( eh->ether_dhost ));
 	eh->ether_type = htons( sizeof( struct llc ) +
 		sizeof( struct ether_aarp ));
-	M_PREPEND( m, sizeof( struct llc ), M_TRYWAIT );
+	M_PREPEND( m, sizeof( struct llc ), MB_TRYWAIT );
 	llc = mtod( m, struct llc *);
 	llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP;
 	llc->llc_control = LLC_UI;
Index: src/sys/netatalk/ddp_output.c
===================================================================
RCS file: /home/ncvs/src/sys/netatalk/ddp_output.c,v
retrieving revision 1.18
diff -u -r1.18 ddp_output.c
--- src/sys/netatalk/ddp_output.c	19 Feb 2003 05:47:30 -0000	1.18
+++ src/sys/netatalk/ddp_output.c	21 Feb 2003 16:38:49 -0000
@@ -55,7 +55,7 @@
     mac_create_mbuf_from_socket(so, m);
 #endif
 
-    M_PREPEND( m, sizeof( struct ddpehdr ), M_TRYWAIT );
+    M_PREPEND( m, sizeof( struct ddpehdr ), MB_TRYWAIT );
 
     deh = mtod( m, struct ddpehdr *);
     deh->deh_pad = 0;
@@ -196,7 +196,7 @@
      * packets end up poorly aligned due to the three byte elap header.
      */
     if ( !(aa->aa_flags & AFA_PHASE2) ) {
-	MGET( m0, M_TRYWAIT, MT_HEADER );
+	MGET( m0, MB_TRYWAIT, MT_HEADER );
 	if ( m0 == 0 ) {
 	    m_freem( m );
 	    printf("ddp_route: no buffers\n");
Index: src/sys/netatm/port.h
===================================================================
RCS file: /home/ncvs/src/sys/netatm/port.h,v
retrieving revision 1.14
diff -u -r1.14 port.h
--- src/sys/netatm/port.h	19 Feb 2003 05:47:30 -0000	1.14
+++ src/sys/netatm/port.h	21 Feb 2003 16:38:49 -0000
@@ -126,8 +126,8 @@
 #include <sys/mbuf.h>
 typedef struct mbuf	KBuffer;
 
-#define	KB_F_WAIT	M_TRYWAIT
-#define	KB_F_NOWAIT	M_DONTWAIT
+#define	KB_F_WAIT	MB_TRYWAIT
+#define	KB_F_NOWAIT	MB_DONTWAIT
 
 #define	KB_T_HEADER	MT_HEADER
 #define	KB_T_DATA	MT_DATA
Index: src/sys/netgraph/ng_UI.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_UI.c,v
retrieving revision 1.17
diff -u -r1.17 ng_UI.c
--- src/sys/netgraph/ng_UI.c	19 Feb 2003 05:47:31 -0000	1.17
+++ src/sys/netgraph/ng_UI.c	21 Feb 2003 16:38:50 -0000
@@ -194,7 +194,7 @@
 		m_adj(m, ptr - start);
 		NG_FWD_NEW_DATA(error, item, priv->uplink, m);	/* m -> NULL */
 	} else if (hook == priv->uplink) {
-		M_PREPEND(m, 1, M_DONTWAIT);	/* Prepend IP NLPID */
+		M_PREPEND(m, 1, MB_DONTWAIT);	/* Prepend IP NLPID */
 		if (!m)
 			ERROUT(ENOBUFS);
 		mtod(m, u_char *)[0] = HDLC_UI;
Index: src/sys/netgraph/ng_bridge.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_bridge.c,v
retrieving revision 1.18
diff -u -r1.18 ng_bridge.c
--- src/sys/netgraph/ng_bridge.c	19 Feb 2003 05:47:31 -0000	1.18
+++ src/sys/netgraph/ng_bridge.c	21 Feb 2003 16:38:51 -0000
@@ -713,7 +713,7 @@
 			 * It's usable link but not the reserved (first) one.
 			 * Copy mbuf and meta info for sending.
 			 */
-			m2 = m_dup(m, M_DONTWAIT);	/* XXX m_copypacket() */
+			m2 = m_dup(m, MB_DONTWAIT);	/* XXX m_copypacket() */
 			if (m2 == NULL) {
 				link->stats.memoryFailures++;
 				NG_FREE_ITEM(item);
Index: src/sys/netgraph/ng_cisco.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_cisco.c,v
retrieving revision 1.21
diff -u -r1.21 ng_cisco.c
--- src/sys/netgraph/ng_cisco.c	19 Feb 2003 05:47:31 -0000	1.21
+++ src/sys/netgraph/ng_cisco.c	21 Feb 2003 16:38:52 -0000
@@ -360,7 +360,7 @@
 	/* OK so it came from a protocol, heading out. Prepend general data
 	   packet header. For now, IP,IPX only  */
 	m = NGI_M(item); /* still associated with item */
-	M_PREPEND(m, CISCO_HEADER_LEN, M_DONTWAIT);
+	M_PREPEND(m, CISCO_HEADER_LEN, MB_DONTWAIT);
 	if (!m) {
 		error = ENOBUFS;
 		goto out;
@@ -606,7 +606,7 @@
 
 	getmicrotime(&time);
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (!m)
 		return (ENOBUFS);
 
Index: src/sys/netgraph/ng_frame_relay.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_frame_relay.c,v
retrieving revision 1.21
diff -u -r1.21 ng_frame_relay.c
--- src/sys/netgraph/ng_frame_relay.c	19 Feb 2003 05:47:31 -0000	1.21
+++ src/sys/netgraph/ng_frame_relay.c	21 Feb 2003 16:38:52 -0000
@@ -366,7 +366,7 @@
 	alen = sc->addrlen;
 	if (alen == 0)
 		alen = 2;	/* default value for transmit */
-	M_PREPEND(m, alen, M_DONTWAIT);
+	M_PREPEND(m, alen, MB_DONTWAIT);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto bad;
Index: src/sys/netgraph/ng_gif.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_gif.c,v
retrieving revision 1.8
diff -u -r1.8 ng_gif.c
--- src/sys/netgraph/ng_gif.c	19 Feb 2003 05:47:31 -0000	1.8
+++ src/sys/netgraph/ng_gif.c	21 Feb 2003 16:38:54 -0000
@@ -309,7 +309,7 @@
 	 * hopefully everything after that will not
 	 * need one. So let's just use M_PREPEND.
 	 */
-	M_PREPEND(m, sizeof (tmp_af), M_DONTWAIT);
+	M_PREPEND(m, sizeof (tmp_af), MB_DONTWAIT);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto done;
Index: src/sys/netgraph/ng_gif_demux.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_gif_demux.c,v
retrieving revision 1.6
diff -u -r1.6 ng_gif_demux.c
--- src/sys/netgraph/ng_gif_demux.c	19 Feb 2003 05:47:31 -0000	1.6
+++ src/sys/netgraph/ng_gif_demux.c	21 Feb 2003 16:38:54 -0000
@@ -346,7 +346,7 @@
 		 * Add address family header and set the output hook.
 		 */
 		iffam = get_iffam_from_hook(priv, hook);
-		M_PREPEND(m, sizeof (iffam->family), M_DONTWAIT);
+		M_PREPEND(m, sizeof (iffam->family), MB_DONTWAIT);
 		if (m == NULL) {
 			NG_FREE_M(m);
 			NG_FREE_ITEM(item);
Index: src/sys/netgraph/ng_l2tp.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_l2tp.c,v
retrieving revision 1.5
diff -u -r1.5 ng_l2tp.c
--- src/sys/netgraph/ng_l2tp.c	19 Feb 2003 05:47:31 -0000	1.5
+++ src/sys/netgraph/ng_l2tp.c	21 Feb 2003 16:38:56 -0000
@@ -851,7 +851,7 @@
 		 * later because of a memory error, because then the upper
 		 * layer would never get the packet.
 		 */
-		M_PREPEND(m, 2, M_DONTWAIT);
+		M_PREPEND(m, 2, MB_DONTWAIT);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			NG_FREE_ITEM(item);
@@ -955,7 +955,7 @@
 	}
 
 	/* Copy packet */
-	if ((m = L2TP_COPY_MBUF(seq->xwin[i], M_DONTWAIT)) == NULL) {
+	if ((m = L2TP_COPY_MBUF(seq->xwin[i], MB_DONTWAIT)) == NULL) {
 		priv->stats.memoryFailures++;
 		return (ENOBUFS);
 	}
@@ -991,7 +991,7 @@
 	M_PREPEND(m, 6
 	    + (2 * (hpriv->conf.include_length != 0))
 	    + (4 * (hpriv->conf.enable_dseq != 0)),
-	    M_DONTWAIT);
+	    MB_DONTWAIT);
 	if (m == NULL) {
 		priv->stats.memoryFailures++;
 		NG_FREE_ITEM(item);
@@ -1219,7 +1219,7 @@
 	 */
 	while ((i = L2TP_SEQ_DIFF(seq->ns, seq->rack)) < seq->cwnd
 	    && seq->xwin[i] != NULL) {
-		if ((m = L2TP_COPY_MBUF(seq->xwin[i], M_DONTWAIT)) == NULL)
+		if ((m = L2TP_COPY_MBUF(seq->xwin[i], MB_DONTWAIT)) == NULL)
 			priv->stats.memoryFailures++;
 		else
 			ng_l2tp_xmit_ctrl(priv, m, seq->ns);
@@ -1361,7 +1361,7 @@
 	seq->acks = 0;
 
 	/* Retransmit oldest unack'd packet */
-	if ((m = L2TP_COPY_MBUF(seq->xwin[0], M_DONTWAIT)) == NULL)
+	if ((m = L2TP_COPY_MBUF(seq->xwin[0], MB_DONTWAIT)) == NULL)
 		priv->stats.memoryFailures++;
 	else
 		ng_l2tp_xmit_ctrl(priv, m, seq->rack);
@@ -1388,7 +1388,7 @@
 	if (m == NULL) {
 
 		/* Create a new mbuf for ZLB packet */
-		MGETHDR(m, M_DONTWAIT, MT_DATA);
+		MGETHDR(m, MB_DONTWAIT, MT_DATA);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			return (ENOBUFS);
@@ -1407,7 +1407,7 @@
 		m_adj(m, 2);
 
 		/* Make room for L2TP header */
-		M_PREPEND(m, 12, M_DONTWAIT);
+		M_PREPEND(m, 12, MB_DONTWAIT);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			return (ENOBUFS);
Index: src/sys/netgraph/ng_lmi.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_lmi.c,v
retrieving revision 1.17
diff -u -r1.17 ng_lmi.c
--- src/sys/netgraph/ng_lmi.c	19 Feb 2003 05:47:31 -0000	1.17
+++ src/sys/netgraph/ng_lmi.c	21 Feb 2003 16:38:58 -0000
@@ -321,7 +321,7 @@
 
 	if (sc->lmi_channel == NULL)
 		return;
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		log(LOG_ERR, "nglmi: unable to start up LMI processing\n");
 		return;
Index: src/sys/netgraph/ng_one2many.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_one2many.c,v
retrieving revision 1.13
diff -u -r1.13 ng_one2many.c
--- src/sys/netgraph/ng_one2many.c	19 Feb 2003 05:47:31 -0000	1.13
+++ src/sys/netgraph/ng_one2many.c	21 Feb 2003 16:38:58 -0000
@@ -427,7 +427,7 @@
 				struct ng_one2many_link *mdst;
 
 				mdst = &priv->many[priv->activeMany[i]];
-				m2 = m_dup(m, M_DONTWAIT);        /* XXX m_copypacket() */
+				m2 = m_dup(m, MB_DONTWAIT);        /* XXX m_copypacket() */
 				if (m2 == NULL) {
 					mdst->stats.memoryFailures++;
 					NG_FREE_ITEM(item);
Index: src/sys/netgraph/ng_ppp.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_ppp.c,v
retrieving revision 1.44
diff -u -r1.44 ng_ppp.c
--- src/sys/netgraph/ng_ppp.c	19 Feb 2003 05:47:31 -0000	1.44
+++ src/sys/netgraph/ng_ppp.c	21 Feb 2003 16:39:01 -0000
@@ -1595,7 +1595,7 @@
 			/* Split off next fragment as "m2" */
 			m2 = m;
 			if (!lastFragment) {
-				struct mbuf *n = m_split(m, len, M_DONTWAIT);
+				struct mbuf *n = m_split(m, len, MB_DONTWAIT);
 
 				if (n == NULL) {
 					NG_FREE_M(m);
@@ -1916,7 +1916,7 @@
 static struct mbuf *
 ng_ppp_prepend(struct mbuf *m, const void *buf, int len)
 {
-	M_PREPEND(m, len, M_DONTWAIT);
+	M_PREPEND(m, len, MB_DONTWAIT);
 	if (m == NULL || (m->m_len < len && (m = m_pullup(m, len)) == NULL))
 		return (NULL);
 	bcopy(buf, mtod(m, u_char *), len);
Index: src/sys/netgraph/ng_pppoe.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_pppoe.c,v
retrieving revision 1.58
diff -u -r1.58 ng_pppoe.c
--- src/sys/netgraph/ng_pppoe.c	19 Feb 2003 05:47:31 -0000	1.58
+++ src/sys/netgraph/ng_pppoe.c	21 Feb 2003 16:39:03 -0000
@@ -723,14 +723,14 @@
 				printf("pppoe: Session out of memory\n");
 				LEAVE(ENOMEM);
 			}
-			MGETHDR(neg->m, M_DONTWAIT, MT_DATA);
+			MGETHDR(neg->m, MB_DONTWAIT, MT_DATA);
 			if(neg->m == NULL) {
 				printf("pppoe: Session out of mbufs\n");
 				FREE(neg, M_NETGRAPH_PPPOE);
 				LEAVE(ENOBUFS);
 			}
 			neg->m->m_pkthdr.rcvif = NULL;
-			MCLGET(neg->m, M_DONTWAIT);
+			MCLGET(neg->m, MB_DONTWAIT);
 			if ((neg->m->m_flags & M_EXT) == 0) {
 				printf("pppoe: Session out of mcls\n");
 				m_freem(neg->m);
@@ -1008,7 +1008,7 @@
 				 * Put it into a cluster.
 				 */
 				struct mbuf *n;
-				n = m_dup(m, M_DONTWAIT);
+				n = m_dup(m, MB_DONTWAIT);
 				m_freem(m);
 				m = n;
 				if (m) {
@@ -1350,7 +1350,7 @@
 			 * But first correct the length.
 			 */
 			sp->pkt_hdr.ph.length = htons((short)(m->m_pkthdr.len));
-			M_PREPEND(m, sizeof(*wh), M_DONTWAIT);
+			M_PREPEND(m, sizeof(*wh), MB_DONTWAIT);
 			if (m == NULL) {
 				LEAVE(ENOBUFS);
 			}
@@ -1525,7 +1525,7 @@
 				wh->eh.ether_type = ETHERTYPE_PPPOE_DISC;
 
 			/* generate a packet of that type */
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, MB_DONTWAIT, MT_DATA);
 			if(m == NULL)
 				printf("pppoe: Session out of mbufs\n");
 			else {
@@ -1596,7 +1596,7 @@
 	case	PPPOE_SINIT:
 	case	PPPOE_SREQ:
 		/* timeouts on these produce resends */
-		m0 = m_copypacket(sp->neg->m, M_DONTWAIT);
+		m0 = m_copypacket(sp->neg->m, MB_DONTWAIT);
 		NG_SEND_DATA_ONLY( error, privp->ethernet_hook, m0);
 		neg->timeout_handle = timeout(pppoe_ticker,
 					hook, neg->timeout * hz);
@@ -1642,7 +1642,7 @@
 
 	case	PPPOE_NEWCONNECTED:
 		/* send the PADS without a timeout - we're now connected */
-		m0 = m_copypacket(sp->neg->m, M_DONTWAIT);
+		m0 = m_copypacket(sp->neg->m, MB_DONTWAIT);
 		NG_SEND_DATA_ONLY( error, privp->ethernet_hook, m0);
 		break;
 
@@ -1657,7 +1657,7 @@
 		 * send the offer but if they don't respond
 		 * in PPPOE_OFFER_TIMEOUT seconds, forget about it.
 		 */
-		m0 = m_copypacket(sp->neg->m, M_DONTWAIT);
+		m0 = m_copypacket(sp->neg->m, MB_DONTWAIT);
 		NG_SEND_DATA_ONLY( error, privp->ethernet_hook, m0);
 		neg->timeout_handle = timeout(pppoe_ticker,
 					hook, PPPOE_OFFER_TIMEOUT * hz);
@@ -1665,7 +1665,7 @@
 
 	case	PPPOE_SINIT:
 	case	PPPOE_SREQ:
-		m0 = m_copypacket(sp->neg->m, M_DONTWAIT);
+		m0 = m_copypacket(sp->neg->m, MB_DONTWAIT);
 		NG_SEND_DATA_ONLY( error, privp->ethernet_hook, m0);
 		neg->timeout_handle = timeout(pppoe_ticker, hook,
 					(hz * PPPOE_INITIAL_TIMEOUT));
Index: src/sys/netgraph/ng_pptpgre.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_pptpgre.c,v
retrieving revision 1.29
diff -u -r1.29 ng_pptpgre.c
--- src/sys/netgraph/ng_pptpgre.c	19 Feb 2003 05:47:31 -0000	1.29
+++ src/sys/netgraph/ng_pptpgre.c	21 Feb 2003 16:39:05 -0000
@@ -522,7 +522,7 @@
 	/* Prepend GRE header to outgoing frame */
 	grelen = sizeof(*gre) + sizeof(u_int32_t) * (gre->hasSeq + gre->hasAck);
 	if (m == NULL) {
-		MGETHDR(m, M_DONTWAIT, MT_DATA);
+		MGETHDR(m, MB_DONTWAIT, MT_DATA);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			if (item)
@@ -532,7 +532,7 @@
 		m->m_len = m->m_pkthdr.len = grelen;
 		m->m_pkthdr.rcvif = NULL;
 	} else {
-		M_PREPEND(m, grelen, M_DONTWAIT);
+		M_PREPEND(m, grelen, MB_DONTWAIT);
 		if (m == NULL || (m->m_len < grelen
 		    && (m = m_pullup(m, grelen)) == NULL)) {
 			priv->stats.memoryFailures++;
Index: src/sys/netgraph/ng_rfc1490.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_rfc1490.c,v
retrieving revision 1.19
diff -u -r1.19 ng_rfc1490.c
--- src/sys/netgraph/ng_rfc1490.c	19 Feb 2003 05:47:32 -0000	1.19
+++ src/sys/netgraph/ng_rfc1490.c	21 Feb 2003 16:39:05 -0000
@@ -278,14 +278,14 @@
 			break;
 		}
 	} else if (hook == priv->ppp) {
-		M_PREPEND(m, 2, M_DONTWAIT);	/* Prepend PPP NLPID */
+		M_PREPEND(m, 2, MB_DONTWAIT);	/* Prepend PPP NLPID */
 		if (!m)
 			ERROUT(ENOBUFS);
 		mtod(m, u_char *)[0] = HDLC_UI;
 		mtod(m, u_char *)[1] = NLPID_PPP;
 		NG_FWD_NEW_DATA(error, item, priv->downlink, m);
 	} else if (hook == priv->inet) {
-		M_PREPEND(m, 2, M_DONTWAIT);	/* Prepend IP NLPID */
+		M_PREPEND(m, 2, MB_DONTWAIT);	/* Prepend IP NLPID */
 		if (!m)
 			ERROUT(ENOBUFS);
 		mtod(m, u_char *)[0] = HDLC_UI;
Index: src/sys/netgraph/ng_source.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_source.c,v
retrieving revision 1.8
diff -u -r1.8 ng_source.c
--- src/sys/netgraph/ng_source.c	19 Feb 2003 05:47:32 -0000	1.8
+++ src/sys/netgraph/ng_source.c	21 Feb 2003 16:39:06 -0000
@@ -640,7 +640,7 @@
 			break;
 
 		/* duplicate the packet */
-		m2 = m_copypacket(m, M_DONTWAIT);
+		m2 = m_copypacket(m, MB_DONTWAIT);
 		if (m2 == NULL) {
 			s = splnet();
 			IF_PREPEND(&sc->snd_queue, m);
Index: src/sys/netgraph/ng_tee.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_tee.c,v
retrieving revision 1.23
diff -u -r1.23 ng_tee.c
--- src/sys/netgraph/ng_tee.c	19 Feb 2003 05:47:32 -0000	1.23
+++ src/sys/netgraph/ng_tee.c	21 Feb 2003 16:39:07 -0000
@@ -334,7 +334,7 @@
 		meta_p meta2;
 
 		/* Copy packet (failure will not stop the original)*/
-		m2 = m_dup(m, M_DONTWAIT);
+		m2 = m_dup(m, MB_DONTWAIT);
 		if (m2) {
 
 			/* Copy meta info */
Index: src/sys/netgraph/ng_tty.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_tty.c,v
retrieving revision 1.25
diff -u -r1.25 ng_tty.c
--- src/sys/netgraph/ng_tty.c	19 Feb 2003 05:47:32 -0000	1.25
+++ src/sys/netgraph/ng_tty.c	21 Feb 2003 16:39:07 -0000
@@ -368,7 +368,7 @@
 
 	/* Get a new header mbuf if we need one */
 	if (!(m = sc->m)) {
-		MGETHDR(m, M_DONTWAIT, MT_DATA);
+		MGETHDR(m, MB_DONTWAIT, MT_DATA);
 		if (!m) {
 			if (sc->flags & FLG_DEBUG)
 				log(LOG_ERR,
Index: src/sys/netgraph/ng_vjc.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/ng_vjc.c,v
retrieving revision 1.23
diff -u -r1.23 ng_vjc.c
--- src/sys/netgraph/ng_vjc.c	19 Feb 2003 05:47:32 -0000	1.23
+++ src/sys/netgraph/ng_vjc.c	21 Feb 2003 16:39:08 -0000
@@ -476,7 +476,7 @@
 		m_adj(m, vjlen);
 
 		/* Copy the reconstructed TCP/IP headers into a new mbuf */
-		MGETHDR(hm, M_DONTWAIT, MT_DATA);
+		MGETHDR(hm, MB_DONTWAIT, MT_DATA);
 		if (hm == NULL) {
 			priv->slc.sls_errorin++;
 			NG_FREE_M(m);
@@ -486,7 +486,7 @@
 		hm->m_len = 0;
 		hm->m_pkthdr.rcvif = NULL;
 		if (hlen > MHLEN) {		/* unlikely, but can happen */
-			MCLGET(hm, M_DONTWAIT);
+			MCLGET(hm, MB_DONTWAIT);
 			if ((hm->m_flags & M_EXT) == 0) {
 				m_freem(hm);
 				priv->slc.sls_errorin++;
Index: src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c,v
retrieving revision 1.3
diff -u -r1.3 ng_bt3c_pccard.c
--- src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c	19 Feb 2003 05:47:32 -0000	1.3
+++ src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c	21 Feb 2003 16:39:10 -0000
@@ -832,7 +832,7 @@
 			sc->state = NG_BT3C_W4_PKT_IND;
 			sc->want = 1;
 
-			MGETHDR(sc->m, M_DONTWAIT, MT_DATA);
+			MGETHDR(sc->m, MB_DONTWAIT, MT_DATA);
 			if (sc->m == NULL) {
 				NG_BT3C_ERR(sc->dev, "Could not get mbuf\n");
 				NG_BT3C_STAT_IERROR(sc->stat);
@@ -996,7 +996,7 @@
 	}
 
 	if (m->m_len >= len) {
-		MGET(m->m_next, M_DONTWAIT, m0->m_type);
+		MGET(m->m_next, MB_DONTWAIT, m0->m_type);
 		if (m->m_next == NULL)
 			return (ENOBUFS);
  
Index: src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c,v
retrieving revision 1.3
diff -u -r1.3 ng_h4.c
--- src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c	19 Feb 2003 05:47:32 -0000	1.3
+++ src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c	21 Feb 2003 16:39:11 -0000
@@ -516,7 +516,7 @@
 		if (sc->hook != NULL && NG_HOOK_IS_VALID(sc->hook)) {
 			struct mbuf	*m = NULL;
 
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, MB_DONTWAIT, MT_DATA);
 			if (m != NULL) {
 				m->m_pkthdr.len = 0;
 
Index: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v
retrieving revision 1.5
diff -u -r1.5 ng_ubt.c
--- src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	19 Feb 2003 05:47:32 -0000	1.5
+++ src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c	21 Feb 2003 16:39:13 -0000
@@ -1012,7 +1012,7 @@
 
 	/* Copy HCI event frame to mbuf */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		NG_UBT_ALERT(
 "%s: %s - Could not allocate mbuf\n", __func__, USBDEVNAME(sc->sc_dev));
@@ -1148,7 +1148,7 @@
 	if (h->actlen < sizeof(*hdr))
 		goto done;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		NG_UBT_ALERT(
 "%s: %s - Could not allocate mbuf\n", __func__, USBDEVNAME(sc->sc_dev));
@@ -1426,7 +1426,7 @@
 
 	/* Copy SCO data frame to mbuf */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		NG_UBT_ALERT(
 "%s: %s - Could not allocate mbuf\n",
Index: src/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/bluetooth/hci/ng_hci_cmds.c,v
retrieving revision 1.3
diff -u -r1.3 ng_hci_cmds.c
--- src/sys/netgraph/bluetooth/hci/ng_hci_cmds.c	19 Feb 2003 05:47:33 -0000	1.3
+++ src/sys/netgraph/bluetooth/hci/ng_hci_cmds.c	21 Feb 2003 16:39:15 -0000
@@ -116,7 +116,7 @@
 
 	ng_hci_mtap(unit, m0);
 
-	m = m_dup(m0, M_DONTWAIT);
+	m = m_dup(m0, MB_DONTWAIT);
 	if (m != NULL)
 		NG_SEND_DATA_ONLY(error, unit->drv, m);
 	else
Index: src/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/bluetooth/hci/ng_hci_evnt.c,v
retrieving revision 1.3
diff -u -r1.3 ng_hci_evnt.c
--- src/sys/netgraph/bluetooth/hci/ng_hci_evnt.c	19 Feb 2003 05:47:33 -0000	1.3
+++ src/sys/netgraph/bluetooth/hci/ng_hci_evnt.c	21 Feb 2003 16:39:16 -0000
@@ -504,7 +504,7 @@
 			} __attribute__ ((packed))			*lp;
 			struct mbuf					*m;
 
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, MB_DONTWAIT, MT_DATA);
 			if (m != NULL) {
 				m->m_pkthdr.len = m->m_len = sizeof(*lp);
 				lp = mtod(m, struct __link_policy *);
Index: src/sys/netgraph/bluetooth/hci/ng_hci_misc.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/bluetooth/hci/ng_hci_misc.c,v
retrieving revision 1.3
diff -u -r1.3 ng_hci_misc.c
--- src/sys/netgraph/bluetooth/hci/ng_hci_misc.c	19 Feb 2003 05:47:33 -0000	1.3
+++ src/sys/netgraph/bluetooth/hci/ng_hci_misc.c	21 Feb 2003 16:39:17 -0000
@@ -67,7 +67,7 @@
 	int		 error = 0;
 
 	if (unit->raw != NULL && NG_HOOK_IS_VALID(unit->raw)) {
-		m = m_dup(m0, M_DONTWAIT);
+		m = m_dup(m0, MB_DONTWAIT);
 		if (m != NULL)
 			NG_SEND_DATA_ONLY(error, unit->raw, m);
 
Index: src/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c,v
retrieving revision 1.3
diff -u -r1.3 ng_hci_ulpi.c
--- src/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c	19 Feb 2003 05:47:33 -0000	1.3
+++ src/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c	21 Feb 2003 16:39:19 -0000
@@ -232,7 +232,7 @@
 	 * Create HCI command 
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		ng_hci_free_con(con);
 		error = ENOBUFS;
@@ -427,7 +427,7 @@
 	 * Create HCI command 
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		ng_hci_free_con(sco_con);
 		error = ENOBUFS;
@@ -545,7 +545,7 @@
 	 * Create HCI command
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto out;
@@ -794,7 +794,7 @@
 		 * Create HCI command 
 		 */
 
-		MGETHDR(m, M_DONTWAIT, MT_DATA);
+		MGETHDR(m, MB_DONTWAIT, MT_DATA);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
@@ -1017,7 +1017,7 @@
 	 * Create HCI command 
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto out;
@@ -1247,7 +1247,7 @@
 	 * Create HCI command
 	 */
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m == NULL)
 		return; /* XXX this is bad */
 
Index: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h,v
retrieving revision 1.3
diff -u -r1.3 ng_l2cap_cmds.h
--- src/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h	19 Feb 2003 05:47:33 -0000	1.3
+++ src/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h	21 Feb 2003 16:39:20 -0000
@@ -54,7 +54,7 @@
 		ng_l2cap_cmd_rej_data_t	 data;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -88,7 +88,7 @@
 		ng_l2cap_con_req_cp	 param;				\
 	} __attribute__ ((packed)) 	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -111,7 +111,7 @@
 		ng_l2cap_con_rsp_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -136,7 +136,7 @@
 		ng_l2cap_cfg_req_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL) { 						\
 		NG_FREE_M((_data));					\
 		break;							\
@@ -168,7 +168,7 @@
 		ng_l2cap_cfg_rsp_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL) { 						\
 		NG_FREE_M((_data));					\
 		break;							\
@@ -198,7 +198,7 @@
 do {									\
 	u_int8_t	*p = NULL;					\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -275,7 +275,7 @@
 		ng_l2cap_discon_req_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -298,7 +298,7 @@
 		ng_l2cap_discon_rsp_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -318,7 +318,7 @@
 do {									\
 	ng_l2cap_cmd_hdr_t	*c = NULL;				\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -345,7 +345,7 @@
 		ng_l2cap_info_req_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -368,7 +368,7 @@
 		ng_l2cap_info_rsp_data_t data;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), M_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
Index: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c,v
retrieving revision 1.3
diff -u -r1.3 ng_l2cap_evnt.c
--- src/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c	19 Feb 2003 05:47:33 -0000	1.3
+++ src/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c	21 Feb 2003 16:39:21 -0000
@@ -190,7 +190,7 @@
 
 		/* Get the command, save the rest (if any) */
 		if (con->rx_pkt->m_pkthdr.len > hdr->length)
-			m = m_split(con->rx_pkt, hdr->length, M_DONTWAIT);
+			m = m_split(con->rx_pkt, hdr->length, MB_DONTWAIT);
 		else
 			m = NULL;
 
Index: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c,v
retrieving revision 1.3
diff -u -r1.3 ng_l2cap_llpi.c
--- src/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c	19 Feb 2003 05:47:33 -0000	1.3
+++ src/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c	21 Feb 2003 16:39:22 -0000
@@ -502,7 +502,7 @@
 		/* Check length of the packet against HCI MTU */
 		len = m0->m_pkthdr.len;
 		if (len > l2cap->pkt_size) {
-			m = m_split(m0, l2cap->pkt_size, M_DONTWAIT);
+			m = m_split(m0, l2cap->pkt_size, MB_DONTWAIT);
 			if (m == NULL) {
 				NG_L2CAP_ALERT(
 "%s: %s - m_split(%d) failed\n",	__func__, NG_NODE_NAME(l2cap->node),
Index: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c,v
retrieving revision 1.3
diff -u -r1.3 ng_l2cap_misc.c
--- src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c	19 Feb 2003 05:47:33 -0000	1.3
+++ src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c	21 Feb 2003 16:39:23 -0000
@@ -432,7 +432,7 @@
 struct mbuf *
 ng_l2cap_prepend(struct mbuf *m, int size)
 {
-	M_PREPEND(m, size, M_DONTWAIT);
+	M_PREPEND(m, size, MB_DONTWAIT);
 	if (m == NULL || (m->m_len < size && (m = m_pullup(m, size)) == NULL))
 		return (NULL);
 
Index: src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c,v
retrieving revision 1.4
diff -u -r1.4 ng_btsocket_hci_raw.c
--- src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c	19 Feb 2003 05:47:33 -0000	1.4
+++ src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c	21 Feb 2003 16:39:24 -0000
@@ -275,7 +275,7 @@
 	struct mbuf	*nam = NULL;
 	int		 error;
 
-	MGET(nam, M_DONTWAIT, MT_SONAME);
+	MGET(nam, MB_DONTWAIT, MT_SONAME);
 	if (nam != NULL) {
 		struct sockaddr_hci	*sa = mtod(nam, struct sockaddr_hci *);
 
@@ -504,7 +504,7 @@
 		 * will check if socket has enough buffer space.
 		 */
 
-		m = m_dup(m0, M_DONTWAIT);
+		m = m_dup(m0, MB_DONTWAIT);
 		if (m != NULL) {
 			struct mbuf	*ctl = NULL;
 
@@ -1271,7 +1271,7 @@
 		sa = (struct sockaddr *) &pcb->addr;
 	}
 
-	MGET(nam, M_TRYWAIT, MT_SONAME);
+	MGET(nam, MB_TRYWAIT, MT_SONAME);
 	if (nam == NULL) {
 		error = ENOBUFS;
 		goto drop;
Index: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
===================================================================
RCS file: /home/ncvs/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c,v
retrieving revision 1.4
diff -u -r1.4 ng_btsocket_l2cap.c
--- src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c	19 Feb 2003 05:47:33 -0000	1.4
+++ src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c	21 Feb 2003 16:39:28 -0000
@@ -1464,7 +1464,7 @@
 			 * it is a broadcast traffic after all
 			 */
 
-			copy = m_dup(m, M_DONTWAIT);
+			copy = m_dup(m, MB_DONTWAIT);
 			if (copy != NULL) {
 				sbappendrecord(&pcb->so->so_rcv, copy);
 				sorwakeup(pcb->so);
@@ -2384,7 +2384,7 @@
 	if (pcb->so->so_snd.sb_cc == 0)
 		return (EINVAL); /* XXX */
 
-	m = m_dup(pcb->so->so_snd.sb_mb, M_DONTWAIT);
+	m = m_dup(pcb->so->so_snd.sb_mb, MB_DONTWAIT);
 	if (m == NULL)
 		return (ENOBUFS);
 
Index: src/sys/netinet/if_ether.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/if_ether.c,v
retrieving revision 1.103
diff -u -r1.103 if_ether.c
--- src/sys/netinet/if_ether.c	19 Feb 2003 05:47:33 -0000	1.103
+++ src/sys/netinet/if_ether.c	21 Feb 2003 16:39:29 -0000
@@ -309,7 +309,7 @@
 				   LLC_UI, 0x00, 0x00, 0x00, 0x08, 0x06 };
 	u_short ar_hrd;
 
-	if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL)
+	if ((m = m_gethdr(MB_DONTWAIT, MT_DATA)) == NULL)
 		return;
 	m->m_pkthdr.rcvif = (struct ifnet *)0;
 #ifdef MAC
Index: src/sys/netinet/igmp.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/igmp.c,v
retrieving revision 1.41
diff -u -r1.41 igmp.c
--- src/sys/netinet/igmp.c	19 Feb 2003 05:47:33 -0000	1.41
+++ src/sys/netinet/igmp.c	21 Feb 2003 16:39:30 -0000
@@ -108,7 +108,7 @@
 	/*
 	 * Construct a Router Alert option to use in outgoing packets
 	 */
-	MGET(router_alert, M_DONTWAIT, MT_DATA);
+	MGET(router_alert, MB_DONTWAIT, MT_DATA);
 	ra = mtod(router_alert, struct ipoption *);
 	ra->ipopt_dst.s_addr = 0;
 	ra->ipopt_list[0] = IPOPT_RA;	/* Router Alert Option */
@@ -445,7 +445,7 @@
         struct ip *ip;
         struct ip_moptions imo;
 
-        MGETHDR(m, M_DONTWAIT, MT_HEADER);
+        MGETHDR(m, MB_DONTWAIT, MT_HEADER);
         if (m == NULL)
                 return;
 
Index: src/sys/netinet/in_gif.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/in_gif.c,v
retrieving revision 1.21
diff -u -r1.21 in_gif.c
--- src/sys/netinet/in_gif.c	19 Feb 2003 05:47:33 -0000	1.21
+++ src/sys/netinet/in_gif.c	21 Feb 2003 16:39:30 -0000
@@ -167,7 +167,7 @@
 		ip_ecn_ingress(ECN_NOCARE, &iphdr.ip_tos, &tos);
 
 	/* prepend new IP header */
-	M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ip), MB_DONTWAIT);
 	if (m && m->m_len < sizeof(struct ip))
 		m = m_pullup(m, sizeof(struct ip));
 	if (m == NULL) {
Index: src/sys/netinet/ip_encap.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/ip_encap.c,v
retrieving revision 1.16
diff -u -r1.16 ip_encap.c
--- src/sys/netinet/ip_encap.c	19 Feb 2003 05:47:33 -0000	1.16
+++ src/sys/netinet/ip_encap.c	21 Feb 2003 16:39:31 -0000
@@ -487,7 +487,7 @@
 {
 	struct m_tag *tag;
 
-	tag = m_tag_get(PACKET_TAG_ENCAP, sizeof (void*), M_DONTWAIT);
+	tag = m_tag_get(PACKET_TAG_ENCAP, sizeof (void*), MB_DONTWAIT);
 	if (tag) {
 		*(void**)(tag+1) = ep->arg;
 		m_tag_prepend(m, tag);
Index: src/sys/netinet/ip_fw.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/ip_fw.c,v
retrieving revision 1.192
diff -u -r1.192 ip_fw.c
--- src/sys/netinet/ip_fw.c	19 Feb 2003 05:47:33 -0000	1.192
+++ src/sys/netinet/ip_fw.c	21 Feb 2003 16:39:34 -0000
@@ -875,7 +875,7 @@
 	    if (ipfw_dyn_v != NULL)
 		free(ipfw_dyn_v, M_IPFW);
 	    ipfw_dyn_v = malloc(curr_dyn_buckets * sizeof r,
-                   M_IPFW, M_DONTWAIT | M_ZERO);
+                   M_IPFW, MB_DONTWAIT | M_ZERO);
 	    if (ipfw_dyn_v == NULL)
 		return NULL; /* failed ! */
 	}
Index: src/sys/netinet/ip_fw2.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/ip_fw2.c,v
retrieving revision 1.27
diff -u -r1.27 ip_fw2.c
--- src/sys/netinet/ip_fw2.c	19 Feb 2003 05:47:34 -0000	1.27
+++ src/sys/netinet/ip_fw2.c	21 Feb 2003 16:39:37 -0000
@@ -1057,7 +1057,7 @@
 	struct tcphdr *tcp;
 	struct route sro;	/* fake route */
 
-	MGETHDR(m, M_DONTWAIT, MT_HEADER);
+	MGETHDR(m, MB_DONTWAIT, MT_HEADER);
 	if (m == 0)
 		return;
 	m->m_pkthdr.rcvif = (struct ifnet *)0;
Index: src/sys/netinet/ip_icmp.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/ip_icmp.c,v
retrieving revision 1.77
diff -u -r1.77 ip_icmp.c
--- src/sys/netinet/ip_icmp.c	19 Feb 2003 05:47:34 -0000	1.77
+++ src/sys/netinet/ip_icmp.c	21 Feb 2003 16:39:39 -0000
@@ -163,7 +163,7 @@
 	/*
 	 * First, formulate icmp message
 	 */
-	m = m_gethdr(M_DONTWAIT, MT_HEADER);
+	m = m_gethdr(MB_DONTWAIT, MT_HEADER);
 	if (m == NULL)
 		goto freeit;
 #ifdef MAC
@@ -656,7 +656,7 @@
 		 */
 		cp = (u_char *) (ip + 1);
 		if ((opts = ip_srcroute()) == 0 &&
-		    (opts = m_gethdr(M_DONTWAIT, MT_HEADER))) {
+		    (opts = m_gethdr(MB_DONTWAIT, MT_HEADER))) {
 			opts->m_len = sizeof(struct in_addr);
 			mtod(opts, struct in_addr *)->s_addr = 0;
 		}
Index: src/sys/netinet/ip_input.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/ip_input.c,v
retrieving revision 1.224
diff -u -r1.224 ip_input.c
--- src/sys/netinet/ip_input.c	19 Feb 2003 05:47:34 -0000	1.224
+++ src/sys/netinet/ip_input.c	21 Feb 2003 16:39:41 -0000
@@ -834,7 +834,7 @@
 
 		/* Clone packet if we're doing a 'tee' */
 		if ((divert_info & IP_FW_PORT_TEE_FLAG) != 0)
-			clone = m_dup(m, M_DONTWAIT);
+			clone = m_dup(m, MB_DONTWAIT);
 
 		/* Restore packet header fields to original values */
 		ip->ip_len += hlen;
@@ -985,7 +985,7 @@
 	 * If first fragment to arrive, create a reassembly queue.
 	 */
 	if (fp == 0) {
-		if ((t = m_get(M_DONTWAIT, MT_FTABLE)) == NULL)
+		if ((t = m_get(MB_DONTWAIT, MT_FTABLE)) == NULL)
 			goto dropfrag;
 		fp = mtod(t, struct ipq *);
 #ifdef MAC
@@ -1587,7 +1587,7 @@
 
 	if (ip_nhops == 0)
 		return ((struct mbuf *)0);
-	m = m_get(M_DONTWAIT, MT_HEADER);
+	m = m_get(MB_DONTWAIT, MT_HEADER);
 	if (m == 0)
 		return ((struct mbuf *)0);
 
@@ -1762,8 +1762,8 @@
 	 * assume exclusive access to the IP header in `m', so any
 	 * data in a cluster may change before we reach icmp_error().
 	 */
-	MGET(mcopy, M_DONTWAIT, m->m_type);
-	if (mcopy != NULL && !m_dup_pkthdr(mcopy, m, M_DONTWAIT)) {
+	MGET(mcopy, MB_DONTWAIT, m->m_type);
+	if (mcopy != NULL && !m_dup_pkthdr(mcopy, m, MB_DONTWAIT)) {
 		/*
 		 * It's probably ok if the pkthdr dup fails (because
 		 * the deep copy of the tag chain failed), but for now
Index: src/sys/netinet/ip_mroute.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/ip_mroute.c,v
retrieving revision 1.85
diff -u -r1.85 ip_mroute.c
--- src/sys/netinet/ip_mroute.c	19 Feb 2003 05:47:34 -0000	1.85
+++ src/sys/netinet/ip_mroute.c	21 Feb 2003 16:39:44 -0000
@@ -1403,7 +1403,7 @@
      * new mbuf so we can modify it.  Try to fill the new
      * mbuf since if we don't the ethernet driver will.
      */
-    MGETHDR(mb_copy, M_DONTWAIT, MT_HEADER);
+    MGETHDR(mb_copy, MB_DONTWAIT, MT_HEADER);
     if (mb_copy == NULL)
 	return;
 #ifdef MAC
Index: src/sys/netinet/ip_output.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/ip_output.c,v
retrieving revision 1.178
diff -u -r1.178 ip_output.c
--- src/sys/netinet/ip_output.c	20 Feb 2003 18:22:21 -0000	1.178
+++ src/sys/netinet/ip_output.c	21 Feb 2003 16:39:47 -0000
@@ -801,7 +801,7 @@
 
 			/* Clone packet if we're doing a 'tee' */
 			if ((off & IP_FW_PORT_TEE_FLAG) != 0)
-				clone = m_dup(m, M_DONTWAIT);
+				clone = m_dup(m, MB_DONTWAIT);
 
 			/*
 			 * XXX
@@ -1107,7 +1107,7 @@
 	m0 = m;
 	mhlen = sizeof (struct ip);
 	for (; off < (u_short)ip->ip_len; off += len) {
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
+		MGETHDR(m, MB_DONTWAIT, MT_HEADER);
 		if (m == 0) {
 			error = ENOBUFS;
 			ipstat.ips_odropped++;
@@ -1273,7 +1273,7 @@
 	if (p->ipopt_dst.s_addr)
 		ip->ip_dst = p->ipopt_dst;
 	if (m->m_flags & M_EXT || m->m_data - optlen < m->m_pktdat) {
-		MGETHDR(n, M_DONTWAIT, MT_HEADER);
+		MGETHDR(n, MB_DONTWAIT, MT_HEADER);
 		if (n == 0) {
 			*phlen = 0;
 			return (m);
@@ -1378,7 +1378,7 @@
 				error = EMSGSIZE;
 				break;
 			}
-			MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_HEADER);
+			MGET(m, sopt->sopt_td ? MB_TRYWAIT : MB_DONTWAIT, MT_HEADER);
 			if (m == 0) {
 				error = ENOBUFS;
 				break;
Index: src/sys/netinet/raw_ip.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/raw_ip.c,v
retrieving revision 1.111
diff -u -r1.111 raw_ip.c
--- src/sys/netinet/raw_ip.c	19 Feb 2003 05:47:34 -0000	1.111
+++ src/sys/netinet/raw_ip.c	21 Feb 2003 16:39:49 -0000
@@ -287,7 +287,7 @@
 			m_freem(m);
 			return(EMSGSIZE);
 		}
-		M_PREPEND(m, sizeof(struct ip), M_TRYWAIT);
+		M_PREPEND(m, sizeof(struct ip), MB_TRYWAIT);
 		ip = mtod(m, struct ip *);
 		ip->ip_tos = inp->inp_ip_tos;
 		ip->ip_off = 0;
Index: src/sys/netinet/tcp_output.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/tcp_output.c,v
retrieving revision 1.78
diff -u -r1.78 tcp_output.c
--- src/sys/netinet/tcp_output.c	19 Feb 2003 22:18:05 -0000	1.78
+++ src/sys/netinet/tcp_output.c	21 Feb 2003 16:39:50 -0000
@@ -604,14 +604,14 @@
 		m->m_len += hdrlen;
 		m->m_data -= hdrlen;
 #else
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
+		MGETHDR(m, MB_DONTWAIT, MT_HEADER);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
 		}
 #ifdef INET6
 		if (MHLEN < hdrlen + max_linkhdr) {
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, MB_DONTWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_freem(m);
 				error = ENOBUFS;
@@ -652,7 +652,7 @@
 		else
 			tcpstat.tcps_sndwinup++;
 
-		MGETHDR(m, M_DONTWAIT, MT_HEADER);
+		MGETHDR(m, MB_DONTWAIT, MT_HEADER);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
Index: src/sys/netinet/tcp_subr.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/tcp_subr.c,v
retrieving revision 1.154
diff -u -r1.154 tcp_subr.c
--- src/sys/netinet/tcp_subr.c	19 Feb 2003 23:43:04 -0000	1.154
+++ src/sys/netinet/tcp_subr.c	21 Feb 2003 16:39:53 -0000
@@ -336,7 +336,7 @@
 	struct mbuf *m;
 	struct tcptemp *n;
 
-	m = m_get(M_DONTWAIT, MT_HEADER);
+	m = m_get(MB_DONTWAIT, MT_HEADER);
 	if (m == NULL)
 		return (0);
 	m->m_len = sizeof(struct tcptemp);
@@ -416,7 +416,7 @@
 	      }
 	}
 	if (m == 0) {
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
+		m = m_gethdr(MB_DONTWAIT, MT_HEADER);
 		if (m == NULL)
 			return;
 		tlen = 0;
@@ -1524,7 +1524,7 @@
 
 	if ((tp == NULL) || ((inp = tp->t_inpcb) == NULL))
 		return 0;
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (!m)
 		return 0;
 
Index: src/sys/netinet/tcp_syncache.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/tcp_syncache.c,v
retrieving revision 1.37
diff -u -r1.37 tcp_syncache.c
--- src/sys/netinet/tcp_syncache.c	19 Feb 2003 05:47:34 -0000	1.37
+++ src/sys/netinet/tcp_syncache.c	21 Feb 2003 16:39:55 -0000
@@ -1099,7 +1099,7 @@
 	if (m)
 		m_freem(m);
 
-	m = m_gethdr(M_DONTWAIT, MT_HEADER);
+	m = m_gethdr(MB_DONTWAIT, MT_HEADER);
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_data += max_linkhdr;
Index: src/sys/netinet/udp_usrreq.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/udp_usrreq.c,v
retrieving revision 1.133
diff -u -r1.133 udp_usrreq.c
--- src/sys/netinet/udp_usrreq.c	19 Feb 2003 05:47:34 -0000	1.133
+++ src/sys/netinet/udp_usrreq.c	21 Feb 2003 16:39:56 -0000
@@ -802,7 +802,7 @@
 	 * Calculate data length and get a mbuf
 	 * for UDP and IP headers.
 	 */
-	M_PREPEND(m, sizeof(struct udpiphdr), M_DONTWAIT);
+	M_PREPEND(m, sizeof(struct udpiphdr), MB_DONTWAIT);
 	if (m == 0) {
 		error = ENOBUFS;
 		goto release;
Index: src/sys/netinet6/ah_core.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/ah_core.c,v
retrieving revision 1.11
diff -u -r1.11 ah_core.c
--- src/sys/netinet6/ah_core.c	19 Feb 2003 05:47:35 -0000	1.11
+++ src/sys/netinet6/ah_core.c	21 Feb 2003 16:39:58 -0000
@@ -1244,9 +1244,9 @@
 				error = EMSGSIZE;
 				goto fail;
 			}
-			MGET(n, M_DONTWAIT, MT_DATA);
+			MGET(n, MB_DONTWAIT, MT_DATA);
 			if (n && hlen > MLEN) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, MB_DONTWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
 					n = NULL;
@@ -1359,9 +1359,9 @@
 				error = EMSGSIZE;
 				goto fail;
 			}
-			MGET(n, M_DONTWAIT, MT_DATA);
+			MGET(n, MB_DONTWAIT, MT_DATA);
 			if (n && totlen > MLEN) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, MB_DONTWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
 					n = NULL;
@@ -1510,9 +1510,9 @@
 				error = EMSGSIZE;
 				goto fail;
 			}
-			MGET(n, M_DONTWAIT, MT_DATA);
+			MGET(n, MB_DONTWAIT, MT_DATA);
 			if (n && newoff - off > MLEN) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, MB_DONTWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
 					n = NULL;
@@ -1545,9 +1545,9 @@
 			error = EMSGSIZE;
 			goto fail;
 		}
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, MB_DONTWAIT, MT_DATA);
 		if (n && newoff - off > MLEN) {
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, MB_DONTWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				n = NULL;
Index: src/sys/netinet6/ah_input.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/ah_input.c,v
retrieving revision 1.14
diff -u -r1.14 ah_input.c
--- src/sys/netinet6/ah_input.c	19 Feb 2003 05:47:35 -0000	1.14
+++ src/sys/netinet6/ah_input.c	21 Feb 2003 16:39:59 -0000
@@ -494,7 +494,7 @@
 			 */
 			struct mbuf *n;
 
-			n = m_split(m, off, M_DONTWAIT);
+			n = m_split(m, off, MB_DONTWAIT);
 			if (n == NULL) {
 				/* m is retained by m_split */
 				goto fail;
@@ -901,7 +901,7 @@
 			 */
 			struct mbuf *n;
 
-			n = m_split(m, off, M_DONTWAIT);
+			n = m_split(m, off, MB_DONTWAIT);
 			if (n == NULL) {
 				/* m is retained by m_split */
 				goto fail;
Index: src/sys/netinet6/ah_output.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/ah_output.c,v
retrieving revision 1.10
diff -u -r1.10 ah_output.c
--- src/sys/netinet6/ah_output.c	19 Feb 2003 05:47:35 -0000	1.10
+++ src/sys/netinet6/ah_output.c	21 Feb 2003 16:39:59 -0000
@@ -211,7 +211,7 @@
 		panic("ah4_output: assumption failed (first mbuf length)");
 	if (M_LEADINGSPACE(m->m_next) < ahlen) {
 		struct mbuf *n;
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, MB_DONTWAIT, MT_DATA);
 		if (!n) {
 			ipseclog((LOG_DEBUG, "ENOBUFS in ah4_output %d\n",
 			    __LINE__));
@@ -390,13 +390,13 @@
 		return EINVAL;
 	}
 
-	MGET(mah, M_DONTWAIT, MT_DATA);
+	MGET(mah, MB_DONTWAIT, MT_DATA);
 	if (!mah) {
 		m_freem(m);
 		return ENOBUFS;
 	}
 	if (ahlen > MLEN) {
-		MCLGET(mah, M_DONTWAIT);
+		MCLGET(mah, MB_DONTWAIT);
 		if ((mah->m_flags & M_EXT) == 0) {
 			m_free(mah);
 			m_freem(m);
Index: src/sys/netinet6/esp_core.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/esp_core.c,v
retrieving revision 1.13
diff -u -r1.13 esp_core.c
--- src/sys/netinet6/esp_core.c	19 Feb 2003 05:47:35 -0000	1.13
+++ src/sys/netinet6/esp_core.c	21 Feb 2003 16:40:01 -0000
@@ -760,10 +760,10 @@
 		if (!d || dn + blocklen > d->m_len) {
 			if (d)
 				dp = d;
-			MGET(d, M_DONTWAIT, MT_DATA);
+			MGET(d, MB_DONTWAIT, MT_DATA);
 			i = m->m_pkthdr.len - (soff + sn);
 			if (d && i > MLEN) {
-				MCLGET(d, M_DONTWAIT);
+				MCLGET(d, MB_DONTWAIT);
 				if ((d->m_flags & M_EXT) == 0) {
 					m_free(d);
 					d = NULL;
@@ -970,10 +970,10 @@
 		if (!d || dn + blocklen > d->m_len) {
 			if (d)
 				dp = d;
-			MGET(d, M_DONTWAIT, MT_DATA);
+			MGET(d, MB_DONTWAIT, MT_DATA);
 			i = m->m_pkthdr.len - (soff + sn);
 			if (d && i > MLEN) {
-				MCLGET(d, M_DONTWAIT);
+				MCLGET(d, MB_DONTWAIT);
 				if ((d->m_flags & M_EXT) == 0) {
 					m_free(d);
 					d = NULL;
Index: src/sys/netinet6/esp_input.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/esp_input.c,v
retrieving revision 1.18
diff -u -r1.18 esp_input.c
--- src/sys/netinet6/esp_input.c	19 Feb 2003 05:47:35 -0000	1.18
+++ src/sys/netinet6/esp_input.c	21 Feb 2003 16:40:02 -0000
@@ -788,7 +788,7 @@
 			 */
 			struct mbuf *n;
 
-			n = m_split(m, off, M_DONTWAIT);
+			n = m_split(m, off, MB_DONTWAIT);
 			if (n == NULL) {
 				/* m is retained by m_split */
 				goto bad;
@@ -810,12 +810,12 @@
 			struct mbuf *n = NULL;
 			int maxlen;
 
-			MGETHDR(n, M_DONTWAIT, MT_HEADER);
+			MGETHDR(n, MB_DONTWAIT, MT_HEADER);
 			maxlen = MHLEN;
 			if (n)
 				M_MOVE_PKTHDR(n, m);
 			if (n && n->m_pkthdr.len > maxlen) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, MB_DONTWAIT);
 				maxlen = MCLBYTES;
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
Index: src/sys/netinet6/esp_output.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/esp_output.c,v
retrieving revision 1.8
diff -u -r1.8 esp_output.c
--- src/sys/netinet6/esp_output.c	19 Feb 2003 05:47:35 -0000	1.8
+++ src/sys/netinet6/esp_output.c	21 Feb 2003 16:40:03 -0000
@@ -340,7 +340,7 @@
 	 * after:  IP ... ESP IV payload
 	 */
 	if (M_LEADINGSPACE(md) < esphlen || (md->m_flags & M_EXT) != 0) {
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, MB_DONTWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			error = ENOBUFS;
@@ -495,7 +495,7 @@
 	} else {
 		struct mbuf *nn;
 
-		MGET(nn, M_DONTWAIT, MT_DATA);
+		MGET(nn, MB_DONTWAIT, MT_DATA);
 		if (!nn) {
 			ipseclog((LOG_DEBUG, "esp%d_output: can't alloc mbuf",
 			    afnumber));
@@ -624,7 +624,7 @@
 	} else {
 		struct mbuf *nn;
 
-		MGET(nn, M_DONTWAIT, MT_DATA);
+		MGET(nn, MB_DONTWAIT, MT_DATA);
 		if (!nn) {
 			ipseclog((LOG_DEBUG, "can't alloc mbuf in esp%d_output",
 			    afnumber));
Index: src/sys/netinet6/frag6.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/frag6.c,v
retrieving revision 1.11
diff -u -r1.11 frag6.c
--- src/sys/netinet6/frag6.c	19 Feb 2003 05:47:35 -0000	1.11
+++ src/sys/netinet6/frag6.c	21 Feb 2003 16:40:04 -0000
@@ -233,7 +233,7 @@
 			goto dropfrag;
 		frag6_nfragpackets++;
 		q6 = (struct ip6q *)malloc(sizeof(struct ip6q), M_FTABLE,
-			M_DONTWAIT);
+			MB_DONTWAIT);
 		if (q6 == NULL)
 			goto dropfrag;
 		bzero(q6, sizeof(*q6));
@@ -325,7 +325,7 @@
 	}
 
 	ip6af = (struct ip6asfrag *)malloc(sizeof(struct ip6asfrag), M_FTABLE,
-	    M_DONTWAIT);
+	    MB_DONTWAIT);
 	if (ip6af == NULL)
 		goto dropfrag;
 	bzero(ip6af, sizeof(*ip6af));
@@ -489,7 +489,7 @@
 		m->m_len -= sizeof(struct ip6_frag);
 	} else {
 		/* this comes with no copy if the boundary is on cluster */
-		if ((t = m_split(m, offset, M_DONTWAIT)) == NULL) {
+		if ((t = m_split(m, offset, MB_DONTWAIT)) == NULL) {
 			frag6_remque(q6);
 			free(q6, M_FTABLE);
 			frag6_nfragpackets--;
Index: src/sys/netinet6/icmp6.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/icmp6.c,v
retrieving revision 1.29
diff -u -r1.29 icmp6.c
--- src/sys/netinet6/icmp6.c	19 Feb 2003 05:47:35 -0000	1.29
+++ src/sys/netinet6/icmp6.c	21 Feb 2003 16:40:08 -0000
@@ -346,7 +346,7 @@
 		m_adj(m, ICMPV6_PLD_MAXLEN - m->m_pkthdr.len);
 
 	preplen = sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr);
-	M_PREPEND(m, preplen, M_DONTWAIT);
+	M_PREPEND(m, preplen, MB_DONTWAIT);
 	if (m && m->m_len < preplen)
 		m = m_pullup(m, preplen);
 	if (m == NULL) {
@@ -562,12 +562,12 @@
 				m_freem(n0);
 				break;
 			}
-			MGETHDR(n, M_DONTWAIT, n0->m_type);
+			MGETHDR(n, MB_DONTWAIT, n0->m_type);
 			n0len = n0->m_pkthdr.len;	/* save for use below */
 			if (n)
 				M_MOVE_PKTHDR(n, n0);
 			if (n && maxlen >= MHLEN) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, MB_DONTWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
 					n = NULL;
@@ -624,7 +624,7 @@
 			icmp6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_mldquery);
 		else
 			icmp6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_mldreport);
-		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) {
 			/* give up local */
 			mld6_input(m, off);
 			m = NULL;
@@ -685,15 +685,15 @@
 				/* Give up remote */
 				break;
 			}
-			MGETHDR(n, M_DONTWAIT, m->m_type);
+			MGETHDR(n, MB_DONTWAIT, m->m_type);
 			if (n && maxlen > MHLEN) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, MB_DONTWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_free(n);
 					n = NULL;
 				}
 			}
-			if (!m_dup_pkthdr(n, m, M_DONTWAIT)) {
+			if (!m_dup_pkthdr(n, m, MB_DONTWAIT)) {
 				/*
 				 * Previous code did a blind M_COPY_PKTHDR
 				 * and said "just for rcvif".  If true, then
@@ -749,7 +749,7 @@
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_router_solicit))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) {
 			/* give up local */
 			nd6_rs_input(m, off, icmp6len);
 			m = NULL;
@@ -765,7 +765,7 @@
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_router_advert))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) {
 			/* give up local */
 			nd6_ra_input(m, off, icmp6len);
 			m = NULL;
@@ -781,7 +781,7 @@
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_neighbor_solicit))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) {
 			/* give up local */
 			nd6_ns_input(m, off, icmp6len);
 			m = NULL;
@@ -797,7 +797,7 @@
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_neighbor_advert))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) {
 			/* give up local */
 			nd6_na_input(m, off, icmp6len);
 			m = NULL;
@@ -813,7 +813,7 @@
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_redirect))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) {
 			/* give up local */
 			icmp6_redirect_input(m, off);
 			m = NULL;
@@ -1395,7 +1395,7 @@
 	}
 
 	/* allocate an mbuf to reply. */
-	MGETHDR(n, M_DONTWAIT, m->m_type);
+	MGETHDR(n, MB_DONTWAIT, m->m_type);
 	if (n == NULL) {
 		m_freem(m);
 		return(NULL);
@@ -1409,7 +1409,7 @@
 			 */
 			goto bad;
 		}
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, MB_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			goto bad;
 		}
@@ -1508,9 +1508,9 @@
 		len = MCLBYTES;
 
 	/* because MAXHOSTNAMELEN is usually 256, we use cluster mbuf */
-	MGET(m, M_DONTWAIT, MT_DATA);
+	MGET(m, MB_DONTWAIT, MT_DATA);
 	if (m && len > MLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0)
 			goto fail;
 	}
@@ -2478,9 +2478,9 @@
 #if IPV6_MMTU >= MCLBYTES
 # error assumption failed about IPV6_MMTU and MCLBYTES
 #endif
-	MGETHDR(m, M_DONTWAIT, MT_HEADER);
+	MGETHDR(m, MB_DONTWAIT, MT_HEADER);
 	if (m && IPV6_MMTU >= MHLEN)
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 	if (!m)
 		goto fail;
 	m->m_pkthdr.rcvif = NULL;
Index: src/sys/netinet6/in6_gif.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/in6_gif.c,v
retrieving revision 1.12
diff -u -r1.12 in6_gif.c
--- src/sys/netinet6/in6_gif.c	19 Feb 2003 05:47:35 -0000	1.12
+++ src/sys/netinet6/in6_gif.c	21 Feb 2003 16:40:08 -0000
@@ -145,7 +145,7 @@
 	}
 	
 	/* prepend new IP header */
-	M_PREPEND(m, sizeof(struct ip6_hdr), M_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ip6_hdr), MB_DONTWAIT);
 	if (m && m->m_len < sizeof(struct ip6_hdr))
 		m = m_pullup(m, sizeof(struct ip6_hdr));
 	if (m == NULL) {
Index: src/sys/netinet6/ip6_fw.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/ip6_fw.c,v
retrieving revision 1.24
diff -u -r1.24 ip6_fw.c
--- src/sys/netinet6/ip6_fw.c	19 Feb 2003 05:47:35 -0000	1.24
+++ src/sys/netinet6/ip6_fw.c	21 Feb 2003 16:40:10 -0000
@@ -1109,11 +1109,11 @@
 
 	if (stage == IPV6_FW_GET) {
 		struct ip6_fw_chain *fcp = ip6_fw_chain.lh_first;
-		*mm = m = m_get(M_TRYWAIT, MT_DATA); /* XXX */
+		*mm = m = m_get(MB_TRYWAIT, MT_DATA); /* XXX */
 		if (!m)
 			return(ENOBUFS);
 		if (sizeof *(fcp->rule) > MLEN) {
-			MCLGET(m, M_TRYWAIT);
+			MCLGET(m, MB_TRYWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_free(m);
 				return(ENOBUFS);
@@ -1122,14 +1122,14 @@
 		for (; fcp; fcp = fcp->chain.le_next) {
 			bcopy(fcp->rule, m->m_data, sizeof *(fcp->rule));
 			m->m_len = sizeof *(fcp->rule);
-			m->m_next = m_get(M_TRYWAIT, MT_DATA); /* XXX */
+			m->m_next = m_get(MB_TRYWAIT, MT_DATA); /* XXX */
 			if (!m->m_next) {
 				m_freem(*mm);
 				return(ENOBUFS);
 			}
 			m = m->m_next;
 			if (sizeof *(fcp->rule) > MLEN) {
-				MCLGET(m, M_TRYWAIT);
+				MCLGET(m, MB_TRYWAIT);
 				if ((m->m_flags & M_EXT) == 0) {
 					m_freem(*mm);
 					return(ENOBUFS);
Index: src/sys/netinet6/ip6_input.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/ip6_input.c,v
retrieving revision 1.45
diff -u -r1.45 ip6_input.c
--- src/sys/netinet6/ip6_input.c	19 Feb 2003 05:47:35 -0000	1.45
+++ src/sys/netinet6/ip6_input.c	21 Feb 2003 16:40:12 -0000
@@ -317,11 +317,11 @@
 	if (m && m->m_next != NULL && m->m_pkthdr.len < MCLBYTES) {
 		struct mbuf *n;
 
-		MGETHDR(n, M_DONTWAIT, MT_HEADER);
+		MGETHDR(n, MB_DONTWAIT, MT_HEADER);
 		if (n)
 			M_MOVE_PKTHDR(n, m);
 		if (n && n->m_pkthdr.len > MHLEN) {
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, MB_DONTWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_freem(n);
 				n = NULL;
@@ -1433,9 +1433,9 @@
 	else
 		elen = (ip6e.ip6e_len + 1) << 3;
 
-	MGET(n, M_DONTWAIT, MT_DATA);
+	MGET(n, MB_DONTWAIT, MT_DATA);
 	if (n && elen >= MLEN) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, MB_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_free(n);
 			n = NULL;
@@ -1623,7 +1623,7 @@
 	if (!tag) {
 		tag = m_tag_get(PACKET_TAG_IPV6_INPUT,
 				sizeof (struct ip6aux),
-				M_DONTWAIT);
+				MB_DONTWAIT);
 		if (tag)
 			m_tag_prepend(m, tag);
 	}
Index: src/sys/netinet6/ip6_mroute.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/ip6_mroute.c,v
retrieving revision 1.19
diff -u -r1.19 ip6_mroute.c
--- src/sys/netinet6/ip6_mroute.c	19 Feb 2003 05:47:35 -0000	1.19
+++ src/sys/netinet6/ip6_mroute.c	21 Feb 2003 16:40:14 -0000
@@ -1531,7 +1531,7 @@
 	++pim6stat.pim6s_snd_registers;
 
 	/* Make a copy of the packet to send to the user level process */
-	MGETHDR(mm, M_DONTWAIT, MT_HEADER);
+	MGETHDR(mm, MB_DONTWAIT, MT_HEADER);
 	if (mm == NULL)
 		return ENOBUFS;
 	mm->m_pkthdr.rcvif = NULL;
Index: src/sys/netinet6/ip6_output.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/ip6_output.c,v
retrieving revision 1.49
diff -u -r1.49 ip6_output.c
--- src/sys/netinet6/ip6_output.c	20 Feb 2003 18:22:21 -0000	1.49
+++ src/sys/netinet6/ip6_output.c	21 Feb 2003 16:40:17 -0000
@@ -1039,7 +1039,7 @@
 		 */
 		m0 = m;
 		for (off = hlen; off < tlen; off += len) {
-			MGETHDR(m, M_DONTWAIT, MT_HEADER);
+			MGETHDR(m, MB_DONTWAIT, MT_HEADER);
 			if (!m) {
 				error = ENOBUFS;
 				ip6stat.ip6s_odropped++;
@@ -1152,12 +1152,12 @@
 	if (hlen > MCLBYTES)
 		return(ENOBUFS); /* XXX */
 
-	MGET(m, M_DONTWAIT, MT_DATA);
+	MGET(m, MB_DONTWAIT, MT_DATA);
 	if (!m)
 		return(ENOBUFS);
 
 	if (hlen > MLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			return(ENOBUFS);
@@ -1192,7 +1192,7 @@
 	 * Otherwise, use it to store the options.
 	 */
 	if (exthdrs->ip6e_hbh == 0) {
-		MGET(mopt, M_DONTWAIT, MT_DATA);
+		MGET(mopt, MB_DONTWAIT, MT_DATA);
 		if (mopt == 0)
 			return(ENOBUFS);
 		mopt->m_len = JUMBOOPTLEN;
@@ -1224,9 +1224,9 @@
 			 * As a consequence, we must always prepare a cluster
 			 * at this point.
 			 */
-			MGET(n, M_DONTWAIT, MT_DATA);
+			MGET(n, MB_DONTWAIT, MT_DATA);
 			if (n) {
-				MCLGET(n, M_DONTWAIT);
+				MCLGET(n, MB_DONTWAIT);
 				if ((n->m_flags & M_EXT) == 0) {
 					m_freem(n);
 					n = NULL;
@@ -1281,7 +1281,7 @@
 
 	if (hlen > sizeof(struct ip6_hdr)) {
 		n = m_copym(m0, sizeof(struct ip6_hdr),
-			    hlen - sizeof(struct ip6_hdr), M_DONTWAIT);
+			    hlen - sizeof(struct ip6_hdr), MB_DONTWAIT);
 		if (n == 0)
 			return(ENOBUFS);
 		m->m_next = n;
@@ -1303,7 +1303,7 @@
 		/* allocate a new mbuf for the fragment header */
 		struct mbuf *mfrg;
 
-		MGET(mfrg, M_DONTWAIT, MT_DATA);
+		MGET(mfrg, MB_DONTWAIT, MT_DATA);
 		if (mfrg == 0)
 			return(ENOBUFS);
 		mfrg->m_len = sizeof(struct ip6_frag);
@@ -1495,7 +1495,7 @@
 					break;
 				}
 				/* XXX */
-				MGET(m, sopt->sopt_td ? M_TRYWAIT : M_DONTWAIT, MT_HEADER);
+				MGET(m, sopt->sopt_td ? MB_TRYWAIT : MB_DONTWAIT, MT_HEADER);
 				if (m == 0) {
 					error = ENOBUFS;
 					break;
@@ -1594,7 +1594,7 @@
 				if (in6p->in6p_options) {
 					struct mbuf *m;
 					m = m_copym(in6p->in6p_options,
-					    0, M_COPYALL, M_TRYWAIT);
+					    0, M_COPYALL, MB_TRYWAIT);
 					error = soopt_mcopyout(sopt, m);
 					if (error == 0)
 						m_freem(m);
@@ -2233,7 +2233,7 @@
 {
 	u_int *hlim, *loop, *ifindex;
 
-	*mp = m_get(M_TRYWAIT, MT_HEADER);		/* XXX */
+	*mp = m_get(MB_TRYWAIT, MT_HEADER);		/* XXX */
 
 	switch (optname) {
 
@@ -2569,7 +2569,7 @@
 
 	ip6 = mtod(m, struct ip6_hdr *);
 	if (m->m_len > sizeof(*ip6)) {
-		MGETHDR(mh, M_DONTWAIT, MT_HEADER);
+		MGETHDR(mh, MB_DONTWAIT, MT_HEADER);
 		if (mh == 0) {
 			m_freem(m);
 			return ENOBUFS;
Index: src/sys/netinet6/ipcomp_core.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/ipcomp_core.c,v
retrieving revision 1.7
diff -u -r1.7 ipcomp_core.c
--- src/sys/netinet6/ipcomp_core.c	19 Feb 2003 05:47:35 -0000	1.7
+++ src/sys/netinet6/ipcomp_core.c	21 Feb 2003 16:40:18 -0000
@@ -146,9 +146,9 @@
 	}							\
 								\
 	/* get a fresh reply buffer */				\
-	MGET(n, M_DONTWAIT, MT_DATA);				\
+	MGET(n, MB_DONTWAIT, MT_DATA);				\
 	if (n) {						\
-		MCLGET(n, M_DONTWAIT);				\
+		MCLGET(n, MB_DONTWAIT);				\
 	}							\
 	if (!n) {						\
 		error = ENOBUFS;				\
Index: src/sys/netinet6/ipcomp_output.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/ipcomp_output.c,v
retrieving revision 1.6
diff -u -r1.6 ipcomp_output.c
--- src/sys/netinet6/ipcomp_output.c	19 Feb 2003 05:47:35 -0000	1.6
+++ src/sys/netinet6/ipcomp_output.c	21 Feb 2003 16:40:18 -0000
@@ -171,12 +171,12 @@
 	 * compromise two m_copym().  we will be going through every byte of
 	 * the payload during compression process anyways.
 	 */
-	mcopy = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
+	mcopy = m_copym(m, 0, M_COPYALL, MB_DONTWAIT);
 	if (mcopy == NULL) {
 		error = ENOBUFS;
 		return 0;
 	}
-	md0 = m_copym(md, 0, M_COPYALL, M_DONTWAIT);
+	md0 = m_copym(md, 0, M_COPYALL, MB_DONTWAIT);
 	if (md0 == NULL) {
 		m_freem(mcopy);
 		error = ENOBUFS;
@@ -279,7 +279,7 @@
 	 * after:  IP ... ipcomp payload
 	 */
 	if (M_LEADINGSPACE(md) < complen) {
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, MB_DONTWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			error = ENOBUFS;
Index: src/sys/netinet6/ipsec.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/ipsec.c,v
retrieving revision 1.22
diff -u -r1.22 ipsec.c
--- src/sys/netinet6/ipsec.c	19 Feb 2003 22:32:43 -0000	1.22
+++ src/sys/netinet6/ipsec.c	21 Feb 2003 16:40:22 -0000
@@ -2013,7 +2013,7 @@
 	 */
 	if (M_LEADINGSPACE(m->m_next) < hlen) {
 		struct mbuf *n;
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, MB_DONTWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			return ENOBUFS;
@@ -2112,7 +2112,7 @@
 		panic("ipsec6_encapsulate: assumption failed (first mbuf length)");
 	if (M_LEADINGSPACE(m->m_next) < sizeof(struct ip6_hdr)) {
 		struct mbuf *n;
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, MB_DONTWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			return ENOBUFS;
@@ -3126,7 +3126,7 @@
 	hlen = ip->ip_hl << 2;
 #endif
 	if (m->m_len > hlen) {
-		MGETHDR(mh, M_DONTWAIT, MT_HEADER);
+		MGETHDR(mh, MB_DONTWAIT, MT_HEADER);
 		if (!mh) {
 			m_freem(m);
 			return NULL;
@@ -3162,7 +3162,7 @@
 	ip6 = mtod(m, struct ip6_hdr *);
 	hlen = sizeof(struct ip6_hdr);
 	if (m->m_len > hlen) {
-		MGETHDR(mh, M_DONTWAIT, MT_HEADER);
+		MGETHDR(mh, MB_DONTWAIT, MT_HEADER);
 		if (!mh) {
 			m_freem(m);
 			return NULL;
@@ -3373,16 +3373,16 @@
 				struct mbuf *mm;
 
 				if (n->m_flags & M_PKTHDR) {
-					MGETHDR(mnew, M_DONTWAIT, MT_HEADER);
+					MGETHDR(mnew, MB_DONTWAIT, MT_HEADER);
 					if (mnew == NULL)
 						goto fail;
-					if (!m_dup_pkthdr(mnew, n, M_DONTWAIT)) {
+					if (!m_dup_pkthdr(mnew, n, MB_DONTWAIT)) {
 						m_free(mnew);
 						goto fail;
 					}
 				}
 				else {
-					MGET(mnew, M_DONTWAIT, MT_DATA);
+					MGET(mnew, MB_DONTWAIT, MT_DATA);
 					if (mnew == NULL)
 						goto fail;
 				}
@@ -3406,7 +3406,7 @@
 					if (remain <= (mm->m_flags & M_PKTHDR ? MHLEN : MLEN))
 						len = remain;
 					else { /* allocate a cluster */
-						MCLGET(mm, M_DONTWAIT);
+						MCLGET(mm, MB_DONTWAIT);
 						if (!(mm->m_flags & M_EXT)) {
 							m_free(mm);
 							goto fail;
@@ -3426,7 +3426,7 @@
 						break;
 
 					/* need another mbuf */
-					MGETHDR(mn, M_DONTWAIT, MT_HEADER);
+					MGETHDR(mn, MB_DONTWAIT, MT_HEADER);
 					if (mn == NULL)
 						goto fail;
 					mn->m_pkthdr.rcvif = NULL;
Index: src/sys/netinet6/mld6.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/mld6.c,v
retrieving revision 1.11
diff -u -r1.11 mld6.c
--- src/sys/netinet6/mld6.c	19 Feb 2003 05:47:35 -0000	1.11
+++ src/sys/netinet6/mld6.c	21 Feb 2003 16:40:23 -0000
@@ -400,10 +400,10 @@
 	 * We allocate 2 mbufs and make chain in advance because
 	 * it is more convenient when inserting the hop-by-hop option later.
 	 */
-	MGETHDR(mh, M_DONTWAIT, MT_HEADER);
+	MGETHDR(mh, MB_DONTWAIT, MT_HEADER);
 	if (mh == NULL)
 		return;
-	MGET(md, M_DONTWAIT, MT_DATA);
+	MGET(md, MB_DONTWAIT, MT_DATA);
 	if (md == NULL) {
 		m_free(mh);
 		return;
Index: src/sys/netinet6/nd6_nbr.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/nd6_nbr.c,v
retrieving revision 1.16
diff -u -r1.16 nd6_nbr.c
--- src/sys/netinet6/nd6_nbr.c	19 Feb 2003 05:47:35 -0000	1.16
+++ src/sys/netinet6/nd6_nbr.c	21 Feb 2003 16:40:25 -0000
@@ -362,9 +362,9 @@
 		return;
 	}
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m && max_linkhdr + maxlen >= MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			m = NULL;
@@ -847,9 +847,9 @@
 		return;
 	}
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m && max_linkhdr + maxlen >= MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_free(m);
 			m = NULL;
Index: src/sys/netinet6/raw_ip6.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/raw_ip6.c,v
retrieving revision 1.26
diff -u -r1.26 raw_ip6.c
--- src/sys/netinet6/raw_ip6.c	19 Feb 2003 22:32:43 -0000	1.26
+++ src/sys/netinet6/raw_ip6.c	21 Feb 2003 16:40:26 -0000
@@ -372,7 +372,7 @@
 		code = icmp6->icmp6_code;
 	}
 
-	M_PREPEND(m, sizeof(*ip6), M_TRYWAIT);
+	M_PREPEND(m, sizeof(*ip6), MB_TRYWAIT);
 	ip6 = mtod(m, struct ip6_hdr *);
 
 	/*
Index: src/sys/netinet6/udp6_output.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet6/udp6_output.c,v
retrieving revision 1.11
diff -u -r1.11 udp6_output.c
--- src/sys/netinet6/udp6_output.c	19 Feb 2003 05:47:35 -0000	1.11
+++ src/sys/netinet6/udp6_output.c	21 Feb 2003 16:40:26 -0000
@@ -248,7 +248,7 @@
 	 * Calculate data length and get a mbuf
 	 * for UDP and IP6 headers.
 	 */
-	M_PREPEND(m, hlen + sizeof(struct udphdr), M_DONTWAIT);
+	M_PREPEND(m, hlen + sizeof(struct udphdr), MB_DONTWAIT);
 	if (m == 0) {
 		error = ENOBUFS;
 		goto release;
Index: src/sys/netipsec/ipsec_mbuf.c
===================================================================
RCS file: /home/ncvs/src/sys/netipsec/ipsec_mbuf.c,v
retrieving revision 1.6
diff -u -r1.6 ipsec_mbuf.c
--- src/sys/netipsec/ipsec_mbuf.c	19 Feb 2003 05:47:36 -0000	1.6
+++ src/sys/netipsec/ipsec_mbuf.c	21 Feb 2003 16:40:27 -0000
@@ -105,20 +105,20 @@
 			 * because M_MOVE_PKTHDR will smash the data
 			 * pointer and drop the M_EXT marker.
 			 */
-			MGETHDR(n, M_DONTWAIT, m->m_type);
+			MGETHDR(n, MB_DONTWAIT, m->m_type);
 			if (n == NULL) {
 				m_freem(m0);
 				return (NULL);
 			}
 			M_MOVE_PKTHDR(n, m);
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, MB_DONTWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				m_freem(m0);
 				return (NULL);
 			}
 		} else {
-			n = m_getcl(M_DONTWAIT, m->m_type, m->m_flags);
+			n = m_getcl(MB_DONTWAIT, m->m_type, m->m_flags);
 			if (n == NULL) {
 				m_freem(m0);
 				return (NULL);
@@ -150,7 +150,7 @@
 				break;
 			off += cc;
 
-			n = m_getcl(M_DONTWAIT, m->m_type, m->m_flags);
+			n = m_getcl(MB_DONTWAIT, m->m_type, m->m_flags);
 			if (n == NULL) {
 				m_freem(mfirst);
 				m_freem(m0);
@@ -210,7 +210,7 @@
 		 *
 		 * NB: this ignores mbuf types.
 		 */
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, MB_DONTWAIT, MT_DATA);
 		if (n == NULL)
 			return (NULL);
 		n->m_next = m->m_next;		/* splice new mbuf */
@@ -238,7 +238,7 @@
 			if (remain + hlen > M_TRAILINGSPACE(n)) {
 				struct mbuf *n2;
 
-				MGET(n2, M_DONTWAIT, MT_DATA);
+				MGET(n2, MB_DONTWAIT, MT_DATA);
 				/* NB: new mbuf is on chain, let caller free */
 				if (n2 == NULL)
 					return (NULL);
@@ -328,7 +328,7 @@
 
 	if (pad > M_TRAILINGSPACE(m0)) {
 		/* Add an mbuf to the chain. */
-		MGET(m1, M_DONTWAIT, MT_DATA);
+		MGET(m1, MB_DONTWAIT, MT_DATA);
 		if (m1 == 0) {
 			m_freem(m0);
 			DPRINTF(("m_pad: unable to get extra mbuf\n"));
Index: src/sys/netipsec/ipsec_output.c
===================================================================
RCS file: /home/ncvs/src/sys/netipsec/ipsec_output.c,v
retrieving revision 1.4
diff -u -r1.4 ipsec_output.c
--- src/sys/netipsec/ipsec_output.c	19 Feb 2003 05:47:36 -0000	1.4
+++ src/sys/netipsec/ipsec_output.c	21 Feb 2003 16:40:28 -0000
@@ -469,7 +469,7 @@
 	ip6 = mtod(m, struct ip6_hdr *);
 	hlen = sizeof(struct ip6_hdr);
 	if (m->m_len > hlen) {
-		MGETHDR(mh, M_DONTWAIT, MT_HEADER);
+		MGETHDR(mh, MB_DONTWAIT, MT_HEADER);
 		if (!mh) {
 			m_freem(m);
 			return NULL;
@@ -580,7 +580,7 @@
 	plen = m->m_pkthdr.len;
 	if (M_LEADINGSPACE(m->m_next) < sizeof(struct ip6_hdr)) {
 		struct mbuf *n;
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, MB_DONTWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			return ENOBUFS;
Index: src/sys/netipsec/key.c
===================================================================
RCS file: /home/ncvs/src/sys/netipsec/key.c,v
retrieving revision 1.5
diff -u -r1.5 key.c
--- src/sys/netipsec/key.c	19 Feb 2003 05:47:36 -0000	1.5
+++ src/sys/netipsec/key.c	21 Feb 2003 16:40:37 -0000
@@ -1627,7 +1627,7 @@
 			if (len > MHLEN)
 				panic("assumption failed");
 #endif
-			MGETHDR(n, M_DONTWAIT, MT_DATA);
+			MGETHDR(n, MB_DONTWAIT, MT_DATA);
 			if (!n)
 				goto fail;
 			n->m_len = len;
@@ -1646,7 +1646,7 @@
 			    mtod(n, caddr_t));
 		} else {
 			n = m_copym(m, mhp->extoff[idx], mhp->extlen[idx],
-			    M_DONTWAIT);
+			    MB_DONTWAIT);
 		}
 		if (n == NULL)
 			goto fail;
@@ -2079,9 +2079,9 @@
 
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
-	MGETHDR(n, M_DONTWAIT, MT_DATA);
+	MGETHDR(n, MB_DONTWAIT, MT_DATA);
 	if (n && len > MHLEN) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, MB_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -2103,7 +2103,7 @@
 #endif
 
 	n->m_next = m_copym(m, mhp->extoff[SADB_X_EXT_POLICY],
-	    mhp->extlen[SADB_X_EXT_POLICY], M_DONTWAIT);
+	    mhp->extlen[SADB_X_EXT_POLICY], MB_DONTWAIT);
 	if (!n->m_next) {
 		m_freem(n);
 		return key_senderror(so, m, ENOBUFS);
@@ -3329,7 +3329,7 @@
 		if ((!m && !p) || (m && p))
 			goto fail;
 		if (p && tres) {
-			M_PREPEND(tres, l, M_DONTWAIT);
+			M_PREPEND(tres, l, MB_DONTWAIT);
 			if (!tres)
 				goto fail;
 			bcopy(p, mtod(tres, caddr_t), l);
@@ -3388,9 +3388,9 @@
 	len = PFKEY_ALIGN8(sizeof(struct sadb_msg));
 	if (len > MCLBYTES)
 		return NULL;
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m && len > MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_freem(m);
 			m = NULL;
@@ -4501,9 +4501,9 @@
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
 
-	MGETHDR(n, M_DONTWAIT, MT_DATA);
+	MGETHDR(n, MB_DONTWAIT, MT_DATA);
 	if (len > MHLEN) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, MB_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -5390,7 +5390,7 @@
 			KASSERT(l <= MLEN,
 				("key_getcomb_esp: l=%u > MLEN=%lu",
 				l, (u_long) MLEN));
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, MB_DONTWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
@@ -5492,14 +5492,14 @@
 			KASSERT(l <= MLEN,
 				("key_getcomb_ah: l=%u > MLEN=%lu",
 				l, (u_long) MLEN));
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, MB_DONTWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, M_DONTWAIT);
+			M_PREPEND(m, l, MB_DONTWAIT);
 		if (!m)
 			return NULL;
 
@@ -5537,14 +5537,14 @@
 			KASSERT(l <= MLEN,
 				("key_getcomb_ipcomp: l=%u > MLEN=%lu",
 				l, (u_long) MLEN));
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, MB_DONTWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, M_DONTWAIT);
+			M_PREPEND(m, l, MB_DONTWAIT);
 		if (!m)
 			return NULL;
 
@@ -5588,7 +5588,7 @@
 
 	if (!m)
 		return NULL;
-	M_PREPEND(m, l, M_DONTWAIT);
+	M_PREPEND(m, l, MB_DONTWAIT);
 	if (!m)
 		return NULL;
 
@@ -6093,9 +6093,9 @@
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
 
-	MGETHDR(n, M_DONTWAIT, MT_DATA);
+	MGETHDR(n, MB_DONTWAIT, MT_DATA);
 	if (len > MHLEN) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, MB_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -6659,9 +6659,9 @@
 	if (m->m_next) {
 		struct mbuf *n;
 
-		MGETHDR(n, M_DONTWAIT, MT_DATA);
+		MGETHDR(n, MB_DONTWAIT, MT_DATA);
 		if (n && m->m_pkthdr.len > MHLEN) {
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, MB_DONTWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				n = NULL;
@@ -7259,9 +7259,9 @@
 
 	len = l;
 	while (len > 0) {
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, MB_DONTWAIT, MT_DATA);
 		if (n && len > MLEN)
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, MB_DONTWAIT);
 		if (!n) {
 			m_freem(m);
 			return NULL;
Index: src/sys/netipsec/keysock.c
===================================================================
RCS file: /home/ncvs/src/sys/netipsec/keysock.c,v
retrieving revision 1.4
diff -u -r1.4 keysock.c
--- src/sys/netipsec/keysock.c	19 Feb 2003 05:47:36 -0000	1.4
+++ src/sys/netipsec/keysock.c	21 Feb 2003 16:40:38 -0000
@@ -152,7 +152,7 @@
 	if (promisc) {
 		struct sadb_msg *pmsg;
 
-		M_PREPEND(m, sizeof(struct sadb_msg), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct sadb_msg), MB_DONTWAIT);
 		if (m && m->m_len < sizeof(struct sadb_msg))
 			m = m_pullup(m, sizeof(struct sadb_msg));
 		if (!m) {
@@ -223,10 +223,10 @@
 	m = mprev = NULL;
 	while (tlen > 0) {
 		if (tlen == len) {
-			MGETHDR(n, M_DONTWAIT, MT_DATA);
+			MGETHDR(n, MB_DONTWAIT, MT_DATA);
 			n->m_len = MHLEN;
 		} else {
-			MGET(n, M_DONTWAIT, MT_DATA);
+			MGET(n, MB_DONTWAIT, MT_DATA);
 			n->m_len = MLEN;
 		}
 		if (!n) {
@@ -234,7 +234,7 @@
 			return ENOBUFS;
 		}
 		if (tlen >= MCLBYTES) {	/*XXX better threshold? */
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, MB_DONTWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				m_freem(m);
Index: src/sys/netipsec/xform_ipip.c
===================================================================
RCS file: /home/ncvs/src/sys/netipsec/xform_ipip.c,v
retrieving revision 1.4
diff -u -r1.4 xform_ipip.c
--- src/sys/netipsec/xform_ipip.c	19 Feb 2003 05:47:36 -0000	1.4
+++ src/sys/netipsec/xform_ipip.c	21 Feb 2003 16:40:38 -0000
@@ -441,7 +441,7 @@
 			goto bad;
 		}
 
-		M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct ip), MB_DONTWAIT);
 		if (m == 0) {
 			DPRINTF(("ipip_output: M_PREPEND failed\n"));
 			ipipstat.ipips_hdrops++;
@@ -529,7 +529,7 @@
 		if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst))
 			ip6->ip6_dst.s6_addr16[1] = 0;
 
-		M_PREPEND(m, sizeof(struct ip6_hdr), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct ip6_hdr), MB_DONTWAIT);
 		if (m == 0) {
 			DPRINTF(("ipip_output: M_PREPEND failed\n"));
 			ipipstat.ipips_hdrops++;
Index: src/sys/netipx/ipx_input.c
===================================================================
RCS file: /home/ncvs/src/sys/netipx/ipx_input.c,v
retrieving revision 1.30
diff -u -r1.30 ipx_input.c
--- src/sys/netipx/ipx_input.c	19 Feb 2003 05:47:36 -0000	1.30
+++ src/sys/netipx/ipx_input.c	21 Feb 2003 16:40:39 -0000
@@ -483,7 +483,7 @@
 		if (m0 != NULL) {
 			register struct ipx *ipx;
 
-			M_PREPEND(m0, sizeof(*ipx), M_DONTWAIT);
+			M_PREPEND(m0, sizeof(*ipx), MB_DONTWAIT);
 			if (m0 == NULL)
 				continue;
 			ipx = mtod(m0, struct ipx *);
Index: src/sys/netipx/ipx_ip.c
===================================================================
RCS file: /home/ncvs/src/sys/netipx/ipx_ip.c,v
retrieving revision 1.33
diff -u -r1.33 ipx_ip.c
--- src/sys/netipx/ipx_ip.c	19 Feb 2003 05:47:36 -0000	1.33
+++ src/sys/netipx/ipx_ip.c	21 Feb 2003 16:40:40 -0000
@@ -175,7 +175,7 @@
 		if (ipxip_lastin != NULL) {
 			m_freem(ipxip_lastin);
 		}
-		ipxip_lastin = m_copym(m, 0, (int)M_COPYALL, M_DONTWAIT);
+		ipxip_lastin = m_copym(m, 0, (int)M_COPYALL, MB_DONTWAIT);
 	}
 	/*
 	 * Get IP and IPX header together in first mbuf.
@@ -256,7 +256,7 @@
 	/* following clause not necessary on vax */
 	if (3 & (intptr_t)m->m_data) {
 		/* force longword alignment of ip hdr */
-		struct mbuf *m0 = m_gethdr(MT_HEADER, M_DONTWAIT);
+		struct mbuf *m0 = m_gethdr(MT_HEADER, MB_DONTWAIT);
 		if (m0 == NULL) {
 			m_freem(m);
 			return (ENOBUFS);
@@ -269,7 +269,7 @@
 		m->m_flags &= ~M_PKTHDR;
 		m = m0;
 	} else {
-		M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct ip), MB_DONTWAIT);
 		if (m == NULL)
 			return (ENOBUFS);
 	}
Index: src/sys/netipx/ipx_outputfl.c
===================================================================
RCS file: /home/ncvs/src/sys/netipx/ipx_outputfl.c,v
retrieving revision 1.18
diff -u -r1.18 ipx_outputfl.c
--- src/sys/netipx/ipx_outputfl.c	19 Feb 2003 05:47:36 -0000	1.18
+++ src/sys/netipx/ipx_outputfl.c	21 Feb 2003 16:40:40 -0000
@@ -244,7 +244,7 @@
 			if(ipx->ipx_sum != 0xffff)
 				ipx->ipx_sum = ipx_cksum(m, ntohs(ipx->ipx_len));
 
-			m1 = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
+			m1 = m_copym(m, 0, M_COPYALL, MB_DONTWAIT);
 			if(m1) {
 				error = (*ifp->if_output)(ifp, m1,
 					(struct sockaddr *)&dst, NULL);
Index: src/sys/netipx/ipx_usrreq.c
===================================================================
RCS file: /home/ncvs/src/sys/netipx/ipx_usrreq.c,v
retrieving revision 1.36
diff -u -r1.36 ipx_usrreq.c
--- src/sys/netipx/ipx_usrreq.c	19 Feb 2003 05:47:36 -0000	1.36
+++ src/sys/netipx/ipx_usrreq.c	21 Feb 2003 16:40:41 -0000
@@ -218,7 +218,7 @@
 			(m->m_len + m->m_data < &m->m_dat[MLEN])) {
 			mtod(m, char*)[m->m_len++] = 0;
 		} else {
-			struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
+			struct mbuf *m1 = m_get(MB_DONTWAIT, MT_DATA);
 
 			if (m1 == NULL) {
 				m_freem(m0);
@@ -239,7 +239,7 @@
 	if (ipxp->ipxp_flags & IPXP_RAWOUT) {
 		ipx = mtod(m, struct ipx *);
 	} else {
-		M_PREPEND(m, sizeof(struct ipx), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct ipx), MB_DONTWAIT);
 		if (m == NULL)
 			return (ENOBUFS);
 		ipx = mtod(m, struct ipx *);
Index: src/sys/netipx/spx_usrreq.c
===================================================================
RCS file: /home/ncvs/src/sys/netipx/spx_usrreq.c,v
retrieving revision 1.37
diff -u -r1.37 spx_usrreq.c
--- src/sys/netipx/spx_usrreq.c	19 Feb 2003 05:47:37 -0000	1.37
+++ src/sys/netipx/spx_usrreq.c	21 Feb 2003 16:40:43 -0000
@@ -579,7 +579,7 @@
 				spx_newchecks[4]++;
 				if (dt != cb->s_rhdr.spx_dt) {
 					struct mbuf *mm =
-					   m_getclr(M_DONTWAIT, MT_CONTROL);
+					   m_getclr(MB_DONTWAIT, MT_CONTROL);
 					spx_newchecks[0]++;
 					if (mm != NULL) {
 						u_short *s =
@@ -755,7 +755,7 @@
 					 * from usrreq(), so it is OK to
 					 * block.
 					 */
-					m = m_copym(m0, 0, mtu, M_TRYWAIT);
+					m = m_copym(m0, 0, mtu, MB_TRYWAIT);
 					if (cb->s_flags & SF_NEWCALL) {
 					    struct mbuf *mm = m;
 					    spx_newchecks[7]++;
@@ -785,7 +785,7 @@
 			if (M_TRAILINGSPACE(m) >= 1)
 				m->m_len++;
 			else {
-				struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
+				struct mbuf *m1 = m_get(MB_DONTWAIT, MT_DATA);
 
 				if (m1 == NULL) {
 					m_freem(m0);
@@ -796,7 +796,7 @@
 				m->m_next = m1;
 			}
 		}
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
+		m = m_gethdr(MB_DONTWAIT, MT_HEADER);
 		if (m == NULL) {
 			m_freem(m0);
 			return (ENOBUFS);
@@ -1009,7 +1009,7 @@
 			spxstat.spxs_sndprobe++;
 		if (cb->s_flags & SF_ACKNOW)
 			spxstat.spxs_sndacks++;
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
+		m = m_gethdr(MB_DONTWAIT, MT_HEADER);
 		if (m == NULL)
 			return (ENOBUFS);
 		/*
@@ -1342,7 +1342,7 @@
 	}
 	sb = &so->so_snd;
 
-	mm = m_getclr(M_DONTWAIT, MT_HEADER);
+	mm = m_getclr(MB_DONTWAIT, MT_HEADER);
 	if (mm == NULL) {
 		FREE(cb, M_PCB);
 		error = ENOBUFS;
Index: src/sys/netkey/key.c
===================================================================
RCS file: /home/ncvs/src/sys/netkey/key.c,v
retrieving revision 1.47
diff -u -r1.47 key.c
--- src/sys/netkey/key.c	19 Feb 2003 05:47:37 -0000	1.47
+++ src/sys/netkey/key.c	21 Feb 2003 16:40:53 -0000
@@ -1662,7 +1662,7 @@
 			if (len > MHLEN)
 				panic("assumption failed");
 #endif
-			MGETHDR(n, M_DONTWAIT, MT_DATA);
+			MGETHDR(n, MB_DONTWAIT, MT_DATA);
 			if (!n)
 				goto fail;
 			n->m_len = len;
@@ -1681,7 +1681,7 @@
 			    mtod(n, caddr_t));
 		} else {
 			n = m_copym(m, mhp->extoff[idx], mhp->extlen[idx],
-			    M_DONTWAIT);
+			    MB_DONTWAIT);
 		}
 		if (n == NULL)
 			goto fail;
@@ -2117,9 +2117,9 @@
 
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
-	MGETHDR(n, M_DONTWAIT, MT_DATA);
+	MGETHDR(n, MB_DONTWAIT, MT_DATA);
 	if (n && len > MHLEN) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, MB_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -2141,7 +2141,7 @@
 #endif
 
 	n->m_next = m_copym(m, mhp->extoff[SADB_X_EXT_POLICY],
-	    mhp->extlen[SADB_X_EXT_POLICY], M_DONTWAIT);
+	    mhp->extlen[SADB_X_EXT_POLICY], MB_DONTWAIT);
 	if (!n->m_next) {
 		m_freem(n);
 		return key_senderror(so, m, ENOBUFS);
@@ -3488,7 +3488,7 @@
 		if ((!m && !p) || (m && p))
 			goto fail;
 		if (p && tres) {
-			M_PREPEND(tres, l, M_DONTWAIT);
+			M_PREPEND(tres, l, MB_DONTWAIT);
 			if (!tres)
 				goto fail;
 			bcopy(p, mtod(tres, caddr_t), l);
@@ -3547,9 +3547,9 @@
 	len = PFKEY_ALIGN8(sizeof(struct sadb_msg));
 	if (len > MCLBYTES)
 		return NULL;
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 	if (m && len > MHLEN) {
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, MB_DONTWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_freem(m);
 			m = NULL;
@@ -4682,9 +4682,9 @@
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
 
-	MGETHDR(n, M_DONTWAIT, MT_DATA);
+	MGETHDR(n, MB_DONTWAIT, MT_DATA);
 	if (len > MHLEN) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, MB_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -5573,7 +5573,7 @@
 			if (l > MLEN)
 				panic("assumption failed in key_getcomb_esp");
 #endif
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, MB_DONTWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
@@ -5657,14 +5657,14 @@
 			if (l > MLEN)
 				panic("assumption failed in key_getcomb_ah");
 #endif
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, MB_DONTWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, M_DONTWAIT);
+			M_PREPEND(m, l, MB_DONTWAIT);
 		if (!m)
 			return NULL;
 
@@ -5703,14 +5703,14 @@
 			if (l > MLEN)
 				panic("assumption failed in key_getcomb_ipcomp");
 #endif
-			MGET(m, M_DONTWAIT, MT_DATA);
+			MGET(m, MB_DONTWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, M_DONTWAIT);
+			M_PREPEND(m, l, MB_DONTWAIT);
 		if (!m)
 			return NULL;
 
@@ -5756,7 +5756,7 @@
 
 	if (!m)
 		return NULL;
-	M_PREPEND(m, l, M_DONTWAIT);
+	M_PREPEND(m, l, MB_DONTWAIT);
 	if (!m)
 		return NULL;
 
@@ -6273,9 +6273,9 @@
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
 
-	MGETHDR(n, M_DONTWAIT, MT_DATA);
+	MGETHDR(n, MB_DONTWAIT, MT_DATA);
 	if (len > MHLEN) {
-		MCLGET(n, M_DONTWAIT);
+		MCLGET(n, MB_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -6847,9 +6847,9 @@
 	if (m->m_next) {
 		struct mbuf *n;
 
-		MGETHDR(n, M_DONTWAIT, MT_DATA);
+		MGETHDR(n, MB_DONTWAIT, MT_DATA);
 		if (n && m->m_pkthdr.len > MHLEN) {
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, MB_DONTWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				n = NULL;
@@ -7474,9 +7474,9 @@
 
 	len = l;
 	while (len > 0) {
-		MGET(n, M_DONTWAIT, MT_DATA);
+		MGET(n, MB_DONTWAIT, MT_DATA);
 		if (n && len > MLEN)
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, MB_DONTWAIT);
 		if (!n) {
 			m_freem(m);
 			return NULL;
Index: src/sys/netkey/keysock.c
===================================================================
RCS file: /home/ncvs/src/sys/netkey/keysock.c,v
retrieving revision 1.20
diff -u -r1.20 keysock.c
--- src/sys/netkey/keysock.c	19 Feb 2003 05:47:37 -0000	1.20
+++ src/sys/netkey/keysock.c	21 Feb 2003 16:40:54 -0000
@@ -148,7 +148,7 @@
 	if (promisc) {
 		struct sadb_msg *pmsg;
 
-		M_PREPEND(m, sizeof(struct sadb_msg), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct sadb_msg), MB_DONTWAIT);
 		if (m && m->m_len < sizeof(struct sadb_msg))
 			m = m_pullup(m, sizeof(struct sadb_msg));
 		if (!m) {
@@ -219,10 +219,10 @@
 	m = mprev = NULL;
 	while (tlen > 0) {
 		if (tlen == len) {
-			MGETHDR(n, M_DONTWAIT, MT_DATA);
+			MGETHDR(n, MB_DONTWAIT, MT_DATA);
 			n->m_len = MHLEN;
 		} else {
-			MGET(n, M_DONTWAIT, MT_DATA);
+			MGET(n, MB_DONTWAIT, MT_DATA);
 			n->m_len = MLEN;
 		}
 		if (!n) {
@@ -230,7 +230,7 @@
 			return ENOBUFS;
 		}
 		if (tlen >= MCLBYTES) {	/*XXX better threshold? */
-			MCLGET(n, M_DONTWAIT);
+			MCLGET(n, MB_DONTWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				m_freem(m);
Index: src/sys/netnatm/natm.c
===================================================================
RCS file: /home/ncvs/src/sys/netnatm/natm.c,v
retrieving revision 1.21
diff -u -r1.21 natm.c
--- src/sys/netnatm/natm.c	19 Feb 2003 05:47:37 -0000	1.21
+++ src/sys/netnatm/natm.c	21 Feb 2003 16:40:55 -0000
@@ -300,7 +300,7 @@
      * send the data.   we must put an atm_pseudohdr on first
      */
 
-    M_PREPEND(m, sizeof(*aph), M_TRYWAIT);
+    M_PREPEND(m, sizeof(*aph), MB_TRYWAIT);
     if (m == NULL) {
         error = ENOBUFS;
 	goto out;
@@ -599,7 +599,7 @@
        * send the data.   we must put an atm_pseudohdr on first
        */
 
-      M_PREPEND(m, sizeof(*aph), M_TRYWAIT);
+      M_PREPEND(m, sizeof(*aph), MB_TRYWAIT);
       if (m == NULL) {
         error = ENOBUFS;
 	break;
Index: src/sys/netncp/ncp_mod.c
===================================================================
RCS file: /home/ncvs/src/sys/netncp/ncp_mod.c,v
retrieving revision 1.5
diff -u -r1.5 ncp_mod.c
--- src/sys/netncp/ncp_mod.c	22 Mar 2001 10:38:16 -0000	1.5
+++ src/sys/netncp/ncp_mod.c	21 Feb 2003 16:40:56 -0000
@@ -132,7 +132,7 @@
 		return error;
 	if (rqsize) {
 		error = mb_put_mem(&rqp->rq, (caddr_t)uap->ncpbuf->packet,
-		    rqsize, MB_MUSER);
+		    rqsize, MBC_MUSER);
 		if (error)
 			goto bad;
 	}
@@ -140,7 +140,7 @@
 	error = ncp_request(rqp);
 	if (error == 0 && rqp->nr_rpsize)
 		error = md_get_mem(&rqp->rp, (caddr_t)uap->ncpbuf->packet, 
-				rqp->nr_rpsize, MB_MUSER);
+				rqp->nr_rpsize, MBC_MUSER);
 	copyout(&rqp->nr_cs, &uap->ncpbuf->cs, sizeof(rqp->nr_cs));
 	copyout(&rqp->nr_cc, &uap->ncpbuf->cc, sizeof(rqp->nr_cc));
 	copyout(&rqp->nr_rpsize, &uap->ncpbuf->rpsize, sizeof(rqp->nr_rpsize));
@@ -410,7 +410,7 @@
 	if (error)
 		return error;
 	for(fp = nfp->rqf, i = 0; i < nfp->rqfcnt; i++, fp++) {
-		error = mb_put_mem(&rqp->rq, (caddr_t)fp->fragAddress, fp->fragSize, MB_MUSER);
+		error = mb_put_mem(&rqp->rq, (caddr_t)fp->fragAddress, fp->fragSize, MBC_MUSER);
 		if (error)
 			goto bad;
 	}
@@ -425,7 +425,7 @@
 			if (error)
 				break;
 			fsize = min(fsize, rpsize);
-			error = md_get_mem(&rqp->rp, (caddr_t)fp->fragAddress, fsize, MB_MUSER);
+			error = md_get_mem(&rqp->rp, (caddr_t)fp->fragAddress, fsize, MBC_MUSER);
 			if (error)
 				break;
 			rpsize -= fsize;
Index: src/sys/netncp/ncp_ncp.c
===================================================================
RCS file: /home/ncvs/src/sys/netncp/ncp_ncp.c,v
retrieving revision 1.13
diff -u -r1.13 ncp_ncp.c
--- src/sys/netncp/ncp_ncp.c	14 Feb 2003 09:16:43 -0000	1.13
+++ src/sys/netncp/ncp_ncp.c	21 Feb 2003 16:40:56 -0000
@@ -284,7 +284,7 @@
 		return error;
 	md_get_uint32be(&rqp->rp, &target->object_id);
 	md_get_uint16be(&rqp->rp, &target->object_type);
-	md_get_mem(&rqp->rp, (caddr_t)target->object_name, 48, MB_MSYSTEM);
+	md_get_mem(&rqp->rp, (caddr_t)target->object_name, 48, MBC_MSYSTEM);
 	ncp_rq_done(rqp);
 	return 0;
 }
@@ -305,7 +305,7 @@
 	error = ncp_request(rqp);
 	if (error)
 		return error;
-	md_get_mem(&rqp->rp, target, 8, MB_MSYSTEM);
+	md_get_mem(&rqp->rp, target, 8, MBC_MSYSTEM);
 	ncp_rq_done(rqp);
 	return error;
 }
@@ -356,7 +356,7 @@
 	if (error)
 		return error;
 	mbp = &rqp->rq;
-	mb_put_mem(mbp, encrypted, 8, MB_MSYSTEM);
+	mb_put_mem(mbp, encrypted, 8, MBC_MSYSTEM);
 	mb_put_uint16be(mbp, object->object_type);
 	ncp_rq_pstring(rqp, object->object_name);
 	error = ncp_request(rqp);
@@ -414,7 +414,7 @@
 				break;
 			mbp = &rqp->rq;
 			mb_put_uint8(mbp, 0);
-			mb_put_mem(mbp, (caddr_t)file, 6, MB_MSYSTEM);
+			mb_put_mem(mbp, (caddr_t)file, 6, MBC_MSYSTEM);
 			mb_put_uint32be(mbp, uiop->uio_offset);
 			mb_put_uint16be(mbp, len);
 			rqp->nr_minrplen = 2;
@@ -423,7 +423,7 @@
 				break;
 			md_get_uint16be(&rqp->rp, &retlen);
 			if (uiop->uio_offset & 1)
-				md_get_mem(&rqp->rp, NULL, 1, MB_MSYSTEM);
+				md_get_mem(&rqp->rp, NULL, 1, MBC_MSYSTEM);
 			error = md_get_uio(&rqp->rp, uiop, retlen);
 			ncp_rq_done(rqp);
 		} else {
@@ -464,7 +464,7 @@
 			break;
 		mbp = &rqp->rq;
 		mb_put_uint8(mbp, 0);
-		mb_put_mem(mbp, (caddr_t)file, 6, MB_MSYSTEM);
+		mb_put_mem(mbp, (caddr_t)file, 6, MBC_MSYSTEM);
 		mb_put_uint32be(mbp, uiop->uio_offset);
 		mb_put_uint16be(mbp, len);
 		error = mb_put_uio(mbp, uiop, len);
Index: src/sys/netncp/ncp_rq.c
===================================================================
RCS file: /home/ncvs/src/sys/netncp/ncp_rq.c,v
retrieving revision 1.11
diff -u -r1.11 ncp_rq.c
--- src/sys/netncp/ncp_rq.c	19 Feb 2003 05:47:37 -0000	1.11
+++ src/sys/netncp/ncp_rq.c	21 Feb 2003 16:40:56 -0000
@@ -164,7 +164,7 @@
 	mb_put_uint8(mbp, size);
 	mbp->mb_copy = ncp_rq_pathstrhelp;
 	mbp->mb_udata = nt;
-	return mb_put_mem(mbp, (c_caddr_t)name, size, MB_MCUSTOM);
+	return mb_put_mem(mbp, (c_caddr_t)name, size, MBC_MCUSTOM);
 }
 
 int 
@@ -178,7 +178,7 @@
 	error = mb_put_uint8(&rqp->rq, len);
 	if (error)
 		return error;
-	return mb_put_mem(&rqp->rq, s, len, MB_MSYSTEM);
+	return mb_put_mem(&rqp->rq, s, len, MBC_MSYSTEM);
 }
 
 int 
@@ -189,7 +189,7 @@
 	int complen;
 
 	mb_put_uint8(mbp, vol_num);
-	mb_put_mem(mbp, (c_caddr_t)&dir_base, sizeof(dir_base), MB_MSYSTEM);
+	mb_put_mem(mbp, (c_caddr_t)&dir_base, sizeof(dir_base), MBC_MSYSTEM);
 	mb_put_uint8(mbp, 1);	/* with dirbase */
 	if (path != NULL && path[0]) {
 		if (namelen < 0) {
@@ -198,7 +198,7 @@
 			for(; namelen; namelen--) {
 				complen = *path++;
 				mb_put_uint8(mbp, complen);
-				mb_put_mem(mbp, path, complen, MB_MSYSTEM);
+				mb_put_mem(mbp, path, complen, MBC_MSYSTEM);
 				path += complen;
 			}
 		} else {
@@ -228,7 +228,7 @@
 	m_copydata(rqp->rq.mb_top, sizeof(struct ncp_rqhdr) - 1,
 		min((*size) - sizeof(struct ncp_rqhdr)+1, 52), data + 12);
 	ncp_sign(conn->sign_state, data, conn->sign_state);
-	error = mb_put_mem(&rqp->rq, (caddr_t)conn->sign_state, 8, MB_MSYSTEM);
+	error = mb_put_mem(&rqp->rq, (caddr_t)conn->sign_state, 8, MBC_MSYSTEM);
 	if (error)
 		return error;
 	(*size) += 8;
@@ -405,7 +405,7 @@
 		ncp_conn_invalidate(conn);
 		error = ECONNRESET;
 	}
-	md_get_mem(&rqp->rp, NULL, sizeof(*rp), MB_MSYSTEM);
+	md_get_mem(&rqp->rp, NULL, sizeof(*rp), MBC_MSYSTEM);
 	return error;
 }
 
Index: src/sys/netncp/ncp_sock.c
===================================================================
RCS file: /home/ncvs/src/sys/netncp/ncp_sock.c,v
retrieving revision 1.12
diff -u -r1.12 ncp_sock.c
--- src/sys/netncp/ncp_sock.c	19 Feb 2003 05:47:37 -0000	1.12
+++ src/sys/netncp/ncp_sock.c	21 Feb 2003 16:40:57 -0000
@@ -163,7 +163,7 @@
 	int sendwait;
 
 	for(;;) {
-		m = m_copym(top, 0, M_COPYALL, M_TRYWAIT);
+		m = m_copym(top, 0, M_COPYALL, MB_TRYWAIT);
 /*		NCPDDEBUG(m);*/
 		error = so->so_proto->pr_usrreqs->pru_sosend(so, to, 0, m, 0, flags, p);
 		if (error == 0 || error == EINTR || error == ENETDOWN)
Index: src/sys/netns/idp_usrreq.c
===================================================================
RCS file: /home/ncvs/src/sys/netns/idp_usrreq.c,v
retrieving revision 1.15
diff -u -r1.15 idp_usrreq.c
--- src/sys/netns/idp_usrreq.c	19 Feb 2003 05:47:37 -0000	1.15
+++ src/sys/netns/idp_usrreq.c	21 Feb 2003 16:40:58 -0000
@@ -160,7 +160,7 @@
 			(m->m_len + m->m_data < &m->m_dat[MLEN])) {
 			m->m_len++;
 		} else {
-			struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
+			struct mbuf *m1 = m_get(MB_DONTWAIT, MT_DATA);
 
 			if (m1 == 0) {
 				m_freem(m0);
@@ -181,7 +181,7 @@
 	if (nsp->nsp_flags & NSP_RAWOUT) {
 		idp = mtod(m, struct idp *);
 	} else {
-		M_PREPEND(m, sizeof (struct idp), M_DONTWAIT);
+		M_PREPEND(m, sizeof (struct idp), MB_DONTWAIT);
 		if (m == 0)
 			return (ENOBUFS);
 		idp = mtod(m, struct idp *);
@@ -273,7 +273,7 @@
 	case PRCO_GETOPT:
 		if (value==NULL)
 			return (EINVAL);
-		m = m_get(M_DONTWAIT, MT_DATA);
+		m = m_get(MB_DONTWAIT, MT_DATA);
 		if (m==NULL)
 			return (ENOBUFS);
 		switch (name) {
Index: src/sys/netns/ns_error.c
===================================================================
RCS file: /home/ncvs/src/sys/netns/ns_error.c,v
retrieving revision 1.11
diff -u -r1.11 ns_error.c
--- src/sys/netns/ns_error.c	19 Feb 2003 05:47:37 -0000	1.11
+++ src/sys/netns/ns_error.c	21 Feb 2003 16:40:58 -0000
@@ -135,7 +135,7 @@
 	/*
 	 * First, formulate ns_err message
 	 */
-	m = m_gethdr(M_DONTWAIT, MT_HEADER);
+	m = m_gethdr(MB_DONTWAIT, MT_HEADER);
 	if (m == NULL)
 		goto freeit;
 	m->m_len = sizeof(*ep);
Index: src/sys/netns/ns_input.c
===================================================================
RCS file: /home/ncvs/src/sys/netns/ns_input.c,v
retrieving revision 1.18
diff -u -r1.18 ns_input.c
--- src/sys/netns/ns_input.c	19 Feb 2003 05:47:37 -0000	1.18
+++ src/sys/netns/ns_input.c	21 Feb 2003 16:40:59 -0000
@@ -470,7 +470,7 @@
 		if (m0) {
 			register struct idp *idp;
 
-			M_PREPEND(m0, sizeof (*idp), M_DONTWAIT);
+			M_PREPEND(m0, sizeof (*idp), MB_DONTWAIT);
 			if (m0 == NULL)
 				continue;
 			idp = mtod(m0, struct idp *);
Index: src/sys/netns/ns_ip.c
===================================================================
RCS file: /home/ncvs/src/sys/netns/ns_ip.c,v
retrieving revision 1.13
diff -u -r1.13 ns_ip.c
--- src/sys/netns/ns_ip.c	19 Feb 2003 05:47:37 -0000	1.13
+++ src/sys/netns/ns_ip.c	21 Feb 2003 16:41:00 -0000
@@ -168,7 +168,7 @@
 		if (nsip_lastin) {
 			m_freem(nsip_lastin);
 		}
-		nsip_lastin = m_copym(m, 0, (int)M_COPYALL, M_DONTWAIT);
+		nsip_lastin = m_copym(m, 0, (int)M_COPYALL, MB_DONTWAIT);
 	}
 	/*
 	 * Get IP and IDP header together in first mbuf.
@@ -251,7 +251,7 @@
 	/* following clause not necessary on vax */
 	if (3 & (int)m->m_data) {
 		/* force longword alignment of ip hdr */
-		struct mbuf *m0 = m_gethdr(MT_HEADER, M_DONTWAIT);
+		struct mbuf *m0 = m_gethdr(MT_HEADER, MB_DONTWAIT);
 		if (m0 == 0) {
 			m_freem(m);
 			return (ENOBUFS);
@@ -263,7 +263,7 @@
 		m0->m_pkthdr.len = m0->m_len + m->m_len;
 		m->m_flags &= ~M_PKTHDR;
 	} else {
-		M_PREPEND(m, sizeof (struct ip), M_DONTWAIT);
+		M_PREPEND(m, sizeof (struct ip), MB_DONTWAIT);
 		if (m == 0)
 			return (ENOBUFS);
 	}
Index: src/sys/netns/ns_pcb.c
===================================================================
RCS file: /home/ncvs/src/sys/netns/ns_pcb.c,v
retrieving revision 1.14
diff -u -r1.14 ns_pcb.c
--- src/sys/netns/ns_pcb.c	19 Feb 2003 05:47:37 -0000	1.14
+++ src/sys/netns/ns_pcb.c	21 Feb 2003 16:41:00 -0000
@@ -58,7 +58,7 @@
 	struct mbuf *m;
 	register struct nspcb *nsp;
 
-	m = m_getclr(M_DONTWAIT, MT_PCB);
+	m = m_getclr(MB_DONTWAIT, MT_PCB);
 	if (m == NULL)
 		return (ENOBUFS);
 	nsp = mtod(m, struct nspcb *);
Index: src/sys/netns/spp_usrreq.c
===================================================================
RCS file: /home/ncvs/src/sys/netns/spp_usrreq.c,v
retrieving revision 1.19
diff -u -r1.19 spp_usrreq.c
--- src/sys/netns/spp_usrreq.c	19 Feb 2003 05:47:38 -0000	1.19
+++ src/sys/netns/spp_usrreq.c	21 Feb 2003 16:41:02 -0000
@@ -161,7 +161,7 @@
 			spp_istat.gonawy++;
 			goto dropwithreset;
 		}
-		am = m_get(M_DONTWAIT, MT_SONAME);
+		am = m_get(MB_DONTWAIT, MT_SONAME);
 		if (am == NULL)
 			goto drop;
 		am->m_len = sizeof (struct sockaddr_ns);
@@ -528,7 +528,7 @@
 				spp_newchecks[4]++;
 				if (dt != cb->s_rhdr.sp_dt) {
 					struct mbuf *mm =
-					   m_getclr(M_DONTWAIT, MT_CONTROL);
+					   m_getclr(MB_DONTWAIT, MT_CONTROL);
 					spp_newchecks[0]++;
 					if (mm != NULL) {
 						u_short *s =
@@ -742,7 +742,7 @@
 					 * from usrreq(), so it is OK to
 					 * block.
 					 */
-					m = m_copym(m0, 0, mtu, M_TRYWAIT);
+					m = m_copym(m0, 0, mtu, MB_TRYWAIT);
 					if (cb->s_flags & SF_NEWCALL) {
 					    struct mbuf *mm = m;
 					    spp_newchecks[7]++;
@@ -772,7 +772,7 @@
 			if (M_TRAILINGSPACE(m) >= 1)
 				m->m_len++;
 			else {
-				struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
+				struct mbuf *m1 = m_get(MB_DONTWAIT, MT_DATA);
 
 				if (m1 == 0) {
 					m_freem(m0);
@@ -783,7 +783,7 @@
 				m->m_next = m1;
 			}
 		}
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
+		m = m_gethdr(MB_DONTWAIT, MT_HEADER);
 		if (m == 0) {
 			m_freem(m0);
 			return (ENOBUFS);
@@ -996,7 +996,7 @@
 			sppstat.spps_sndprobe++;
 		if (cb->s_flags & SF_ACKNOW)
 			sppstat.spps_sndacks++;
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
+		m = m_gethdr(MB_DONTWAIT, MT_HEADER);
 		if (m == 0)
 			return (ENOBUFS);
 		/*
@@ -1156,7 +1156,7 @@
 	case PRCO_GETOPT:
 		if (value == NULL)
 			return (EINVAL);
-		m = m_get(M_DONTWAIT, MT_DATA);
+		m = m_get(MB_DONTWAIT, MT_DATA);
 		if (m == NULL)
 			return (ENOBUFS);
 		switch (name) {
@@ -1296,7 +1296,7 @@
 		}
 		nsp = sotonspcb(so);
 
-		mm = m_getclr(M_DONTWAIT, MT_PCB);
+		mm = m_getclr(MB_DONTWAIT, MT_PCB);
 		sb = &so->so_snd;
 
 		if (mm == NULL) {
@@ -1304,7 +1304,7 @@
 			break;
 		}
 		cb = mtod(mm, struct sppcb *);
-		mm = m_getclr(M_DONTWAIT, MT_HEADER);
+		mm = m_getclr(MB_DONTWAIT, MT_HEADER);
 		if (mm == NULL) {
 			(void) m_free(dtom(m));
 			error = ENOBUFS;
Index: src/sys/netsmb/smb_iod.c
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_iod.c,v
retrieving revision 1.10
diff -u -r1.10 smb_iod.c
--- src/sys/netsmb/smb_iod.c	19 Feb 2003 05:47:38 -0000	1.10
+++ src/sys/netsmb/smb_iod.c	21 Feb 2003 16:41:03 -0000
@@ -248,7 +248,7 @@
 	}
 	SMBSDEBUG("M:%04x, P:%04x, U:%04x, T:%04x\n", rqp->sr_mid, 0, 0, 0);
 	m_dumpm(rqp->sr_rq.mb_top);
-	m = m_copym(rqp->sr_rq.mb_top, 0, M_COPYALL, M_TRYWAIT);
+	m = m_copym(rqp->sr_rq.mb_top, 0, M_COPYALL, MB_TRYWAIT);
 	error = rqp->sr_lerror = m ? SMB_TRAN_SEND(vcp, m, td) : ENOBUFS;
 	if (error == 0) {
 		getnanotime(&rqp->sr_timesent);
Index: src/sys/netsmb/smb_rq.c
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_rq.c,v
retrieving revision 1.11
diff -u -r1.11 smb_rq.c
--- src/sys/netsmb/smb_rq.c	19 Feb 2003 05:47:38 -0000	1.11
+++ src/sys/netsmb/smb_rq.c	21 Feb 2003 16:41:04 -0000
@@ -119,7 +119,7 @@
 	error = mb_init(mbp);
 	if (error)
 		return error;
-	mb_put_mem(mbp, SMB_SIGNATURE, SMB_SIGLEN, MB_MSYSTEM);
+	mb_put_mem(mbp, SMB_SIGNATURE, SMB_SIGLEN, MBC_MSYSTEM);
 	mb_put_uint8(mbp, cmd);
 	mb_put_uint32le(mbp, 0);		/* DosError */
 	mb_put_uint8(mbp, vcp->vc_hflags);
@@ -127,7 +127,7 @@
 		mb_put_uint16le(mbp, (vcp->vc_hflags2 & ~SMB_FLAGS2_UNICODE));
 	else
 		mb_put_uint16le(mbp, vcp->vc_hflags2);
-	mb_put_mem(mbp, tzero, 12, MB_MSYSTEM);
+	mb_put_mem(mbp, tzero, 12, MBC_MSYSTEM);
 	rqp->sr_rqtid = (u_int16_t*)mb_reserve(mbp, sizeof(u_int16_t));
 	mb_put_uint16le(mbp, 1 /*scred->sc_p->p_pid & 0xffff*/);
 	rqp->sr_rquid = (u_int16_t*)mb_reserve(mbp, sizeof(u_int16_t));
@@ -418,7 +418,7 @@
 	struct mbuf *m, *m0;
 	int len;
 
-	m0 = m_split(mtop, offset, M_TRYWAIT);
+	m0 = m_split(mtop, offset, MB_TRYWAIT);
 	if (m0 == NULL)
 		return EBADRPC;
 	len = m_length(m0, &m);
@@ -620,11 +620,11 @@
 	smb_rq_bstart(rqp);
 	/* TDUNICODE */
 	if (t2p->t_name)
-		mb_put_mem(mbp, t2p->t_name, nmlen, MB_MSYSTEM);
+		mb_put_mem(mbp, t2p->t_name, nmlen, MBC_MSYSTEM);
 	mb_put_uint8(mbp, 0);	/* terminating zero */
 	len = mb_fixhdr(mbp);
 	if (txpcount) {
-		mb_put_mem(mbp, NULL, ALIGN4(len) - len, MB_MZERO);
+		mb_put_mem(mbp, NULL, ALIGN4(len) - len, MBC_MZERO);
 		error = md_get_mbuf(&mbparam, txpcount, &m);
 		SMBSDEBUG("%d:%d:%d\n", error, txpcount, txmax);
 		if (error)
@@ -633,7 +633,7 @@
 	}
 	len = mb_fixhdr(mbp);
 	if (txdcount) {
-		mb_put_mem(mbp, NULL, ALIGN4(len) - len, MB_MZERO);
+		mb_put_mem(mbp, NULL, ALIGN4(len) - len, MBC_MZERO);
 		error = md_get_mbuf(&mbdata, txdcount, &m);
 		if (error)
 			goto freerq;
@@ -693,7 +693,7 @@
 		mb_put_uint8(mbp, 0);	/* name */
 		len = mb_fixhdr(mbp);
 		if (txpcount) {
-			mb_put_mem(mbp, NULL, ALIGN4(len) - len, MB_MZERO);
+			mb_put_mem(mbp, NULL, ALIGN4(len) - len, MBC_MZERO);
 			error = md_get_mbuf(&mbparam, txpcount, &m);
 			if (error)
 				goto bad;
@@ -701,7 +701,7 @@
 		}
 		len = mb_fixhdr(mbp);
 		if (txdcount) {
-			mb_put_mem(mbp, NULL, ALIGN4(len) - len, MB_MZERO);
+			mb_put_mem(mbp, NULL, ALIGN4(len) - len, MBC_MZERO);
 			error = md_get_mbuf(&mbdata, txdcount, &m);
 			if (error)
 				goto bad;
Index: src/sys/netsmb/smb_rq.h
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_rq.h,v
retrieving revision 1.2
diff -u -r1.2 smb_rq.h
--- src/sys/netsmb/smb_rq.h	31 Dec 2001 19:29:43 -0000	1.2
+++ src/sys/netsmb/smb_rq.h	21 Feb 2003 16:41:05 -0000
@@ -34,7 +34,7 @@
 #ifndef _NETSMB_SMB_RQ_H_
 #define	_NETSMB_SMB_RQ_H_
 
-#ifndef MB_MSYSTEM
+#ifndef MBC_MSYSTEM
 #include <sys/mchain.h>
 #endif
 
Index: src/sys/netsmb/smb_smb.c
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_smb.c,v
retrieving revision 1.10
diff -u -r1.10 smb_smb.c
--- src/sys/netsmb/smb_smb.c	19 Feb 2003 05:47:38 -0000	1.10
+++ src/sys/netsmb/smb_smb.c	21 Feb 2003 16:41:05 -0000
@@ -168,7 +168,7 @@
 			md_get_uint32le(mdp, &sp->sv_maxraw);
 			md_get_uint32le(mdp, &sp->sv_skey);
 			md_get_uint32le(mdp, &sp->sv_caps);
-			md_get_mem(mdp, stime, 8, MB_MSYSTEM);
+			md_get_mem(mdp, stime, 8, MBC_MSYSTEM);
 			md_get_uint16le(mdp, (u_int16_t*)&sp->sv_tz);
 			md_get_uint8(mdp, &sblen);
 			if (sblen && (sp->sv_sm & SMB_SM_ENCRYPT)) {
@@ -180,8 +180,8 @@
 				if (error)
 					break;
 				if (sp->sv_caps & SMB_CAP_EXT_SECURITY)
-					md_get_mem(mdp, NULL, 16, MB_MSYSTEM);
-				error = md_get_mem(mdp, vcp->vc_ch, sblen, MB_MSYSTEM);
+					md_get_mem(mdp, NULL, 16, MBC_MSYSTEM);
+				error = md_get_mem(mdp, vcp->vc_ch, sblen, MBC_MSYSTEM);
 				if (error)
 					break;
 				vcp->vc_chlen = sblen;
@@ -216,7 +216,7 @@
 				if (bc < swlen)
 					break;
 				if (swlen && (sp->sv_sm & SMB_SM_ENCRYPT)) {
-					error = md_get_mem(mdp, vcp->vc_ch, swlen, MB_MSYSTEM);
+					error = md_get_mem(mdp, vcp->vc_ch, swlen, MBC_MSYSTEM);
 					if (error)
 						break;
 					vcp->vc_chlen = swlen;
@@ -363,7 +363,7 @@
 		mb_put_uint32le(mbp, 0);
 		smb_rq_wend(rqp);
 		smb_rq_bstart(rqp);
-		mb_put_mem(mbp, pp, plen, MB_MSYSTEM);
+		mb_put_mem(mbp, pp, plen, MBC_MSYSTEM);
 		smb_put_dstring(mbp, vcp, up, SMB_CS_NONE);
 	} else {
 		mb_put_uint16le(mbp, uniplen);
@@ -372,8 +372,8 @@
 				     SMB_CAP_UNICODE : 0);
 		smb_rq_wend(rqp);
 		smb_rq_bstart(rqp);
-		mb_put_mem(mbp, pp, plen, MB_MSYSTEM);
-		mb_put_mem(mbp, (caddr_t)unipp, uniplen, MB_MSYSTEM);
+		mb_put_mem(mbp, pp, plen, MBC_MSYSTEM);
+		mb_put_mem(mbp, (caddr_t)unipp, uniplen, MBC_MSYSTEM);
 		smb_put_dstring(mbp, vcp, up, SMB_CS_NONE);		/* AccountName */
 		smb_put_dstring(mbp, vcp, vcp->vc_domain, SMB_CS_NONE);	/* PrimaryDomain */
 		smb_put_dstring(mbp, vcp, "FreeBSD", SMB_CS_NONE);	/* Client's OS */
@@ -534,7 +534,7 @@
 	mb_put_uint16le(mbp, plen);
 	smb_rq_wend(rqp);
 	smb_rq_bstart(rqp);
-	mb_put_mem(mbp, pp, plen, MB_MSYSTEM);
+	mb_put_mem(mbp, pp, plen, MBC_MSYSTEM);
 	smb_put_dmem(mbp, vcp, "\\\\", 2, caseopt);
 	pp = vcp->vc_srvname;
 	smb_put_dmem(mbp, vcp, pp, strlen(pp), caseopt);
@@ -606,7 +606,7 @@
 	mb_put_uint8(mbp, 0xff);	/* no secondary command */
 	mb_put_uint8(mbp, 0);		/* MBZ */
 	mb_put_uint16le(mbp, 0);	/* offset to secondary */
-	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MBC_MSYSTEM);
 	mb_put_uint32le(mbp, uio->uio_offset);
 	*len = min(SSTOVC(ssp)->vc_rxmax, *len);
 	mb_put_uint16le(mbp, *len);	/* MaxCount */
@@ -648,12 +648,12 @@
 		md_get_uint16le(mdp, &residhi);
 		off += 2;
 		resid = (residhi << 16) | residlo;
-		md_get_mem(mdp, NULL, 4 * 2, MB_MSYSTEM);
+		md_get_mem(mdp, NULL, 4 * 2, MBC_MSYSTEM);
 		off += 4*2;
 		md_get_uint16le(mdp, NULL);	/* ByteCount */
 		off += 2;
 		if (doff > off)	/* pad byte(s)? */
-			md_get_mem(mdp, NULL, doff - off, MB_MSYSTEM);
+			md_get_mem(mdp, NULL, doff - off, MBC_MSYSTEM);
 		if (resid == 0) {
 			*rresid = resid;
 			break;
@@ -686,7 +686,7 @@
 	mb_put_uint8(mbp, 0xff);	/* no secondary command */
 	mb_put_uint8(mbp, 0);		/* MBZ */
 	mb_put_uint16le(mbp, 0);	/* offset to secondary */
-	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MBC_MSYSTEM);
 	mb_put_uint32le(mbp, uio->uio_offset);
 	mb_put_uint32le(mbp, 0);	/* MBZ (timeout) */
 	mb_put_uint16le(mbp, 0);	/* !write-thru */
@@ -747,7 +747,7 @@
 
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
-	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MBC_MSYSTEM);
 	mb_put_uint16le(mbp, rlen);
 	mb_put_uint32le(mbp, uio->uio_offset);
 	mb_put_uint16le(mbp, min(uio->uio_resid, 0xffff));
@@ -765,7 +765,7 @@
 			break;
 		}
 		md_get_uint16le(mdp, &resid);
-		md_get_mem(mdp, NULL, 4 * 2, MB_MSYSTEM);
+		md_get_mem(mdp, NULL, 4 * 2, MBC_MSYSTEM);
 		md_get_uint16le(mdp, &bc);
 		md_get_uint8(mdp, NULL);		/* ignore buffer type */
 		md_get_uint16le(mdp, &resid);
@@ -827,7 +827,7 @@
 		return error;
 	smb_rq_getrequest(rqp, &mbp);
 	smb_rq_wstart(rqp);
-	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MB_MSYSTEM);
+	mb_put_mem(mbp, (caddr_t)&fid, sizeof(fid), MBC_MSYSTEM);
 	mb_put_uint16le(mbp, resid);
 	mb_put_uint32le(mbp, uio->uio_offset);
 	mb_put_uint16le(mbp, min(uio->uio_resid, 0xffff));
Index: src/sys/netsmb/smb_subr.c
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_subr.c,v
retrieving revision 1.14
diff -u -r1.14 smb_subr.c
--- src/sys/netsmb/smb_subr.c	19 Feb 2003 05:47:38 -0000	1.14
+++ src/sys/netsmb/smb_subr.c	21 Feb 2003 16:41:06 -0000
@@ -327,11 +327,11 @@
 	if (size == 0)
 		return 0;
 	if (dp == NULL) {
-		return mb_put_mem(mbp, src, size, MB_MSYSTEM);
+		return mb_put_mem(mbp, src, size, MBC_MSYSTEM);
 	}
 	mbp->mb_copy = smb_copy_iconv;
 	mbp->mb_udata = dp;
-	return mb_put_mem(mbp, src, size, MB_MCUSTOM);
+	return mb_put_mem(mbp, src, size, MBC_MCUSTOM);
 }
 
 int
Index: src/sys/netsmb/smb_trantcp.c
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_trantcp.c,v
retrieving revision 1.17
diff -u -r1.17 smb_trantcp.c
--- src/sys/netsmb/smb_trantcp.c	19 Feb 2003 05:47:38 -0000	1.17
+++ src/sys/netsmb/smb_trantcp.c	21 Feb 2003 16:41:07 -0000
@@ -213,7 +213,7 @@
 	NBDEBUG("[%s]\n", cp);
 	for (;;) {
 		seglen = (*cp) + 1;
-		error = mb_put_mem(mbp, cp, seglen, MB_MSYSTEM);
+		error = mb_put_mem(mbp, cp, seglen, MBC_MSYSTEM);
 		if (error)
 			return error;
 		if (seglen == 1)
@@ -332,7 +332,7 @@
 			error = ECONNABORTED;
 			break;
 		}
-		md_get_mem(mdp, (caddr_t)&sin.sin_addr, 4, MB_MSYSTEM);
+		md_get_mem(mdp, (caddr_t)&sin.sin_addr, 4, MBC_MSYSTEM);
 		md_get_uint16(mdp, &port);
 		sin.sin_port = port;
 		nbp->nbp_state = NBST_RETARGET;
@@ -648,7 +648,7 @@
 		error = ENOTCONN;
 		goto abort;
 	}
-	M_PREPEND(m0, 4, M_TRYWAIT);
+	M_PREPEND(m0, 4, MB_TRYWAIT);
 	if (m0 == NULL)
 		return ENOBUFS;
 	nb_sethdr(m0, NB_SSN_MESSAGE, m_fixhdr(m0) - 4);
Index: src/sys/netsmb/smb_usr.c
===================================================================
RCS file: /home/ncvs/src/sys/netsmb/smb_usr.c,v
retrieving revision 1.3
diff -u -r1.3 smb_usr.c
--- src/sys/netsmb/smb_usr.c	18 Sep 2002 14:21:52 -0000	1.3
+++ src/sys/netsmb/smb_usr.c	21 Feb 2003 16:41:07 -0000
@@ -240,12 +240,12 @@
 		return error;
 	mbp = &rqp->sr_rq;
 	smb_rq_wstart(rqp);
-	error = mb_put_mem(mbp, dp->ioc_twords, dp->ioc_twc * 2, MB_MUSER);
+	error = mb_put_mem(mbp, dp->ioc_twords, dp->ioc_twc * 2, MBC_MUSER);
 	if (error)
 		goto bad;
 	smb_rq_wend(rqp);
 	smb_rq_bstart(rqp);
-	error = mb_put_mem(mbp, dp->ioc_tbytes, dp->ioc_tbc, MB_MUSER);
+	error = mb_put_mem(mbp, dp->ioc_tbytes, dp->ioc_tbc, MBC_MUSER);
 	if (error)
 		goto bad;
 	smb_rq_bend(rqp);
@@ -260,7 +260,7 @@
 		error = EBADRPC;
 		goto bad;
 	}
-	error = md_get_mem(mdp, dp->ioc_rpbuf, wc, MB_MUSER);
+	error = md_get_mem(mdp, dp->ioc_rpbuf, wc, MBC_MUSER);
 	if (error)
 		goto bad;
 	md_get_uint16le(mdp, &bc);
@@ -269,7 +269,7 @@
 		goto bad;
 	}
 	dp->ioc_rbc = bc;
-	error = md_get_mem(mdp, dp->ioc_rpbuf + wc, bc, MB_MUSER);
+	error = md_get_mem(mdp, dp->ioc_rpbuf + wc, bc, MBC_MUSER);
 bad:
 	dp->ioc_errclass = rqp->sr_errclass;
 	dp->ioc_serror = rqp->sr_serror;
@@ -289,7 +289,7 @@
 	error = mb_init(mbp);
 	if (error)
 		return error;
-	return mb_put_mem(mbp, data, len, MB_MUSER);
+	return mb_put_mem(mbp, data, len, MBC_MUSER);
 }
 
 int
@@ -336,7 +336,7 @@
 			goto bad;
 		}
 		dp->ioc_rparamcnt = len;
-		error = md_get_mem(mdp, dp->ioc_rparam, len, MB_MUSER);
+		error = md_get_mem(mdp, dp->ioc_rparam, len, MBC_MUSER);
 		if (error)
 			goto bad;
 	} else
@@ -349,7 +349,7 @@
 			goto bad;
 		}
 		dp->ioc_rdatacnt = len;
-		error = md_get_mem(mdp, dp->ioc_rdata, len, MB_MUSER);
+		error = md_get_mem(mdp, dp->ioc_rdata, len, MBC_MUSER);
 	} else
 		dp->ioc_rdatacnt = 0;
 bad:
Index: src/sys/nfs/nfs_common.c
===================================================================
RCS file: /home/ncvs/src/sys/nfs/nfs_common.c,v
retrieving revision 1.114
diff -u -r1.114 nfs_common.c
--- src/sys/nfs/nfs_common.c	19 Feb 2003 05:47:38 -0000	1.114
+++ src/sys/nfs/nfs_common.c	21 Feb 2003 16:41:08 -0000
@@ -191,7 +191,7 @@
 	} else if (siz > MHLEN) {
 		panic("nfs S too big");
 	} else {
-		MGET(mp2, M_TRYWAIT, MT_DATA);
+		MGET(mp2, MB_TRYWAIT, MT_DATA);
 		mp2->m_next = mp->m_next;
 		mp->m_next = mp2;
 		mp->m_len -= left;
@@ -254,7 +254,7 @@
 	void *ret;
 
 	if (s > M_TRAILINGSPACE(*mb)) {
-		MGET(mb2, M_TRYWAIT, MT_DATA);
+		MGET(mb2, MB_TRYWAIT, MT_DATA);
 		if (s > MLEN)
 			panic("build > MLEN");
 		(*mb)->m_next = mb2;
Index: src/sys/nfsclient/bootp_subr.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsclient/bootp_subr.c,v
retrieving revision 1.47
diff -u -r1.47 bootp_subr.c
--- src/sys/nfsclient/bootp_subr.c	19 Feb 2003 05:47:38 -0000	1.47
+++ src/sys/nfsclient/bootp_subr.c	21 Feb 2003 16:41:10 -0000
@@ -1942,7 +1942,7 @@
 		u_int32_t v3[21];
 	} fattribs;
 
-	m = m_get(M_TRYWAIT, MT_DATA);
+	m = m_get(MB_TRYWAIT, MT_DATA);
 	if (m == NULL)
 	  	return ENOBUFS;
 
Index: src/sys/nfsclient/krpc_subr.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsclient/krpc_subr.c,v
retrieving revision 1.22
diff -u -r1.22 krpc_subr.c
--- src/sys/nfsclient/krpc_subr.c	19 Feb 2003 05:47:38 -0000	1.22
+++ src/sys/nfsclient/krpc_subr.c	21 Feb 2003 16:41:10 -0000
@@ -149,7 +149,7 @@
 		return 0;
 	}
 
-	m = m_get(M_TRYWAIT, MT_DATA);
+	m = m_get(MB_TRYWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOBUFS;
 	sdata = mtod(m, struct sdata *);
@@ -271,7 +271,7 @@
 	/*
 	 * Prepend RPC message header.
 	 */
-	mhead = m_gethdr(M_TRYWAIT, MT_DATA);
+	mhead = m_gethdr(MB_TRYWAIT, MT_DATA);
 	mhead->m_next = *data;
 	call = mtod(mhead, struct rpc_call *);
 	mhead->m_len = sizeof(*call);
@@ -311,7 +311,7 @@
 	timo = 0;
 	for (;;) {
 		/* Send RPC request (or re-send). */
-		m = m_copym(mhead, 0, M_COPYALL, M_TRYWAIT);
+		m = m_copym(mhead, 0, M_COPYALL, MB_TRYWAIT);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
@@ -465,9 +465,9 @@
 	if (mlen > MCLBYTES)		/* If too big, we just can't do it. */
 		return (NULL);
 
-	m = m_get(M_TRYWAIT, MT_DATA);
+	m = m_get(MB_TRYWAIT, MT_DATA);
 	if (mlen > MLEN) {
-		MCLGET(m, M_TRYWAIT);
+		MCLGET(m, MB_TRYWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			(void) m_free(m);	/* There can be only one. */
 			return (NULL);
Index: src/sys/nfsclient/nfs_socket.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsclient/nfs_socket.c,v
retrieving revision 1.94
diff -u -r1.94 nfs_socket.c
--- src/sys/nfsclient/nfs_socket.c	19 Feb 2003 05:47:38 -0000	1.94
+++ src/sys/nfsclient/nfs_socket.c	21 Feb 2003 16:41:13 -0000
@@ -525,7 +525,7 @@
 			goto tryagain;
 		}
 		while (rep->r_flags & R_MUSTRESEND) {
-			m = m_copym(rep->r_mreq, 0, M_COPYALL, M_TRYWAIT);
+			m = m_copym(rep->r_mreq, 0, M_COPYALL, MB_TRYWAIT);
 			nfsstats.rpcretries++;
 			error = nfs_send(so, rep->r_nmp->nm_nam, m, rep);
 			if (error) {
@@ -887,7 +887,7 @@
 	 * For stream protocols, insert a Sun RPC Record Mark.
 	 */
 	if (nmp->nm_sotype == SOCK_STREAM) {
-		M_PREPEND(m, NFSX_UNSIGNED, M_TRYWAIT);
+		M_PREPEND(m, NFSX_UNSIGNED, MB_TRYWAIT);
 		*mtod(m, u_int32_t *) = htonl(0x80000000 |
 			 (m->m_pkthdr.len - NFSX_UNSIGNED));
 	}
@@ -928,7 +928,7 @@
 		if (nmp->nm_soflags & PR_CONNREQUIRED)
 			error = nfs_sndlock(rep);
 		if (!error) {
-			m2 = m_copym(m, 0, M_COPYALL, M_TRYWAIT);
+			m2 = m_copym(m, 0, M_COPYALL, MB_TRYWAIT);
 			error = nfs_send(nmp->nm_so, nmp->nm_nam, m2, rep);
 			if (nmp->nm_soflags & PR_CONNREQUIRED)
 				nfs_sndunlock(rep);
@@ -1127,7 +1127,7 @@
 		   ((nmp->nm_flag & NFSMNT_DUMBTIMR) ||
 		    (rep->r_flags & R_SENT) ||
 		    nmp->nm_sent < nmp->nm_cwnd) &&
-		   (m = m_copym(rep->r_mreq, 0, M_COPYALL, M_DONTWAIT))){
+		   (m = m_copym(rep->r_mreq, 0, M_COPYALL, MB_DONTWAIT))){
 			if ((nmp->nm_flag & NFSMNT_NOCONN) == 0)
 			    error = (*so->so_proto->pr_usrreqs->pru_send)
 				    (so, 0, m, NULL, NULL, td);
@@ -1378,9 +1378,9 @@
 	++nfs_realign_test;
 	while ((m = *pm) != NULL) {
 		if ((m->m_len & 0x3) || (mtod(m, intptr_t) & 0x3)) {
-			MGET(n, M_TRYWAIT, MT_DATA);
+			MGET(n, MB_TRYWAIT, MT_DATA);
 			if (m->m_len >= MINCLSIZE) {
-				MCLGET(n, M_TRYWAIT);
+				MCLGET(n, MB_TRYWAIT);
 			}
 			n->m_len = 0;
 			break;
Index: src/sys/nfsclient/nfs_subs.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsclient/nfs_subs.c,v
retrieving revision 1.117
diff -u -r1.117 nfs_subs.c
--- src/sys/nfsclient/nfs_subs.c	19 Feb 2003 05:47:38 -0000	1.117
+++ src/sys/nfsclient/nfs_subs.c	21 Feb 2003 16:41:13 -0000
@@ -142,9 +142,9 @@
 {
 	struct mbuf *mb;
 
-	MGET(mb, M_TRYWAIT, MT_DATA);
+	MGET(mb, MB_TRYWAIT, MT_DATA);
 	if (hsiz >= MINCLSIZE)
-		MCLGET(mb, M_TRYWAIT);
+		MCLGET(mb, MB_TRYWAIT);
 	mb->m_len = 0;
 	return (mb);
 }
@@ -168,9 +168,9 @@
 	int grpsiz, authsiz;
 
 	authsiz = nfsm_rndup(auth_len);
-	MGETHDR(mb, M_TRYWAIT, MT_DATA);
+	MGETHDR(mb, MB_TRYWAIT, MT_DATA);
 	if ((authsiz + 10 * NFSX_UNSIGNED) >= MINCLSIZE) {
-		MCLGET(mb, M_TRYWAIT);
+		MCLGET(mb, MB_TRYWAIT);
 	} else if ((authsiz + 10 * NFSX_UNSIGNED) < MHLEN) {
 		MH_ALIGN(mb, authsiz + 10 * NFSX_UNSIGNED);
 	} else {
@@ -271,9 +271,9 @@
 		while (left > 0) {
 			mlen = M_TRAILINGSPACE(mp);
 			if (mlen == 0) {
-				MGET(mp, M_TRYWAIT, MT_DATA);
+				MGET(mp, MB_TRYWAIT, MT_DATA);
 				if (clflg)
-					MCLGET(mp, M_TRYWAIT);
+					MCLGET(mp, MB_TRYWAIT);
 				mp->m_len = 0;
 				mp2->m_next = mp;
 				mp2 = mp;
@@ -304,7 +304,7 @@
 	}
 	if (rem > 0) {
 		if (rem > M_TRAILINGSPACE(mp)) {
-			MGET(mp, M_TRYWAIT, MT_DATA);
+			MGET(mp, MB_TRYWAIT, MT_DATA);
 			mp->m_len = 0;
 			mp2->m_next = mp;
 		}
@@ -349,9 +349,9 @@
 	}
 	/* Loop around adding mbufs */
 	while (siz > 0) {
-		MGET(m1, M_TRYWAIT, MT_DATA);
+		MGET(m1, MB_TRYWAIT, MT_DATA);
 		if (siz > MLEN)
-			MCLGET(m1, M_TRYWAIT);
+			MCLGET(m1, MB_TRYWAIT);
 		m1->m_len = NFSMSIZ(m1);
 		m2->m_next = m1;
 		m2 = m1;
Index: src/sys/nfsserver/nfs_serv.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsserver/nfs_serv.c,v
retrieving revision 1.130
diff -u -r1.130 nfs_serv.c
--- src/sys/nfsserver/nfs_serv.c	19 Feb 2003 05:47:39 -0000	1.130
+++ src/sys/nfsserver/nfs_serv.c	21 Feb 2003 16:41:18 -0000
@@ -656,8 +656,8 @@
 	len = 0;
 	i = 0;
 	while (len < NFS_MAXPATHLEN) {
-		MGET(nmp, M_TRYWAIT, MT_DATA);
-		MCLGET(nmp, M_TRYWAIT);
+		MGET(nmp, MB_TRYWAIT, MT_DATA);
+		MCLGET(nmp, MB_TRYWAIT);
 		nmp->m_len = NFSMSIZ(nmp);
 		if (len == 0)
 			mp3 = mp = nmp;
@@ -899,8 +899,8 @@
 				i++;
 			}
 			if (left > 0) {
-				MGET(m, M_TRYWAIT, MT_DATA);
-				MCLGET(m, M_TRYWAIT);
+				MGET(m, MB_TRYWAIT, MT_DATA);
+				MCLGET(m, MB_TRYWAIT);
 				m->m_len = 0;
 				m2->m_next = m;
 				m2 = m;
Index: src/sys/nfsserver/nfs_srvcache.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsserver/nfs_srvcache.c,v
retrieving revision 1.34
diff -u -r1.34 nfs_srvcache.c
--- src/sys/nfsserver/nfs_srvcache.c	19 Feb 2003 05:47:39 -0000	1.34
+++ src/sys/nfsserver/nfs_srvcache.c	21 Feb 2003 16:41:19 -0000
@@ -193,7 +193,7 @@
 			} else if (rp->rc_flag & RC_REPMBUF) {
 				nfsrvstats.srvcache_nonidemdonehits++;
 				*repp = m_copym(rp->rc_reply, 0, M_COPYALL,
-						M_TRYWAIT);
+						MB_TRYWAIT);
 				ret = RC_REPLY;
 			} else {
 				nfsrvstats.srvcache_idemdonehits++;
@@ -303,7 +303,7 @@
 					rp->rc_flag |= RC_REPSTATUS;
 				} else {
 					rp->rc_reply = m_copym(repmbuf,
-						0, M_COPYALL, M_TRYWAIT);
+						0, M_COPYALL, MB_TRYWAIT);
 					rp->rc_flag |= RC_REPMBUF;
 				}
 			}
Index: src/sys/nfsserver/nfs_srvsock.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsserver/nfs_srvsock.c,v
retrieving revision 1.81
diff -u -r1.81 nfs_srvsock.c
--- src/sys/nfsserver/nfs_srvsock.c	19 Feb 2003 05:47:39 -0000	1.81
+++ src/sys/nfsserver/nfs_srvsock.c	21 Feb 2003 16:41:20 -0000
@@ -148,7 +148,7 @@
 	nd->nd_repstat = err;
 	if (err && (nd->nd_flag & ND_NFSV3) == 0)	/* XXX recheck */
 		siz = 0;
-	MGETHDR(mreq, M_TRYWAIT, MT_DATA);
+	MGETHDR(mreq, MB_TRYWAIT, MT_DATA);
 	mb = mreq;
 	/*
 	 * If this is a big reply, use a cluster else
@@ -157,7 +157,7 @@
 	mreq->m_len = 6 * NFSX_UNSIGNED;
 	siz += RPC_REPLYSIZ;
 	if ((max_hdr + siz) >= MINCLSIZE) {
-		MCLGET(mreq, M_TRYWAIT);
+		MCLGET(mreq, MB_TRYWAIT);
 	} else
 		mreq->m_data += min(max_hdr, M_TRAILINGSPACE(mreq));
 	tl = mtod(mreq, u_int32_t *);
@@ -244,9 +244,9 @@
 	++nfs_realign_test;
 	while ((m = *pm) != NULL) {
 		if ((m->m_len & 0x3) || (mtod(m, intptr_t) & 0x3)) {
-			MGET(n, M_TRYWAIT, MT_DATA);
+			MGET(n, MB_TRYWAIT, MT_DATA);
 			if (m->m_len >= MINCLSIZE) {
-				MCLGET(n, M_TRYWAIT);
+				MCLGET(n, MB_TRYWAIT);
 			}
 			n->m_len = 0;
 			break;
@@ -403,7 +403,7 @@
  * Socket upcall routine for the nfsd sockets.
  * The caddr_t arg is a pointer to the "struct nfssvc_sock".
  * Essentially do as much as possible non-blocking, else punt and it will
- * be called with M_TRYWAIT from an nfsd.
+ * be called with MB_TRYWAIT from an nfsd.
  */
 void
 nfsrv_rcv(struct socket *so, void *arg, int waitflag)
@@ -421,7 +421,7 @@
 	/*
 	 * Define this to test for nfsds handling this under heavy load.
 	 */
-	if (waitflag == M_DONTWAIT) {
+	if (waitflag == MB_DONTWAIT) {
 		slp->ns_flag |= SLP_NEEDQ;
 		goto dorecs;
 	}
@@ -433,7 +433,7 @@
 		 * to an nfsd so that there is feedback to the TCP layer that
 		 * the nfs servers are heavily loaded.
 		 */
-		if (STAILQ_FIRST(&slp->ns_rec) && waitflag == M_DONTWAIT) {
+		if (STAILQ_FIRST(&slp->ns_rec) && waitflag == MB_DONTWAIT) {
 			slp->ns_flag |= SLP_NEEDQ;
 			goto dorecs;
 		}
@@ -509,7 +509,7 @@
 	 * Now try and process the request records, non-blocking.
 	 */
 dorecs:
-	if (waitflag == M_DONTWAIT &&
+	if (waitflag == MB_DONTWAIT &&
 		(STAILQ_FIRST(&slp->ns_rec)
 		 || (slp->ns_flag & (SLP_NEEDQ | SLP_DISCONN))))
 		nfsrv_wakenfsd(slp);
Index: src/sys/nfsserver/nfs_srvsubs.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsserver/nfs_srvsubs.c,v
retrieving revision 1.120
diff -u -r1.120 nfs_srvsubs.c
--- src/sys/nfsserver/nfs_srvsubs.c	19 Feb 2003 05:47:39 -0000	1.120
+++ src/sys/nfsserver/nfs_srvsubs.c	21 Feb 2003 16:41:22 -0000
@@ -1287,8 +1287,8 @@
 	if (*bp >= *be) {
 		if (*mp == mb)
 			(*mp)->m_len += *bp - bpos;
-		MGET(nmp, M_TRYWAIT, MT_DATA);
-		MCLGET(nmp, M_TRYWAIT);
+		MGET(nmp, MB_TRYWAIT, MT_DATA);
+		MCLGET(nmp, MB_TRYWAIT);
 		nmp->m_len = NFSMSIZ(nmp);
 		(*mp)->m_next = nmp;
 		*mp = nmp;
Index: src/sys/nfsserver/nfs_syscalls.c
===================================================================
RCS file: /home/ncvs/src/sys/nfsserver/nfs_syscalls.c,v
retrieving revision 1.86
diff -u -r1.86 nfs_syscalls.c
--- src/sys/nfsserver/nfs_syscalls.c	19 Feb 2003 05:47:39 -0000	1.86
+++ src/sys/nfsserver/nfs_syscalls.c	21 Feb 2003 16:41:22 -0000
@@ -345,7 +345,7 @@
 					slp->ns_flag &= ~SLP_NEEDQ;
 					(void) nfs_slplock(slp, 1);
 					nfsrv_rcv(slp->ns_so, (caddr_t)slp,
-						M_TRYWAIT);
+						MB_TRYWAIT);
 					nfs_slpunlock(slp);
 				}
 				error = nfsrv_dorec(slp, nfsd, &nd);
@@ -471,7 +471,7 @@
 			 * Record Mark.
 			 */
 			if (sotype == SOCK_STREAM) {
-				M_PREPEND(m, NFSX_UNSIGNED, M_TRYWAIT);
+				M_PREPEND(m, NFSX_UNSIGNED, MB_TRYWAIT);
 				*mtod(m, u_int32_t *) = htonl(0x80000000 | siz);
 			}
 			if (slp->ns_so->so_proto->pr_flags & PR_CONNREQUIRED)
Index: src/sys/pci/if_dc.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_dc.c,v
retrieving revision 1.94
diff -u -r1.94 if_dc.c
--- src/sys/pci/if_dc.c	19 Feb 2003 05:47:40 -0000	1.94
+++ src/sys/pci/if_dc.c	21 Feb 2003 16:41:27 -0000
@@ -2428,11 +2428,11 @@
 	c = &sc->dc_ldata->dc_rx_list[i];
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, MB_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -3192,11 +3192,11 @@
 	struct mbuf		*m_new, *m;
 
 	m = *m_head;
-	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 	if (m_new == NULL)
 		return(ENOBUFS);
 	if (m->m_pkthdr.len > MHLEN) {
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, MB_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
Index: src/sys/pci/if_de.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_de.c,v
retrieving revision 1.143
diff -u -r1.143 if_de.c
--- src/sys/pci/if_de.c	19 Feb 2003 05:47:40 -0000	1.143
+++ src/sys/pci/if_de.c	21 Feb 2003 16:41:35 -0000
@@ -195,7 +195,7 @@
      * either is connected so the transmit is the only way
      * to verify the connectivity.
      */
-    MGETHDR(m, M_DONTWAIT, MT_DATA);
+    MGETHDR(m, MB_DONTWAIT, MT_DATA);
     if (m == NULL)
 	return 0;
     /*
@@ -3545,12 +3545,12 @@
 	 */
 	if (accept || ms == NULL) {
 	    struct mbuf *m0;
-	    MGETHDR(m0, M_DONTWAIT, MT_DATA);
+	    MGETHDR(m0, MB_DONTWAIT, MT_DATA);
 	    if (m0 != NULL) {
 #if defined(TULIP_COPY_RXDATA)
 		if (!accept || total_len >= (MHLEN - 2)) {
 #endif
-		    MCLGET(m0, M_DONTWAIT);
+		    MCLGET(m0, MB_DONTWAIT);
 		    if ((m0->m_flags & M_EXT) == 0) {
 			m_freem(m0);
 			m0 = NULL;
@@ -4061,10 +4061,10 @@
 {
     struct mbuf *m0;
 #if MCLBYTES >= ETHERMTU + 18 && !defined(BIG_PACKET)
-    MGETHDR(m0, M_DONTWAIT, MT_DATA);
+    MGETHDR(m0, MB_DONTWAIT, MT_DATA);
     if (m0 != NULL) {
 	if (m->m_pkthdr.len > MHLEN) {
-	    MCLGET(m0, M_DONTWAIT);
+	    MCLGET(m0, MB_DONTWAIT);
 	    if ((m0->m_flags & M_EXT) == 0) {
 		m_freem(m);
 		m_freem(m0);
@@ -4081,9 +4081,9 @@
 
     while (len > 0) {
 	if (mlen == MHLEN) {
-	    MGETHDR(*mp, M_DONTWAIT, MT_DATA);
+	    MGETHDR(*mp, MB_DONTWAIT, MT_DATA);
 	} else {
-	    MGET(*mp, M_DONTWAIT, MT_DATA);
+	    MGET(*mp, MB_DONTWAIT, MT_DATA);
 	}
 	if (*mp == NULL) {
 	    m_freem(m0);
@@ -4091,7 +4091,7 @@
 	    break;
 	}
 	if (len > MLEN) {
-	    MCLGET(*mp, M_DONTWAIT);
+	    MCLGET(*mp, MB_DONTWAIT);
 	    if (((*mp)->m_flags & M_EXT) == 0) {
 		m_freem(m0);
 		m0 = NULL;
Index: src/sys/pci/if_mn.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_mn.c,v
retrieving revision 1.37
diff -u -r1.37 if_mn.c
--- src/sys/pci/if_mn.c	19 Feb 2003 05:47:41 -0000	1.37
+++ src/sys/pci/if_mn.c	21 Feb 2003 16:41:37 -0000
@@ -695,7 +695,7 @@
 	/* Setup a transmit chain with one descriptor */
 	/* XXX: we actually send a 1 byte packet */
 	dp = mn_alloc_desc();
-	MGETHDR(m, M_TRYWAIT, MT_DATA);
+	MGETHDR(m, MB_TRYWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOBUFS;
 	m->m_pkthdr.len = 0;
@@ -712,12 +712,12 @@
 
 	dp = mn_alloc_desc();
 	m = NULL;
-	MGETHDR(m, M_TRYWAIT, MT_DATA);
+	MGETHDR(m, MB_TRYWAIT, MT_DATA);
 	if (m == NULL) {
 		mn_free_desc(dp);
 		return (ENOBUFS);
 	}
-	MCLGET(m, M_TRYWAIT);
+	MCLGET(m, MB_TRYWAIT);
 	if ((m->m_flags & M_EXT) == 0) {
 		mn_free_desc(dp);
 		m_freem(m);
@@ -735,13 +735,13 @@
 		dp2 = dp;
 		dp = mn_alloc_desc();
 		m = NULL;
-		MGETHDR(m, M_TRYWAIT, MT_DATA);
+		MGETHDR(m, MB_TRYWAIT, MT_DATA);
 		if (m == NULL) {
 			mn_free_desc(dp);
 			m_freem(m);
 			return (ENOBUFS);
 		}
-		MCLGET(m, M_TRYWAIT);
+		MCLGET(m, MB_TRYWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			mn_free_desc(dp);
 			m_freem(m);
@@ -1183,12 +1183,12 @@
 
 		/* Replenish desc + mbuf supplies */
 		if (!m) {
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
+			MGETHDR(m, MB_DONTWAIT, MT_DATA);
 			if (m == NULL) {
 				mn_free_desc(dp);
 				return; /* ENOBUFS */
 			}
-			MCLGET(m, M_DONTWAIT);
+			MCLGET(m, MB_DONTWAIT);
 			if((m->m_flags & M_EXT) == 0) {
 				mn_free_desc(dp);
 				m_freem(m);
Index: src/sys/pci/if_pcn.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_pcn.c,v
retrieving revision 1.35
diff -u -r1.35 if_pcn.c
--- src/sys/pci/if_pcn.c	19 Feb 2003 05:47:41 -0000	1.35
+++ src/sys/pci/if_pcn.c	21 Feb 2003 16:41:39 -0000
@@ -775,11 +775,11 @@
 	c = &sc->pcn_ldata->pcn_rx_list[idx];
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, MB_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
Index: src/sys/pci/if_rl.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_rl.c,v
retrieving revision 1.87
diff -u -r1.87 if_rl.c
--- src/sys/pci/if_rl.c	19 Feb 2003 05:47:41 -0000	1.87
+++ src/sys/pci/if_rl.c	21 Feb 2003 16:41:41 -0000
@@ -1500,11 +1500,11 @@
 	 * per packet. We have to copy pretty much all the time.
 	 */
 
-	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 	if (m_new == NULL)
 		return(1);
 	if (m_head->m_pkthdr.len > MHLEN) {
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, MB_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(1);
Index: src/sys/pci/if_sf.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_sf.c,v
retrieving revision 1.49
diff -u -r1.49 if_sf.c
--- src/sys/pci/if_sf.c	19 Feb 2003 05:47:41 -0000	1.49
+++ src/sys/pci/if_sf.c	21 Feb 2003 16:41:43 -0000
@@ -924,11 +924,11 @@
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, MB_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1304,14 +1304,14 @@
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("sf%d: no memory for tx list\n", sc->sf_unit);
 			return(1);
 		}
 
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_DONTWAIT);
+			MCLGET(m_new, MB_DONTWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				printf("sf%d: no memory for tx list\n",
Index: src/sys/pci/if_sis.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_sis.c,v
retrieving revision 1.65
diff -u -r1.65 if_sis.c
--- src/sys/pci/if_sis.c	19 Feb 2003 05:47:41 -0000	1.65
+++ src/sys/pci/if_sis.c	21 Feb 2003 16:41:46 -0000
@@ -1544,7 +1544,7 @@
 		return(EINVAL);
 
 	if (m == NULL) {
-		m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+		m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
 		if (m == NULL)
 			return(ENOBUFS);
 	} else
Index: src/sys/pci/if_sk.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_sk.c,v
retrieving revision 1.54
diff -u -r1.54 if_sk.c
--- src/sys/pci/if_sk.c	19 Feb 2003 05:47:41 -0000	1.54
+++ src/sys/pci/if_sk.c	21 Feb 2003 16:41:49 -0000
@@ -688,7 +688,7 @@
 	if (m == NULL) {
 		caddr_t			*buf = NULL;
 
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
Index: src/sys/pci/if_ste.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_ste.c,v
retrieving revision 1.45
diff -u -r1.45 if_ste.c
--- src/sys/pci/if_ste.c	19 Feb 2003 05:47:41 -0000	1.45
+++ src/sys/pci/if_ste.c	21 Feb 2003 16:41:51 -0000
@@ -1142,10 +1142,10 @@
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, MB_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1519,13 +1519,13 @@
 		 * mbuf chain first. Bail out if we can't get the
 		 * new buffers. Code borrowed from if_fxp.c
 		 */
-		MGETHDR(mn, M_DONTWAIT, MT_DATA);
+		MGETHDR(mn, MB_DONTWAIT, MT_DATA);
 		if (mn == NULL) {
 			m_freem(m_head);
 			return ENOMEM;
 		}
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(mn, M_DONTWAIT);
+			MCLGET(mn, MB_DONTWAIT);
 			if ((mn->m_flags & M_EXT) == 0) {
 				m_freem(mn);
 				m_freem(m_head);
Index: src/sys/pci/if_ti.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_ti.c,v
retrieving revision 1.69
diff -u -r1.69 if_ti.c
--- src/sys/pci/if_ti.c	19 Feb 2003 05:47:41 -0000	1.69
+++ src/sys/pci/if_ti.c	21 Feb 2003 16:41:56 -0000
@@ -1130,11 +1130,11 @@
 	struct ti_rx_desc	*r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, MB_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1174,7 +1174,7 @@
 	struct ti_rx_desc	*r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
@@ -1218,7 +1218,7 @@
 		caddr_t			*buf = NULL;
 
 		/* Allocate the mbuf. */
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
@@ -1300,19 +1300,19 @@
 		}
 	} else {
 		/* Allocate the mbufs. */
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("ti%d: mbuf allocation failed "
    			       "-- packet dropped!\n", sc->ti_unit);
 			goto nobufs;
 		}
-		MGET(m[NPAYLOAD], M_DONTWAIT, MT_DATA);
+		MGET(m[NPAYLOAD], MB_DONTWAIT, MT_DATA);
 		if (m[NPAYLOAD] == NULL) {
 			printf("ti%d: cluster mbuf allocation failed "
 			       "-- packet dropped!\n", sc->ti_unit);
 			goto nobufs;
 		}
-		MCLGET(m[NPAYLOAD], M_DONTWAIT);
+		MCLGET(m[NPAYLOAD], MB_DONTWAIT);
 		if ((m[NPAYLOAD]->m_flags & M_EXT) == 0) {
 			printf("ti%d: mbuf allocation failed "
 			       "-- packet dropped!\n", sc->ti_unit);
@@ -1321,7 +1321,7 @@
 		m[NPAYLOAD]->m_len = MCLBYTES;
 
 		for (i = 0; i < NPAYLOAD; i++){
-			MGET(m[i], M_DONTWAIT, MT_DATA);
+			MGET(m[i], MB_DONTWAIT, MT_DATA);
 			if (m[i] == NULL) {
 				printf("ti%d: mbuf allocation failed "
 				       "-- packet dropped!\n", sc->ti_unit);
Index: src/sys/pci/if_tl.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_tl.c,v
retrieving revision 1.74
diff -u -r1.74 if_tl.c
--- src/sys/pci/if_tl.c	19 Feb 2003 05:47:41 -0000	1.74
+++ src/sys/pci/if_tl.c	21 Feb 2003 16:41:59 -0000
@@ -1459,11 +1459,11 @@
 {
 	struct mbuf		*m_new = NULL;
 
-	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 	if (m_new == NULL)
 		return(ENOBUFS);
 
-	MCLGET(m_new, M_DONTWAIT);
+	MCLGET(m_new, MB_DONTWAIT);
 	if (!(m_new->m_flags & M_EXT)) {
 		m_freem(m_new);
 		return(ENOBUFS);
@@ -1909,13 +1909,13 @@
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			if_printf(ifp, "no memory for tx list\n");
 			return(1);
 		}
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_DONTWAIT);
+			MCLGET(m_new, MB_DONTWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				if_printf(ifp, "no memory for tx list\n");
Index: src/sys/pci/if_vr.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_vr.c,v
retrieving revision 1.62
diff -u -r1.62 if_vr.c
--- src/sys/pci/if_vr.c	19 Feb 2003 05:47:41 -0000	1.62
+++ src/sys/pci/if_vr.c	21 Feb 2003 16:42:01 -0000
@@ -1041,11 +1041,11 @@
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, M_DONTWAIT);
+		MCLGET(m_new, MB_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1423,13 +1423,13 @@
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("vr%d: no memory for tx list\n", sc->vr_unit);
 			return(1);
 		}
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_DONTWAIT);
+			MCLGET(m_new, MB_DONTWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				printf("vr%d: no memory for tx list\n",
Index: src/sys/pci/if_wb.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_wb.c,v
retrieving revision 1.53
diff -u -r1.53 if_wb.c
--- src/sys/pci/if_wb.c	19 Feb 2003 05:47:41 -0000	1.53
+++ src/sys/pci/if_wb.c	21 Feb 2003 16:42:03 -0000
@@ -1112,7 +1112,7 @@
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 		m_new->m_data = c->wb_buf;
@@ -1467,11 +1467,11 @@
 	if (m != NULL) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(1);
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_DONTWAIT);
+			MCLGET(m_new, MB_DONTWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				return(1);
Index: src/sys/pci/if_xl.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_xl.c,v
retrieving revision 1.129
diff -u -r1.129 if_xl.c
--- src/sys/pci/if_xl.c	19 Feb 2003 18:33:29 -0000	1.129
+++ src/sys/pci/if_xl.c	21 Feb 2003 16:42:07 -0000
@@ -930,7 +930,7 @@
 
 	ifp = &sc->arpcom.ac_if;
 
-	MGETHDR(m, M_DONTWAIT, MT_DATA);
+	MGETHDR(m, MB_DONTWAIT, MT_DATA);
 
 	if (m == NULL)
 		return;
@@ -1939,11 +1939,11 @@
 	int			error;
 	u_int32_t		baddr;
 
-	MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 	if (m_new == NULL)
 		return(ENOBUFS);
 
-	MCLGET(m_new, M_DONTWAIT);
+	MCLGET(m_new, MB_DONTWAIT);
 	if (!(m_new->m_flags & M_EXT)) {
 		m_freem(m_new);
 		return(ENOBUFS);
@@ -2443,14 +2443,14 @@
 	if (error) {
 		struct mbuf		*m_new = NULL;
 
-		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			m_freem(m_head);
 			printf("xl%d: no memory for tx list\n", sc->xl_unit);
 			return(1);
 		}
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, M_DONTWAIT);
+			MCLGET(m_new, MB_DONTWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				m_freem(m_head);
Index: src/sys/sys/mbuf.h
===================================================================
RCS file: /home/ncvs/src/sys/sys/mbuf.h,v
retrieving revision 1.113
diff -u -r1.113 mbuf.h
--- src/sys/sys/mbuf.h	20 Feb 2003 04:26:58 -0000	1.113
+++ src/sys/sys/mbuf.h	21 Feb 2003 16:42:10 -0000
@@ -265,13 +265,13 @@
 
 /*
  * Flags specifying how an allocation should be made.
- * M_DONTWAIT means "don't block if nothing is available" whereas
- * M_TRYWAIT means "block for mbuf_wait ticks at most if nothing is
+ * MB_DONTWAIT means "don't block if nothing is available" whereas
+ * MB_TRYWAIT means "block for mbuf_wait ticks at most if nothing is
  * available."
  */
-#define	M_DONTWAIT	1
-#define	M_TRYWAIT	0
-#define	M_WAIT		M_TRYWAIT	/* XXX: Deprecated. */
+#define	MB_DONTWAIT	1
+#define	MB_TRYWAIT	0
+#define	M_WAIT		MB_TRYWAIT	/* XXX: Deprecated. */
 
 #ifdef _KERNEL
 /*-
@@ -406,7 +406,7 @@
 #define	M_COPYALL	1000000000
 
 /* Compatibility with 4.3. */
-#define	m_copy(m, o, l)	m_copym((m), (o), (l), M_DONTWAIT)
+#define	m_copy(m, o, l)	m_copym((m), (o), (l), MB_DONTWAIT)
 
 extern	int max_datalen;		/* MHLEN - max_hdr */
 extern	int max_hdr;			/* Largest link + protocol header */