From 9e0db90ab2fbe8dc36fad53b31eb928b34465e64 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Wed, 31 Dec 2014 06:52:16 +0100
Subject: [PATCH] kernel/mbuf: MB_* -> M_* unification

---
 share/man/man9/mbuf.9                              |  16 +--
 sys/bus/firewire/fwohci.c                          |   2 +-
 sys/bus/u4b/net/if_axe.c                           |   2 +-
 sys/bus/u4b/net/usb_ethernet.c                     |   2 +-
 sys/bus/u4b/wlan/if_run.c                          |   4 +-
 sys/bus/u4b/wlan/if_urtwn.c                        |   2 +-
 sys/dev/crypto/hifn/hifn7751.c                     |  12 +-
 sys/dev/crypto/safe/safe.c                         |  12 +-
 sys/dev/crypto/ubsec/ubsec.c                       |  12 +-
 sys/dev/disk/iscsi/initiator/isc_soc.c             |   6 +-
 sys/dev/misc/musycc/musycc.c                       |  10 +-
 sys/dev/netif/acx/if_acx.c                         |   4 +-
 sys/dev/netif/age/if_age.c                         |   4 +-
 sys/dev/netif/alc/if_alc.c                         |   4 +-
 sys/dev/netif/ale/if_ale.c                         |   2 +-
 sys/dev/netif/an/if_an.c                           |   4 +-
 sys/dev/netif/ar/if_ar.c                           |   2 +-
 sys/dev/netif/ath/ath/if_ath_rx.c                  |   2 +-
 sys/dev/netif/ath/ath/if_ath_rx_edma.c             |   6 +-
 sys/dev/netif/bce/if_bce.c                         |   2 +-
 sys/dev/netif/bfe/if_bfe.c                         |   2 +-
 sys/dev/netif/bge/if_bge.c                         |   8 +-
 sys/dev/netif/bnx/if_bnx.c                         |   8 +-
 sys/dev/netif/bwi/if_bwi.c                         |   6 +-
 sys/dev/netif/cs/if_cs.c                           |   4 +-
 sys/dev/netif/dc/if_dc.c                           |   4 +-
 sys/dev/netif/de/if_de.c                           |  10 +-
 sys/dev/netif/ed/if_ed.c                           |   2 +-
 sys/dev/netif/em/if_em.c                           |   2 +-
 sys/dev/netif/emx/if_emx.c                         |   2 +-
 sys/dev/netif/ep/if_ep.c                           |   4 +-
 sys/dev/netif/et/if_et.c                           |   5 +-
 sys/dev/netif/ex/if_ex.c                           |   7 +-
 sys/dev/netif/fe/if_fe.c                           |   4 +-
 sys/dev/netif/fwe/if_fwe.c                         |   6 +-
 sys/dev/netif/fxp/if_fxp.c                         |   4 +-
 sys/dev/netif/igb/if_igb.c                         |   2 +-
 sys/dev/netif/iwi/if_iwi.c                         |   6 +-
 sys/dev/netif/iwl/iwl2100.c                        |   8 +-
 sys/dev/netif/iwn/if_iwn.c                         |   8 +-
 sys/dev/netif/ix/if_ix.c                           |   4 +-
 sys/dev/netif/jme/if_jme.c                         |   2 +-
 sys/dev/netif/lge/if_lge.c                         |   4 +-
 sys/dev/netif/lnc/lance.c                          |   3 +-
 sys/dev/netif/mn/if_mn.c                           |  14 +--
 sys/dev/netif/msk/if_msk.c                         |   6 +-
 sys/dev/netif/mxge/if_mxge.c                       |   8 +-
 sys/dev/netif/my/if_my.c                           |   8 +-
 sys/dev/netif/ndis/if_ndis.c                       |   6 +-
 sys/dev/netif/nfe/if_nfe.c                         |   4 +-
 sys/dev/netif/nge/if_nge.c                         |   4 +-
 sys/dev/netif/pcn/if_pcn.c                         |   6 +-
 sys/dev/netif/ral/rt2560.c                         |   6 +-
 sys/dev/netif/ral/rt2661.c                         |   6 +-
 sys/dev/netif/re/if_re.c                           |   6 +-
 sys/dev/netif/rl/if_rl.c                           |   2 +-
 sys/dev/netif/rtw/rtw.c                            |   4 +-
 sys/dev/netif/sbni/if_sbni.c                       |   4 +-
 sys/dev/netif/sbsh/if_sbsh.c                       |   8 +-
 sys/dev/netif/sf/if_sf.c                           |   6 +-
 sys/dev/netif/sis/if_sis.c                         |   2 +-
 sys/dev/netif/sk/if_sk.c                           |   4 +-
 sys/dev/netif/sln/if_sln.c                         |   4 +-
 sys/dev/netif/sn/if_sn.c                           |   4 +-
 sys/dev/netif/sr/if_sr.c                           |   4 +-
 sys/dev/netif/ste/if_ste.c                         |   8 +-
 sys/dev/netif/stge/if_stge.c                       |   4 +-
 sys/dev/netif/ti/if_ti.c                           |   6 +-
 sys/dev/netif/tl/if_tl.c                           |   4 +-
 sys/dev/netif/tx/if_tx.c                           |   8 +-
 sys/dev/netif/txp/if_txp.c                         |  14 +--
 sys/dev/netif/vge/if_vge.c                         |   4 +-
 sys/dev/netif/vr/if_vr.c                           |   2 +-
 sys/dev/netif/vx/if_vx.c                           |  10 +-
 sys/dev/netif/wb/if_wb.c                           |   6 +-
 sys/dev/netif/wi/if_wi.c                           |   4 +-
 sys/dev/netif/wpi/if_wpi.c                         |   8 +-
 sys/dev/netif/xe/if_xe.c                           |   4 +-
 sys/dev/netif/xl/if_xl.c                           |   2 +-
 sys/dev/virtual/virtio/net/if_vtnet.c              |  12 +-
 sys/dev/virtual/vkernel/net/if_vke.c               |   5 +-
 sys/emulation/43bsd/43bsd_socket.c                 |   4 +-
 sys/emulation/linux/linux_socket.c                 |   2 +-
 sys/emulation/ndis/kern_ndis.c                     |   4 +-
 sys/kern/libmchain/subr_mchain.c                   |  10 +-
 sys/kern/subr_busdma.c                             |   2 +-
 sys/kern/uipc_mbuf.c                               |  36 +++---
 sys/kern/uipc_mbuf2.c                              |   7 +-
 sys/kern/uipc_sockbuf.c                            |   5 +-
 sys/kern/uipc_socket.c                             |  21 ++--
 sys/kern/uipc_socket2.c                            |   3 +-
 sys/kern/uipc_syscalls.c                           |   4 +-
 sys/kern/uipc_usrreq.c                             |   2 +-
 sys/net/bpf.c                                      |   2 +-
 sys/net/bridge/bridgestp.c                         |   4 +-
 sys/net/bridge/if_bridge.c                         |  20 ++--
 sys/net/bsd_comp.c                                 |  16 +--
 sys/net/gre/if_gre.c                               |   4 +-
 sys/net/if_ethersubr.c                             |   8 +-
 sys/net/if_loop.c                                  |   2 +-
 sys/net/ip6fw/ip6_fw.c                             |   8 +-
 sys/net/ip_mroute/ip_mroute.c                      |  16 +--
 sys/net/ipfw/ip_fw2.c                              |   8 +-
 sys/net/pf/pf.c                                    |   6 +-
 sys/net/pf/pf_norm.c                               |   2 +-
 sys/net/ppp/if_ppp.c                               |   8 +-
 sys/net/ppp_layer/ppp_deflate.c                    |  16 +--
 sys/net/ppp_layer/ppp_tty.c                        |  11 +-
 sys/net/raw_cb.c                                   |   3 +-
 sys/net/raw_usrreq.c                               |   3 +-
 sys/net/route.c                                    |   2 +-
 sys/net/rtsock.c                                   |   6 +-
 sys/net/sl/if_sl.c                                 |   5 +-
 sys/net/sppp/if_spppsubr.c                         |  10 +-
 sys/net/stf/if_stf.c                               |   3 +-
 sys/net/tap/if_tap.c                               |   4 +-
 sys/net/tun/if_tun.c                               |   8 +-
 sys/net/vlan/if_vlan_ether.c                       |   4 +-
 sys/netbt/hci_link.c                               |   5 +-
 sys/netbt/hci_socket.c                             |   4 +-
 sys/netbt/hci_unit.c                               |   3 +-
 sys/netbt/l2cap_signal.c                           |   3 +-
 sys/netbt/l2cap_socket.c                           |   4 +-
 sys/netbt/l2cap_upper.c                            |   2 +-
 sys/netbt/rfcomm_dlc.c                             |   3 +-
 sys/netbt/rfcomm_session.c                         |   7 +-
 sys/netbt/rfcomm_socket.c                          |   2 +-
 sys/netbt/sco_socket.c                             |   4 +-
 sys/netbt/sco_upper.c                              |   2 +-
 sys/netgraph/UI/ng_UI.c                            |   2 +-
 sys/netgraph/cisco/ng_cisco.c                      |   4 +-
 sys/netgraph/frame_relay/ng_frame_relay.c          |   2 +-
 sys/netgraph/l2tp/ng_l2tp.c                        |  14 +--
 sys/netgraph/lmi/ng_lmi.c                          |   2 +-
 sys/netgraph/ppp/ng_ppp.c                          |   4 +-
 sys/netgraph/pppoe/ng_pppoe.c                      |  16 +--
 sys/netgraph/pptpgre/ng_pptpgre.c                  |   4 +-
 sys/netgraph/rfc1490/ng_rfc1490.c                  |   4 +-
 sys/netgraph/tty/ng_tty.c                          |   2 +-
 sys/netgraph/vjc/ng_vjc.c                          |   4 +-
 sys/netgraph7/UI/ng_UI.c                           |   2 +-
 .../bluetooth/drivers/bt3c/ng_bt3c_pccard.c        |   4 +-
 sys/netgraph7/bluetooth/drivers/h4/ng_h4.c         |   2 +-
 sys/netgraph7/bluetooth/drivers/ubt/ng_ubt.c       |  12 +-
 sys/netgraph7/bluetooth/hci/ng_hci_cmds.c          |   2 +-
 sys/netgraph7/bluetooth/hci/ng_hci_evnt.c          |   2 +-
 sys/netgraph7/bluetooth/hci/ng_hci_misc.c          |   2 +-
 sys/netgraph7/bluetooth/hci/ng_hci_ulpi.c          |  10 +-
 sys/netgraph7/bluetooth/l2cap/ng_l2cap_cmds.h      |  22 ++--
 sys/netgraph7/bluetooth/l2cap/ng_l2cap_evnt.c      |   2 +-
 sys/netgraph7/bluetooth/l2cap/ng_l2cap_llpi.c      |   2 +-
 sys/netgraph7/bluetooth/l2cap/ng_l2cap_misc.c      |   2 +-
 .../bluetooth/socket/ng_btsocket_hci_raw.c         |   6 +-
 sys/netgraph7/bluetooth/socket/ng_btsocket_l2cap.c |   6 +-
 .../bluetooth/socket/ng_btsocket_rfcomm.c          |  14 +--
 sys/netgraph7/bridge/ng_bridge.c                   |   2 +-
 sys/netgraph7/cisco/ng_cisco.c                     |   4 +-
 sys/netgraph7/frame_relay/ng_frame_relay.c         |   3 +-
 sys/netgraph7/hub/ng_hub.c                         |   3 +-
 sys/netgraph7/iface/ng_iface.c                     |   2 +-
 sys/netgraph7/ksocket/ng_ksocket.c                 |   4 +-
 sys/netgraph7/l2tp/ng_l2tp.c                       |  15 ++-
 sys/netgraph7/lmi/ng_lmi.c                         |   4 +-
 sys/netgraph7/mppc/ng_mppc.c                       |   7 +-
 sys/netgraph7/netflow/netflow.c                    |   2 +-
 sys/netgraph7/ng_device.c                          |   2 +-
 sys/netgraph7/ng_gif.c                             |   3 +-
 sys/netgraph7/ng_gif_demux.c                       |   2 +-
 sys/netgraph7/ng_ipfw.c                            |   4 +-
 sys/netgraph7/ng_source.c                          |   4 +-
 sys/netgraph7/ng_tag.c                             |   3 +-
 sys/netgraph7/ng_vlan.c                            |   2 +-
 sys/netgraph7/one2many/ng_one2many.c               |   3 +-
 sys/netgraph7/ppp/ng_ppp.c                         |   6 +-
 sys/netgraph7/pppoe/ng_pppoe.c                     |  20 ++--
 sys/netgraph7/pptpgre/ng_pptpgre.c                 |   5 +-
 sys/netgraph7/rfc1490/ng_rfc1490.c                 |  10 +-
 sys/netgraph7/tee/ng_tee.c                         |   3 +-
 sys/netgraph7/tty/ng_tty.c                         |   2 +-
 sys/netgraph7/vjc/ng_vjc.c                         |   4 +-
 sys/netinet/if_ether.c                             |   2 +-
 sys/netinet/igmp.c                                 |   4 +-
 sys/netinet/in_gif.c                               |   3 +-
 sys/netinet/ip_carp.c                              |   8 +-
 sys/netinet/ip_divert.c                            |   6 +-
 sys/netinet/ip_encap.c                             |   2 +-
 sys/netinet/ip_icmp.c                              |   4 +-
 sys/netinet/ip_input.c                             |  10 +-
 sys/netinet/ip_output.c                            |  11 +-
 sys/netinet/raw_ip.c                               |   4 +-
 sys/netinet/sctp_asconf.c                          |  12 +-
 sys/netinet/sctp_indata.c                          |  56 ++++-----
 sys/netinet/sctp_input.c                           |  14 +--
 sys/netinet/sctp_output.c                          | 130 +++++++++++----------
 sys/netinet/sctp_pcb.c                             |   4 +-
 sys/netinet/sctp_timer.c                           |   4 +-
 sys/netinet/sctp_usrreq.c                          |   8 +-
 sys/netinet/sctputil.c                             |  24 ++--
 sys/netinet/tcp_output.c                           |   6 +-
 sys/netinet/tcp_subr.c                             |   4 +-
 sys/netinet/tcp_syncache.c                         |   2 +-
 sys/netinet/udp_usrreq.c                           |   6 +-
 sys/netinet6/ah_core.c                             |   8 +-
 sys/netinet6/ah_input.c                            |   4 +-
 sys/netinet6/ah_output.c                           |   5 +-
 sys/netinet6/esp_core.c                            |   4 +-
 sys/netinet6/esp_input.c                           |   4 +-
 sys/netinet6/esp_output.c                          |   6 +-
 sys/netinet6/frag6.c                               |   3 +-
 sys/netinet6/icmp6.c                               |  26 ++---
 sys/netinet6/in6_gif.c                             |   2 +-
 sys/netinet6/ip6_input.c                           |   6 +-
 sys/netinet6/ip6_mroute.c                          |   3 +-
 sys/netinet6/ip6_output.c                          |  22 ++--
 sys/netinet6/ipcomp_core.c                         |   3 +-
 sys/netinet6/ipcomp_output.c                       |   6 +-
 sys/netinet6/ipsec.c                               |  20 ++--
 sys/netinet6/mld6.c                                |   5 +-
 sys/netinet6/nd6_nbr.c                             |   4 +-
 sys/netinet6/raw_ip6.c                             |   2 +-
 sys/netinet6/udp6_output.c                         |   2 +-
 sys/netproto/802_11/wlan/ieee80211_dragonfly.c     |   8 +-
 sys/netproto/802_11/wlan/ieee80211_hostap.c        |   4 +-
 sys/netproto/802_11/wlan/ieee80211_ht.c            |   2 +-
 sys/netproto/802_11/wlan/ieee80211_hwmp.c          |   2 +-
 sys/netproto/802_11/wlan/ieee80211_input.c         |   2 +-
 sys/netproto/802_11/wlan/ieee80211_mesh.c          |   2 +-
 sys/netproto/802_11/wlan/ieee80211_output.c        |  24 ++--
 sys/netproto/802_11/wlan/ieee80211_superg.c        |   8 +-
 sys/netproto/802_11/wlan/ieee80211_wds.c           |   2 +-
 .../802_11/wlan_ccmp/ieee80211_crypto_ccmp.c       |   2 +-
 .../802_11/wlan_tkip/ieee80211_crypto_tkip.c       |   2 +-
 .../802_11/wlan_wep/ieee80211_crypto_wep.c         |   2 +-
 sys/netproto/ipsec/ipsec_input.c                   |   5 +-
 sys/netproto/ipsec/ipsec_mbuf.c                    |  14 +--
 sys/netproto/ipsec/ipsec_output.c                  |   7 +-
 sys/netproto/ipsec/key.c                           |  32 ++---
 sys/netproto/ipsec/keysock.c                       |   4 +-
 sys/netproto/ipsec/xform_ipip.c                    |   4 +-
 sys/netproto/key/key.c                             |  44 +++----
 sys/netproto/key/keysock.c                         |   8 +-
 sys/netproto/mpls/mpls_output.c                    |   4 +-
 sys/netproto/smb/smb_iod.c                         |   2 +-
 sys/netproto/smb/smb_rq.c                          |   2 +-
 sys/netproto/smb/smb_trantcp.c                     |   2 +-
 sys/sys/mbuf.h                                     |  17 +--
 sys/vfs/nfs/krpc_subr.c                            |   8 +-
 sys/vfs/nfs/nfs_mountrpc.c                         |   2 +-
 sys/vfs/nfs/nfs_serv.c                             |   4 +-
 sys/vfs/nfs/nfs_socket.c                           |  26 ++---
 sys/vfs/nfs/nfs_srvcache.c                         |   4 +-
 sys/vfs/nfs/nfs_syscalls.c                         |   6 +-
 sys/vfs/nfs/nfsm_subs.c                            |  29 ++---
 tools/tools/netrate/pktgen/pktgen.c                |   8 +-
 254 files changed, 868 insertions(+), 910 deletions(-)

diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9
index a7b0f24..6782fcc 100644
--- a/share/man/man9/mbuf.9
+++ b/share/man/man9/mbuf.9
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.27.2.1 2003/05/28 13:53:18 yar Exp $
 .\"
-.Dd September 17, 2010
+.Dd December 20, 2014
 .Dt MBUF 9
 .Os
 .\"
@@ -241,14 +241,14 @@ on failure.
 The
 .Fa how
 argument is to be set to
-.Dv MB_WAIT
+.Dv M_WAITOK
 or
-.Dv MB_DONTWAIT .
+.Dv M_NOWAIT .
 It specifies whether the caller is willing to block if necessary.
 If
 .Fa how
 is set to
-.Dv MB_WAIT ,
+.Dv M_WAITOK ,
 a failed allocation will result in the caller being put
 to sleep for a designated
 .Va kern.ipc.mbuf_wait
@@ -258,14 +258,6 @@ number of ticks.
 A number of other mbuf-related
 functions and macros have the same argument because they may
 at some point need to allocate new mbufs.
-.Pp
-Programmers should be careful not to confuse the mbuf allocation flag
-.Dv MB_DONTWAIT
-with the
-.Xr kmalloc 9
-allocation flag,
-.Dv M_NOWAIT .
-They are not the same.
 .It Fn MGETHDR mbuf how type
 Allocate an mbuf and initialize it to contain a packet header
 and internal data.
diff --git a/sys/bus/firewire/fwohci.c b/sys/bus/firewire/fwohci.c
index 778ee65..c1896ed 100644
--- a/sys/bus/firewire/fwohci.c
+++ b/sys/bus/firewire/fwohci.c
@@ -931,7 +931,7 @@ again:
 
 				if (firewire_debug)
 					device_printf(sc->fc.dev, "EFBIG.\n");
-				m0 = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+				m0 = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 				if (m0 != NULL) {
 					m_copydata(xfer->mbuf, 0,
 						xfer->mbuf->m_pkthdr.len,
diff --git a/sys/bus/u4b/net/if_axe.c b/sys/bus/u4b/net/if_axe.c
index 070bc24..dd2d991 100644
--- a/sys/bus/u4b/net/if_axe.c
+++ b/sys/bus/u4b/net/if_axe.c
@@ -1118,7 +1118,7 @@ axe_rxeof(struct usb_ether *ue, struct usb_page_cache *pc, unsigned int offset,
 		return (EINVAL);
 	}
 
-	m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
 		IFNET_STAT_INC(ifp, iqdrops, 1);
 		return (ENOMEM);
diff --git a/sys/bus/u4b/net/usb_ethernet.c b/sys/bus/u4b/net/usb_ethernet.c
index be4823e..ee16703 100644
--- a/sys/bus/u4b/net/usb_ethernet.c
+++ b/sys/bus/u4b/net/usb_ethernet.c
@@ -548,7 +548,7 @@ uether_newbuf(void)
 {
 	struct mbuf *m_new;
 
-	m_new = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m_new = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m_new == NULL)
 		return (NULL);
 	m_new->m_len = m_new->m_pkthdr.len = MCLBYTES;
diff --git a/sys/bus/u4b/wlan/if_run.c b/sys/bus/u4b/wlan/if_run.c
index cb48f62..c61660f 100644
--- a/sys/bus/u4b/wlan/if_run.c
+++ b/sys/bus/u4b/wlan/if_run.c
@@ -2926,7 +2926,7 @@ run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 	case USB_ST_SETUP:
 tr_setup:
 		if (sc->rx_m == NULL) {
-			sc->rx_m = m_getjcl(MB_DONTWAIT, MT_DATA, M_PKTHDR,
+			sc->rx_m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR,
 			    MJUMPAGESIZE /* xfer can be bigger than MCLBYTES */);
 		}
 		if (sc->rx_m == NULL) {
@@ -3001,7 +3001,7 @@ tr_setup:
 		}
 
 		/* copy aggregated frames to another mbuf */
-		m0 = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		m0 = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (__predict_false(m0 == NULL)) {
 			DPRINTF("could not allocate mbuf\n");
 			ifp->if_ierrors++;
diff --git a/sys/bus/u4b/wlan/if_urtwn.c b/sys/bus/u4b/wlan/if_urtwn.c
index 36985c8..f605380 100644
--- a/sys/bus/u4b/wlan/if_urtwn.c
+++ b/sys/bus/u4b/wlan/if_urtwn.c
@@ -677,7 +677,7 @@ urtwn_rx_frame(struct urtwn_softc *sc, uint8_t *buf, int pktlen, int *rssi_p)
 		rssi = URTWN_RSSI(rssi);
 	}
 
-	m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
 		device_printf(sc->sc_dev, "could not create RX mbuf\n");
 		return (NULL);
diff --git a/sys/dev/crypto/hifn/hifn7751.c b/sys/dev/crypto/hifn/hifn7751.c
index 4379561..766e352 100644
--- a/sys/dev/crypto/hifn/hifn7751.c
+++ b/sys/dev/crypto/hifn/hifn7751.c
@@ -1919,14 +1919,14 @@ hifn_crypto(
 			totlen = cmd->src_mapsize;
 			if (cmd->src_m->m_flags & M_PKTHDR) {
 				len = MHLEN;
-				MGETHDR(m0, MB_DONTWAIT, MT_DATA);
-				if (m0 && !m_dup_pkthdr(m0, cmd->src_m, MB_DONTWAIT)) {
+				MGETHDR(m0, M_NOWAIT, MT_DATA);
+				if (m0 && !m_dup_pkthdr(m0, cmd->src_m, M_NOWAIT)) {
 					m_free(m0);
 					m0 = NULL;
 				}
 			} else {
 				len = MLEN;
-				MGET(m0, MB_DONTWAIT, MT_DATA);
+				MGET(m0, M_NOWAIT, MT_DATA);
 			}
 			if (m0 == NULL) {
 				hifnstats.hst_nomem_mbuf++;
@@ -1934,7 +1934,7 @@ hifn_crypto(
 				goto err_srcmap;
 			}
 			if (totlen >= MINCLSIZE) {
-				MCLGET(m0, MB_DONTWAIT);
+				MCLGET(m0, M_NOWAIT);
 				if ((m0->m_flags & M_EXT) == 0) {
 					hifnstats.hst_nomem_mcl++;
 					err = dma->cmdu ? ERESTART : ENOMEM;
@@ -1948,7 +1948,7 @@ hifn_crypto(
 			mlast = m0;
 
 			while (totlen > 0) {
-				MGET(m, MB_DONTWAIT, MT_DATA);
+				MGET(m, M_NOWAIT, MT_DATA);
 				if (m == NULL) {
 					hifnstats.hst_nomem_mbuf++;
 					err = dma->cmdu ? ERESTART : ENOMEM;
@@ -1957,7 +1957,7 @@ hifn_crypto(
 				}
 				len = MLEN;
 				if (totlen >= MINCLSIZE) {
-					MCLGET(m, MB_DONTWAIT);
+					MCLGET(m, M_NOWAIT);
 					if ((m->m_flags & M_EXT) == 0) {
 						hifnstats.hst_nomem_mcl++;
 						err = dma->cmdu ? ERESTART : ENOMEM;
diff --git a/sys/dev/crypto/safe/safe.c b/sys/dev/crypto/safe/safe.c
index 7eef940..8a0bb43 100644
--- a/sys/dev/crypto/safe/safe.c
+++ b/sys/dev/crypto/safe/safe.c
@@ -1321,15 +1321,15 @@ safe_process(device_t dev, struct cryptop *crp, int hint)
 				totlen = re->re_src_mapsize;
 				if (re->re_src_m->m_flags & M_PKTHDR) {
 					len = MHLEN;
-					MGETHDR(m, MB_DONTWAIT, MT_DATA);
+					MGETHDR(m, M_NOWAIT, MT_DATA);
 					if (m && !m_dup_pkthdr(m, re->re_src_m,
-					    MB_DONTWAIT)) {
+					    M_NOWAIT)) {
 						m_free(m);
 						m = NULL;
 					}
 				} else {
 					len = MLEN;
-					MGET(m, MB_DONTWAIT, MT_DATA);
+					MGET(m, M_NOWAIT, MT_DATA);
 				}
 				if (m == NULL) {
 					safestats.st_nombuf++;
@@ -1337,7 +1337,7 @@ safe_process(device_t dev, struct cryptop *crp, int hint)
 					goto errout;
 				}
 				if (totlen >= MINCLSIZE) {
-					MCLGET(m, MB_DONTWAIT);
+					MCLGET(m, M_NOWAIT);
 					if ((m->m_flags & M_EXT) == 0) {
 						m_free(m);
 						safestats.st_nomcl++;
@@ -1353,7 +1353,7 @@ safe_process(device_t dev, struct cryptop *crp, int hint)
 
 				while (totlen > 0) {
 					if (top) {
-						MGET(m, MB_DONTWAIT, MT_DATA);
+						MGET(m, M_NOWAIT, MT_DATA);
 						if (m == NULL) {
 							m_freem(top);
 							safestats.st_nombuf++;
@@ -1364,7 +1364,7 @@ safe_process(device_t dev, struct cryptop *crp, int hint)
 						len = MLEN;
 					}
 					if (top && totlen >= MINCLSIZE) {
-						MCLGET(m, MB_DONTWAIT);
+						MCLGET(m, M_NOWAIT);
 						if ((m->m_flags & M_EXT) == 0) {
 							*mp = m;
 							m_freem(top);
diff --git a/sys/dev/crypto/ubsec/ubsec.c b/sys/dev/crypto/ubsec/ubsec.c
index acdcafe..7922c1a 100644
--- a/sys/dev/crypto/ubsec/ubsec.c
+++ b/sys/dev/crypto/ubsec/ubsec.c
@@ -1356,14 +1356,14 @@ ubsec_process(device_t dev, struct cryptop *crp, int hint)
 				totlen = q->q_src_mapsize;
 				if (q->q_src_m->m_flags & M_PKTHDR) {
 					len = MHLEN;
-					MGETHDR(m, MB_DONTWAIT, MT_DATA);
-					if (m && !m_dup_pkthdr(m, q->q_src_m, MB_DONTWAIT)) {
+					MGETHDR(m, M_NOWAIT, MT_DATA);
+					if (m && !m_dup_pkthdr(m, q->q_src_m, M_NOWAIT)) {
 						m_free(m);
 						m = NULL;
 					}
 				} else {
 					len = MLEN;
-					MGET(m, MB_DONTWAIT, MT_DATA);
+					MGET(m, M_NOWAIT, MT_DATA);
 				}
 				if (m == NULL) {
 					ubsecstats.hst_nombuf++;
@@ -1371,7 +1371,7 @@ ubsec_process(device_t dev, struct cryptop *crp, int hint)
 					goto errout;
 				}
 				if (totlen >= MINCLSIZE) {
-					MCLGET(m, MB_DONTWAIT);
+					MCLGET(m, M_NOWAIT);
 					if ((m->m_flags & M_EXT) == 0) {
 						m_free(m);
 						ubsecstats.hst_nomcl++;
@@ -1386,7 +1386,7 @@ ubsec_process(device_t dev, struct cryptop *crp, int hint)
 
 				while (totlen > 0) {
 					if (top) {
-						MGET(m, MB_DONTWAIT, MT_DATA);
+						MGET(m, M_NOWAIT, MT_DATA);
 						if (m == NULL) {
 							m_freem(top);
 							ubsecstats.hst_nombuf++;
@@ -1396,7 +1396,7 @@ ubsec_process(device_t dev, struct cryptop *crp, int hint)
 						len = MLEN;
 					}
 					if (top && totlen >= MINCLSIZE) {
-						MCLGET(m, MB_DONTWAIT);
+						MCLGET(m, M_NOWAIT);
 						if ((m->m_flags & M_EXT) == 0) {
 							*mp = m;
 							m_freem(top);
diff --git a/sys/dev/disk/iscsi/initiator/isc_soc.c b/sys/dev/disk/iscsi/initiator/isc_soc.c
index 0225c4f..5350fbc 100644
--- a/sys/dev/disk/iscsi/initiator/isc_soc.c
+++ b/sys/dev/disk/iscsi/initiator/isc_soc.c
@@ -112,7 +112,7 @@ isc_sendPDU(isc_session_t *sp, pduq_t *pq)
      /*
       | mbuf for the iSCSI header
       */
-     MGETHDR(mh, MB_TRYWAIT, MT_DATA);
+     MGETHDR(mh, M_WAITOK, MT_DATA);
      mh->m_len = mh->m_pkthdr.len = sizeof(union ipdu_u);
      mh->m_pkthdr.rcvif = NULL;
      MH_ALIGN(mh, sizeof(union ipdu_u));
@@ -154,7 +154,7 @@ isc_sendPDU(isc_session_t *sp, pduq_t *pq)
           while(len > 0) {
                 int       l;
 
-	       MGET(md, MB_TRYWAIT, MT_DATA);
+	       MGET(md, M_WAITOK, MT_DATA);
 	       pq->refcnt++;
 
                 l = min(MCLBYTES, len);
@@ -180,7 +180,7 @@ isc_sendPDU(isc_session_t *sp, pduq_t *pq)
 
 	  pp->ds_dig = sp->dataDigest(pp->ds, pp->ds_len, 0);
 
-	  MGET(me, MB_TRYWAIT, MT_DATA);
+	  MGET(me, M_WAITOK, MT_DATA);
           me->m_len = sizeof(int);
           MH_ALIGN(mh, sizeof(int));
           bcopy(&pp->ds_dig, me->m_data, sizeof(int));
diff --git a/sys/dev/misc/musycc/musycc.c b/sys/dev/misc/musycc/musycc.c
index 2a1210e..9be6b01 100644
--- a/sys/dev/misc/musycc/musycc.c
+++ b/sys/dev/misc/musycc/musycc.c
@@ -695,9 +695,9 @@ musycc_intr0_rx_eom(struct softc *sc, int ch)
 		m->m_len = m->m_pkthdr.len = status & 0x3fff;
 		error = (status >> 16) & 0xf;
 		if (error == 0) {
-			MGETHDR(m2, MB_DONTWAIT, MT_DATA);
+			MGETHDR(m2, M_NOWAIT, MT_DATA);
 			if (m2 != NULL) {
-				MCLGET(m2, MB_DONTWAIT);
+				MCLGET(m2, M_NOWAIT);
 				if((m2->m_flags & M_EXT) != 0) {
 					/* Substitute the mbuf+cluster. */
 					md->m = m2;
@@ -1278,13 +1278,13 @@ musycc_connect(hook_p hook)
 		sc->mdt[ch][i].m = NULL;
 		sc->mdt[ch][i].data = 0;
 
-		MGETHDR(m, MB_WAIT, MT_DATA);
+		MGETHDR(m, M_WAITOK, MT_DATA);
 		if (m == NULL)
 			goto errfree;
-		MCLGET(m, MB_WAIT);
+		MCLGET(m, M_WAITOK);
 		if ((m->m_flags & M_EXT) == 0) {
 			/* We've waited mbuf_wait and still got nothing.
-			   We're calling with MB_TRYWAIT anyway - a little
+			   We're calling with MB_WAITOK anyway - a little
 			   defensive programming costs us very little - if
 			   anything at all in the case of error. */
 			m_free(m);
diff --git a/sys/dev/netif/acx/if_acx.c b/sys/dev/netif/acx/if_acx.c
index a28db9c..9bda40b 100644
--- a/sys/dev/netif/acx/if_acx.c
+++ b/sys/dev/netif/acx/if_acx.c
@@ -2336,7 +2336,7 @@ acx_newbuf(struct acx_softc *sc, struct acx_rxbuf *rb, int wait)
 
 	bd = &sc->sc_buf_data;
 
-	m = m_getcl(wait ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(wait ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return ENOBUFS;
 
@@ -2401,7 +2401,7 @@ acx_encap(struct acx_softc *sc, struct acx_txbuf *txbuf, struct mbuf *m,
 	if (error) {	/* error == EFBIG */
 		struct mbuf *m_new;
 
-		m_new = m_defrag(m, MB_DONTWAIT);
+		m_new = m_defrag(m, M_NOWAIT);
 		if (m_new == NULL) {
 			if_printf(&sc->sc_ic.ic_if, "can't defrag tx mbuf\n");
 			error = ENOBUFS;
diff --git a/sys/dev/netif/age/if_age.c b/sys/dev/netif/age/if_age.c
index 22ab8af..0f8fb80 100644
--- a/sys/dev/netif/age/if_age.c
+++ b/sys/dev/netif/age/if_age.c
@@ -1467,7 +1467,7 @@ age_encap(struct age_softc *sc, struct mbuf **m_head)
 		error = EFBIG;
 	}
 	if (error == EFBIG) {
-		m = m_defrag(*m_head, MB_DONTWAIT);
+		m = m_defrag(*m_head, M_NOWAIT);
 		if (m == NULL) {
 			m_freem(*m_head);
 			*m_head = NULL;
@@ -2747,7 +2747,7 @@ age_newbuf(struct age_softc *sc, struct age_rxdesc *rxd, int init)
 	bus_dmamap_t map;
 	int error;
 
-	m = m_getcl(init ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(init ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return (ENOBUFS);
 
diff --git a/sys/dev/netif/alc/if_alc.c b/sys/dev/netif/alc/if_alc.c
index b5a8148..7b8434f 100644
--- a/sys/dev/netif/alc/if_alc.c
+++ b/sys/dev/netif/alc/if_alc.c
@@ -1972,7 +1972,7 @@ alc_encap(struct alc_softc *sc, struct mbuf **m_head)
 
 		if (M_WRITABLE(m) == 0) {
 			/* Get a writable copy. */
-			m = m_dup(*m_head, MB_DONTWAIT);
+			m = m_dup(*m_head, M_NOWAIT);
 			/* Release original mbufs. */
 			m_freem(*m_head);
 			if (m == NULL) {
@@ -2652,7 +2652,7 @@ alc_newbuf(struct alc_softc *sc, struct alc_rxdesc *rxd, boolean_t wait)
 	int nsegs;
 	int error;
 
-	m = m_getcl(wait ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(wait ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_len = m->m_pkthdr.len = MCLBYTES;
diff --git a/sys/dev/netif/ale/if_ale.c b/sys/dev/netif/ale/if_ale.c
index e74b433..d324cbd 100644
--- a/sys/dev/netif/ale/if_ale.c
+++ b/sys/dev/netif/ale/if_ale.c
@@ -1540,7 +1540,7 @@ ale_encap(struct ale_softc *sc, struct mbuf **m_head)
 				      *m_head, ale_dmamap_buf_cb, &ctx,
 				      BUS_DMA_NOWAIT);
 	if (error == EFBIG) {
-		m = m_defrag(*m_head, MB_DONTWAIT);
+		m = m_defrag(*m_head, M_NOWAIT);
 		if (m == NULL) {
 			m_freem(*m_head);
 			*m_head = NULL;
diff --git a/sys/dev/netif/an/if_an.c b/sys/dev/netif/an/if_an.c
index fec76f1..aaba2dd 100644
--- a/sys/dev/netif/an/if_an.c
+++ b/sys/dev/netif/an/if_an.c
@@ -892,7 +892,7 @@ an_rxeof(struct an_softc *sc)
 			}
 			BPF_TAP(ifp, bpf_buf, len);
 		} else {
-			m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+			m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 			if (m == NULL) {
 				IFNET_STAT_INC(ifp, ierrors, 1);
 				return;
@@ -970,7 +970,7 @@ an_rxeof(struct an_softc *sc)
 			if (an_rx_desc.an_done && !an_rx_desc.an_valid) {
 				buf = sc->an_rx_buffer[count].an_dma_vaddr;
 
-				m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+				m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 				if (m == NULL) {
 					IFNET_STAT_INC(ifp, ierrors, 1);
 					return;
diff --git a/sys/dev/netif/ar/if_ar.c b/sys/dev/netif/ar/if_ar.c
index 6a540bd..c5ae425 100644
--- a/sys/dev/netif/ar/if_ar.c
+++ b/sys/dev/netif/ar/if_ar.c
@@ -1686,7 +1686,7 @@ ar_get_packets(struct ar_softc *sc)
 	while(ar_packet_avail(sc, &len, &rxstat)) {
 		TRC(kprintf("apa: len %d, rxstat %x\n", len, rxstat));
 		if(((rxstat & SCA_DESC_ERRORS) == 0) && (len < MCLBYTES)) {
-			m =  m_getl(len, MB_DONTWAIT, MT_DATA, M_PKTHDR, NULL);
+			m =  m_getl(len, M_NOWAIT, MT_DATA, M_PKTHDR, NULL);
 			if(m == NULL) {
 				/* eat packet if get mbuf fail!! */
 				ar_eat_packet(sc, 1);
diff --git a/sys/dev/netif/ath/ath/if_ath_rx.c b/sys/dev/netif/ath/ath/if_ath_rx.c
index 42bfe07..465c35e 100644
--- a/sys/dev/netif/ath/ath/if_ath_rx.c
+++ b/sys/dev/netif/ath/ath/if_ath_rx.c
@@ -253,7 +253,7 @@ ath_legacy_rxbuf_init(struct ath_softc *sc, struct ath_buf *bf)
 		 * multiple of the cache line size.  Not doing this
 		 * causes weird stuff to happen (for the 5210 at least).
 		 */
-		m = m_getcl(MB_WAIT, MT_DATA, M_PKTHDR);
+		m = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR);
 		if (m == NULL) {
 			DPRINTF(sc, ATH_DEBUG_ANY,
 				"%s: no mbuf/cluster\n", __func__);
diff --git a/sys/dev/netif/ath/ath/if_ath_rx_edma.c b/sys/dev/netif/ath/ath/if_ath_rx_edma.c
index c2e5bd1..c4fb787 100644
--- a/sys/dev/netif/ath/ath/if_ath_rx_edma.c
+++ b/sys/dev/netif/ath/ath/if_ath_rx_edma.c
@@ -612,9 +612,9 @@ ath_edma_rxbuf_init(struct ath_softc *sc, struct ath_buf *bf)
 
 	ATH_RX_LOCK_ASSERT(sc);
 
-	m = m_getjcl(MB_DONTWAIT, MT_DATA, M_PKTHDR, sc->sc_edma_bufsize);
-/*	m = m_getcl(MB_WAIT, MT_DATA, M_PKTHDR);*/
-/*	m = m_getm(NULL, sc->sc_edma_bufsize, MB_WAIT, MT_DATA);*/
+	m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, sc->sc_edma_bufsize);
+/*	m = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR);*/
+/*	m = m_getm(NULL, sc->sc_edma_bufsize, M_WAITOK, MT_DATA);*/
 	if (! m)
 		return (ENOBUFS);		/* XXX ?*/
 
diff --git a/sys/dev/netif/bce/if_bce.c b/sys/dev/netif/bce/if_bce.c
index 2c6d673..59ac0eb 100644
--- a/sys/dev/netif/bce/if_bce.c
+++ b/sys/dev/netif/bce/if_bce.c
@@ -3867,7 +3867,7 @@ bce_newbuf_std(struct bce_rx_ring *rxr, uint16_t *prod, uint16_t chain_prod,
 	int error, nseg;
 
 	/* This is a new mbuf allocation. */
-	m_new = m_getcl(init ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m_new = m_getcl(init ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m_new == NULL)
 		return ENOBUFS;
 
diff --git a/sys/dev/netif/bfe/if_bfe.c b/sys/dev/netif/bfe/if_bfe.c
index 7877989..2605b99 100644
--- a/sys/dev/netif/bfe/if_bfe.c
+++ b/sys/dev/netif/bfe/if_bfe.c
@@ -565,7 +565,7 @@ bfe_newbuf(struct bfe_softc *sc, int c, int init)
 	struct mbuf *m;
 	int error, nsegs;
 
-	m = m_getcl(init ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(init ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return ENOBUFS;
 	m->m_len = m->m_pkthdr.len = MCLBYTES;
diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c
index f0af838..b53d246 100644
--- a/sys/dev/netif/bge/if_bge.c
+++ b/sys/dev/netif/bge/if_bge.c
@@ -1020,7 +1020,7 @@ bge_newbuf_std(struct bge_softc *sc, int i, int init)
 	bus_dmamap_t map;
 	int error, nsegs;
 
-	m_new = m_getcl(init ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m_new = m_getcl(init ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m_new == NULL)
 		return ENOBUFS;
 	m_new->m_len = m_new->m_pkthdr.len = MCLBYTES;
@@ -1083,7 +1083,7 @@ bge_newbuf_jumbo(struct bge_softc *sc, int i, int init)
 	bus_addr_t paddr;
 
 	/* Allocate the mbuf. */
-	MGETHDR(m_new, init ? MB_WAIT : MB_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, init ? M_WAITOK : M_NOWAIT, MT_DATA);
 	if (m_new == NULL)
 		return ENOBUFS;
 
@@ -3572,7 +3572,7 @@ bge_encap(struct bge_softc *sc, struct mbuf **m_head0, uint32_t *txidx,
 		 * DMA read operation.  If it fails, keep moving on using
 		 * the original mbuf chain.
 		 */
-		m_new = m_defrag(m_head, MB_DONTWAIT);
+		m_new = m_defrag(m_head, M_NOWAIT);
 		if (m_new != NULL)
 			*m_head0 = m_head = m_new;
 	}
@@ -5040,7 +5040,7 @@ bge_defrag_shortdma(struct mbuf *m)
 	}
 
 	if (found > 1)
-		n = m_defrag(m, MB_DONTWAIT);
+		n = m_defrag(m, M_NOWAIT);
 	else
 		n = m;
 	return n;
diff --git a/sys/dev/netif/bnx/if_bnx.c b/sys/dev/netif/bnx/if_bnx.c
index c0d9270..98f2f53 100644
--- a/sys/dev/netif/bnx/if_bnx.c
+++ b/sys/dev/netif/bnx/if_bnx.c
@@ -810,7 +810,7 @@ bnx_newbuf_std(struct bnx_rx_ret_ring *ret, int i, int init)
 	rb = &ret->bnx_std->bnx_rx_std_buf[i];
 	KASSERT(!rb->bnx_rx_refilled, ("RX buf %dth has been refilled", i));
 
-	m_new = m_getcl(init ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m_new = m_getcl(init ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m_new == NULL) {
 		error = ENOBUFS;
 		goto back;
@@ -882,7 +882,7 @@ bnx_newbuf_jumbo(struct bnx_softc *sc, int i, int init)
 	bus_addr_t paddr;
 
 	/* Allocate the mbuf. */
-	MGETHDR(m_new, init ? MB_WAIT : MB_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, init ? M_WAITOK : M_NOWAIT, MT_DATA);
 	if (m_new == NULL)
 		return ENOBUFS;
 
@@ -3446,7 +3446,7 @@ bnx_encap(struct bnx_tx_ring *txr, struct mbuf **m_head0, uint32_t *txidx,
 		 * DMA read operation.  If it fails, keep moving on using
 		 * the original mbuf chain.
 		 */
-		m_new = m_defrag(m_head, MB_DONTWAIT);
+		m_new = m_defrag(m_head, M_NOWAIT);
 		if (m_new != NULL)
 			*m_head0 = m_head = m_new;
 	}
@@ -5038,7 +5038,7 @@ bnx_defrag_shortdma(struct mbuf *m)
 	}
 
 	if (found > 1)
-		n = m_defrag(m, MB_DONTWAIT);
+		n = m_defrag(m, M_NOWAIT);
 	else
 		n = m;
 	return n;
diff --git a/sys/dev/netif/bwi/if_bwi.c b/sys/dev/netif/bwi/if_bwi.c
index f3e81a2..1ad2b01 100644
--- a/sys/dev/netif/bwi/if_bwi.c
+++ b/sys/dev/netif/bwi/if_bwi.c
@@ -2611,7 +2611,7 @@ bwi_newbuf(struct bwi_softc *sc, int buf_idx, int init)
 
 	KKASSERT(buf_idx < BWI_RX_NDESC);
 
-	m = m_getcl(init ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(init ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
 		error = ENOBUFS;
 
@@ -3087,7 +3087,7 @@ bwi_encap(struct bwi_softc *sc, int idx, struct mbuf *m,
 	/*
 	 * Setup the embedded TX header
 	 */
-	M_PREPEND(m, sizeof(*hdr), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(*hdr), M_NOWAIT);
 	if (m == NULL) {
 		if_printf(&ic->ic_if, "prepend TX header failed\n");
 		return ENOBUFS;
@@ -3148,7 +3148,7 @@ bwi_encap(struct bwi_softc *sc, int idx, struct mbuf *m,
 	if (error) {	/* error == EFBIG */
 		struct mbuf *m_new;
 
-		m_new = m_defrag(m, MB_DONTWAIT);
+		m_new = m_defrag(m, M_NOWAIT);
 		if (m_new == NULL) {
 			if_printf(&ic->ic_if, "can't defrag TX buffer\n");
 			error = ENOBUFS;
diff --git a/sys/dev/netif/cs/if_cs.c b/sys/dev/netif/cs/if_cs.c
index 970aa9e..05aa1f2 100644
--- a/sys/dev/netif/cs/if_cs.c
+++ b/sys/dev/netif/cs/if_cs.c
@@ -839,12 +839,12 @@ cs_get_packet(struct cs_softc *sc)
 		return -1;
 	}
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m==NULL)
 		return -1;
 
 	if (length > MHLEN) {
-		MCLGET(m, MB_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if (!(m->m_flags & M_EXT)) {
 			m_freem(m);
 			return -1;
diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c
index b8e7508..95b307e 100644
--- a/sys/dev/netif/dc/if_dc.c
+++ b/sys/dev/netif/dc/if_dc.c
@@ -2318,7 +2318,7 @@ dc_newbuf(struct dc_softc *sc, int i, struct mbuf *m)
 	c = &sc->dc_ldata->dc_rx_list[i];
 
 	if (m == NULL) {
-		m_new = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		m_new = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (m_new == NULL)
 			return (ENOBUFS);
 		m_new->m_len = m_new->m_pkthdr.len = MCLBYTES;
@@ -3128,7 +3128,7 @@ dc_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
 			}
 
 			/* only coalesce if have >1 mbufs */
-			m_defragged = m_defrag(m_head, MB_DONTWAIT);
+			m_defragged = m_defrag(m_head, M_NOWAIT);
 			if (m_defragged == NULL) {
 				ifq_set_oactive(&ifp->if_snd);
 				ifq_prepend(&ifp->if_snd, m_head);
diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c
index 94e0570..d4618c9 100644
--- a/sys/dev/netif/de/if_de.c
+++ b/sys/dev/netif/de/if_de.c
@@ -145,7 +145,7 @@ tulip_txprobe(tulip_softc_t *sc)
      * either is connected so the transmit is the only way
      * to verify the connectivity.
      */
-    MGETHDR(m, MB_DONTWAIT, MT_DATA);
+    MGETHDR(m, M_NOWAIT, MT_DATA);
     if (m == NULL)
 	return 0;
     /*
@@ -3133,11 +3133,11 @@ tulip_rx_intr(tulip_softc_t *sc)
 
 #if defined(TULIP_COPY_RXDATA)
 	    if (!accept || total_len >= (MHLEN - 2))
-		m0 = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		m0 = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	    else
-		m0 = m_gethdr(MB_DONTWAIT, MT_DATA);
+		m0 = m_gethdr(M_NOWAIT, MT_DATA);
 #else
-	    m0 = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	    m0 = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 #endif
 
 	    if (accept
@@ -3495,7 +3495,7 @@ tulip_txput(tulip_softc_t *sc, struct mbuf *m)
 		 * entries that we can use for one packet, so we have
 		 * recopy it into one mbuf and then try again.
 		 */
-		m0 = m_defrag(m, MB_DONTWAIT);
+		m0 = m_defrag(m, M_NOWAIT);
 		if (m0 == NULL)
 		    goto finish;
 		m = m0;
diff --git a/sys/dev/netif/ed/if_ed.c b/sys/dev/netif/ed/if_ed.c
index eb9f1ce..c831b07 100644
--- a/sys/dev/netif/ed/if_ed.c
+++ b/sys/dev/netif/ed/if_ed.c
@@ -2756,7 +2756,7 @@ ed_get_packet(struct ed_softc *sc, char *buf, u_short len)
 	 * to the header. The +2 is to compensate for the alignment
 	 * fixup below.
 	 */
-	m = m_getl(len + 2, MB_DONTWAIT, MT_DATA, M_PKTHDR, NULL);
+	m = m_getl(len + 2, M_NOWAIT, MT_DATA, M_PKTHDR, NULL);
 	if (m == NULL)
 		return;
 	m->m_pkthdr.rcvif = ifp;
diff --git a/sys/dev/netif/em/if_em.c b/sys/dev/netif/em/if_em.c
index 27b5286..1e3bc1c 100644
--- a/sys/dev/netif/em/if_em.c
+++ b/sys/dev/netif/em/if_em.c
@@ -3080,7 +3080,7 @@ em_newbuf(struct adapter *adapter, int i, int init)
 	struct em_buffer *rx_buffer;
 	int error, nseg;
 
-	m = m_getcl(init ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(init ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
 		adapter->mbuf_cluster_failed++;
 		if (init) {
diff --git a/sys/dev/netif/emx/if_emx.c b/sys/dev/netif/emx/if_emx.c
index d3e59d2..70e2f52 100644
--- a/sys/dev/netif/emx/if_emx.c
+++ b/sys/dev/netif/emx/if_emx.c
@@ -2669,7 +2669,7 @@ emx_newbuf(struct emx_rxdata *rdata, int i, int init)
 	struct emx_rxbuf *rx_buffer;
 	int error, nseg;
 
-	m = m_getcl(init ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(init ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
 		if (init) {
 			if_printf(&rdata->sc->arpcom.ac_if,
diff --git a/sys/dev/netif/ep/if_ep.c b/sys/dev/netif/ep/if_ep.c
index 0ddf5d9..f50e642 100644
--- a/sys/dev/netif/ep/if_ep.c
+++ b/sys/dev/netif/ep/if_ep.c
@@ -663,7 +663,7 @@ read_again:
     rx_fifo = rx_fifo2 = status & RX_BYTES_MASK;
 
     if (EP_FTST(sc, F_RX_FIRST)) {
-	m = m_getl(rx_fifo, MB_DONTWAIT, MT_DATA, M_PKTHDR, NULL);
+	m = m_getl(rx_fifo, M_NOWAIT, MT_DATA, M_PKTHDR, NULL);
 	if (!m)
 	    goto out;
 	sc->top = sc->mcur = top = m;
@@ -689,7 +689,7 @@ read_again:
 	lenthisone = min(rx_fifo, M_TRAILINGSPACE(m));
 	if (lenthisone == 0) {	/* no room in this one */
 	    mcur = m;
-	    m = m_getl(rx_fifo, MB_DONTWAIT, MT_DATA, 0, NULL);
+	    m = m_getl(rx_fifo, M_NOWAIT, MT_DATA, 0, NULL);
 	    if (!m)
 		goto out;
 	    m->m_len = 0;
diff --git a/sys/dev/netif/et/if_et.c b/sys/dev/netif/et/if_et.c
index 55a2f11..738901d 100644
--- a/sys/dev/netif/et/if_et.c
+++ b/sys/dev/netif/et/if_et.c
@@ -2104,7 +2104,8 @@ et_newbuf(struct et_rxbuf_data *rbd, int buf_idx, int init, int len0)
 	KKASSERT(buf_idx < ET_RX_NDESC);
 	rb = &rbd->rbd_buf[buf_idx];
 
-	m = m_getl(len0, init ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR, &len);
+	m = m_getl(len0, init ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR,
+		   &len);
 	if (m == NULL) {
 		error = ENOBUFS;
 
@@ -2363,7 +2364,7 @@ et_newbuf_jumbo(struct et_rxbuf_data *rbd, int buf_idx, int init)
 
 	error = ENOBUFS;
 
-	MGETHDR(m, init ? MB_WAIT : MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, init ? M_WAITOK : M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		if (init) {
 			if_printf(&sc->arpcom.ac_if, "MGETHDR failed\n");
diff --git a/sys/dev/netif/ex/if_ex.c b/sys/dev/netif/ex/if_ex.c
index 98eab9f..9719af4 100644
--- a/sys/dev/netif/ex/if_ex.c
+++ b/sys/dev/netif/ex/if_ex.c
@@ -683,7 +683,7 @@ ex_rx_intr(struct ex_softc *sc)
 		pkt_len = inw(iobase + IO_PORT_REG);
 
 		if (rx_status & RCV_OK_bit) {
-			MGETHDR(m, MB_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			ipkt = m;
 			if (ipkt == NULL) {
 				IFNET_STAT_INC(ifp, iqdrops, 1);
@@ -694,7 +694,7 @@ ex_rx_intr(struct ex_softc *sc)
 
 				while (pkt_len > 0) {
 					if (pkt_len > MINCLSIZE) {
-						MCLGET(m, MB_DONTWAIT);
+						MCLGET(m, M_NOWAIT);
 						if (m->m_flags & M_EXT) {
 							m->m_len = MCLBYTES;
 						} else {
@@ -719,7 +719,8 @@ ex_rx_intr(struct ex_softc *sc)
 					pkt_len -= m->m_len;
 
 					if (pkt_len > 0) {
-						MGET(m->m_next, MB_DONTWAIT, MT_DATA);
+						MGET(m->m_next, M_NOWAIT,
+						     MT_DATA);
 						if (m->m_next == NULL) {
 							m_freem(ipkt);
 							IFNET_STAT_INC(ifp, iqdrops, 1);
diff --git a/sys/dev/netif/fe/if_fe.c b/sys/dev/netif/fe/if_fe.c
index b7254a3..277ca94 100644
--- a/sys/dev/netif/fe/if_fe.c
+++ b/sys/dev/netif/fe/if_fe.c
@@ -1847,13 +1847,13 @@ fe_get_packet (struct fe_softc * sc, u_short len)
 	 */
 
 	/* Allocate an mbuf with packet header info.  */
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, 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, MB_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if (!(m->m_flags & M_EXT)) {
 			m_freem(m);
 			return -1;
diff --git a/sys/dev/netif/fwe/if_fwe.c b/sys/dev/netif/fwe/if_fwe.c
index 0483765..f6d2004 100644
--- a/sys/dev/netif/fwe/if_fwe.c
+++ b/sys/dev/netif/fwe/if_fwe.c
@@ -346,7 +346,7 @@ found:
 		STAILQ_INIT(&xferq->stdma);
 		xferq->stproc = NULL;
 		for (i = 0; i < xferq->bnchunk; i ++) {
-			m = m_getcl(MB_WAIT, MT_DATA, M_PKTHDR);
+			m = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR);
 			xferq->bulkxfer[i].mbuf = m;
 			if (m != NULL) {
 				m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
@@ -504,7 +504,7 @@ fwe_as_output(struct fwe_softc *fwe, struct ifnet *ifp)
 		BPF_MTAP(ifp, m);
 
 		/* keep ip packet alignment for alpha */
-		M_PREPEND(m, ETHER_ALIGN, MB_DONTWAIT);
+		M_PREPEND(m, ETHER_ALIGN, M_NOWAIT);
 		fp = &xfer->send.hdr;
 		*(u_int32_t *)&xfer->send.hdr = *(int32_t *)&fwe->pkt_hdr;
 		fp->mode.stream.len = m->m_pkthdr.len;
@@ -550,7 +550,7 @@ fwe_as_input(struct fw_xferq *xferq)
 		m = sxfer->mbuf;
 
 		/* insert new rbuf */
-		sxfer->mbuf = m0 = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		sxfer->mbuf = m0 = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (m0 != NULL) {
 			m0->m_len = m0->m_pkthdr.len = m0->m_ext.ext_size;
 			STAILQ_INSERT_TAIL(&xferq->stfree, sxfer, link);
diff --git a/sys/dev/netif/fxp/if_fxp.c b/sys/dev/netif/fxp/if_fxp.c
index 934dcbb..a5bfd10 100644
--- a/sys/dev/netif/fxp/if_fxp.c
+++ b/sys/dev/netif/fxp/if_fxp.c
@@ -1106,7 +1106,7 @@ tbdinit:
 				continue;
 			}
 
-			mn = m_dup(mb_head, MB_DONTWAIT);
+			mn = m_dup(mb_head, M_NOWAIT);
 			if (mn == NULL) {
 				m_freem(mb_head);
 				IFNET_STAT_INC(ifp, oerrors, 1);
@@ -1957,7 +1957,7 @@ fxp_add_rfabuf(struct fxp_softc *sc, struct mbuf *oldm)
 	struct mbuf *m;
 	struct fxp_rfa *rfa, *p_rfa;
 
-	m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) { /* try to recycle the old mbuf instead */
 		if (oldm == NULL)
 			return 1;
diff --git a/sys/dev/netif/igb/if_igb.c b/sys/dev/netif/igb/if_igb.c
index 10f3923..3006c10 100644
--- a/sys/dev/netif/igb/if_igb.c
+++ b/sys/dev/netif/igb/if_igb.c
@@ -2324,7 +2324,7 @@ igb_newbuf(struct igb_rx_ring *rxr, int i, boolean_t wait)
 	struct igb_rx_buf *rxbuf;
 	int error, nseg;
 
-	m = m_getcl(wait ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(wait ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
 		if (wait) {
 			if_printf(&rxr->sc->arpcom.ac_if,
diff --git a/sys/dev/netif/iwi/if_iwi.c b/sys/dev/netif/iwi/if_iwi.c
index 02f0512..67d28b5 100644
--- a/sys/dev/netif/iwi/if_iwi.c
+++ b/sys/dev/netif/iwi/if_iwi.c
@@ -782,7 +782,7 @@ iwi_alloc_rx_ring(struct iwi_softc *sc, struct iwi_rx_ring *ring, int count)
 			goto fail;
 		}
 
-		data->m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		data->m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (data->m == NULL) {
 			device_printf(sc->sc_dev,
 			    "could not allocate rx mbuf\n");
@@ -1232,7 +1232,7 @@ iwi_frame_intr(struct iwi_softc *sc, struct iwi_rx_data *data, int i,
 	 * drop the received packet and reuse the old mbuf. In the unlikely
 	 * case that the old mbuf can't be reloaded either, explicitly panic.
 	 */
-	mnew = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	mnew = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (mnew == NULL) {
 		IFNET_STAT_INC(ifp, ierrors, 1);
 		return;
@@ -1859,7 +1859,7 @@ iwi_tx_start(struct ifnet *ifp, struct mbuf *m0, struct ieee80211_node *ni,
 		return error;
 	}
 	if (error != 0) {
-		mnew = m_defrag(m0, MB_DONTWAIT);
+		mnew = m_defrag(m0, M_NOWAIT);
 		if (mnew == NULL) {
 			device_printf(sc->sc_dev,
 			    "could not defragment mbuf\n");
diff --git a/sys/dev/netif/iwl/iwl2100.c b/sys/dev/netif/iwl/iwl2100.c
index 539601f..6787b31 100644
--- a/sys/dev/netif/iwl/iwl2100.c
+++ b/sys/dev/netif/iwl/iwl2100.c
@@ -1653,7 +1653,7 @@ iwl2100_alloc_cmd(struct iwl2100_softc *sc)
 {
 	KKASSERT(sc->sc_cmd == NULL);
 
-	sc->sc_cmd = m_getcl(MB_WAIT, MT_DATA, M_PKTHDR);
+	sc->sc_cmd = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR);
 	if (sc->sc_cmd == NULL)
 		return ENOBUFS;
 	return 0;
@@ -1673,7 +1673,7 @@ iwl2100_newbuf(struct iwl2100_softc *sc, int buf_idx, int init)
 	KKASSERT(buf_idx < IWL2100_RX_NDESC);
 	rb = &rr->rr_buf[buf_idx];
 
-	m = m_getcl(init ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(init ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
 		error = ENOBUFS;
 
@@ -3332,7 +3332,7 @@ iwl2100_encap(struct iwl2100_softc *sc, struct mbuf *m)
 	/*
 	 * Prepend and setup hardware TX header
 	 */
-	M_PREPEND(m, sizeof(*th), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(*th), M_NOWAIT);
 	if (m == NULL) {
 		if_printf(&sc->sc_ic.ic_if, "prepend TX header failed\n");
 		return ENOBUFS;
@@ -3372,7 +3372,7 @@ iwl2100_encap(struct iwl2100_softc *sc, struct mbuf *m)
 	if (error) {	/* error == EFBIG */
 		struct mbuf *m_new;
 
-		m_new = m_defrag(m, MB_DONTWAIT);
+		m_new = m_defrag(m, M_NOWAIT);
 		if (m_new == NULL) {
 			if_printf(&sc->sc_ic.ic_if, "can't defrag TX mbuf\n");
 			error = ENOBUFS;
diff --git a/sys/dev/netif/iwn/if_iwn.c b/sys/dev/netif/iwn/if_iwn.c
index 18c15d7..441e422 100644
--- a/sys/dev/netif/iwn/if_iwn.c
+++ b/sys/dev/netif/iwn/if_iwn.c
@@ -1914,7 +1914,7 @@ iwn_alloc_rx_ring(struct iwn_softc *sc, struct iwn_rx_ring *ring)
 			goto fail;
 		}
 
-		data->m = m_getjcl(MB_DONTWAIT, MT_DATA,
+		data->m = m_getjcl(M_NOWAIT, MT_DATA,
 				   M_PKTHDR, IWN_RBUF_SIZE);
 		if (data->m == NULL) {
 			device_printf(sc->sc_dev,
@@ -2984,7 +2984,7 @@ iwn_rx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc,
 		return;
 	}
 
-	m1 = m_getjcl(MB_DONTWAIT, MT_DATA, M_PKTHDR, IWN_RBUF_SIZE);
+	m1 = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, IWN_RBUF_SIZE);
 	if (m1 == NULL) {
 		DPRINTF(sc, IWN_DEBUG_ANY, "%s: no mbuf to restock ring\n",
 		    __func__);
@@ -4447,7 +4447,7 @@ iwn_tx_data(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
 			return error;
 		}
 		/* Too many DMA segments, linearize mbuf. */
-		m1 = m_defrag(m, MB_DONTWAIT);
+		m1 = m_defrag(m, M_NOWAIT);
 		if (m1 == NULL) {
 			device_printf(sc->sc_dev,
 			    "%s: could not defrag mbuf\n", __func__);
@@ -4914,7 +4914,7 @@ iwn_cmd(struct iwn_softc *sc, int code, const void *buf, int size, int async)
 		/* Command is too large to fit in a descriptor. */
 		if (totlen > MJUMPAGESIZE)
 			return EINVAL;
-		m = m_getjcl(MB_DONTWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
+		m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
 		if (m == NULL)
 			return ENOMEM;
 		cmd = mtod(m, struct iwn_tx_cmd *);
diff --git a/sys/dev/netif/ix/if_ix.c b/sys/dev/netif/ix/if_ix.c
index 6cfaa0e..7c52cd8 100644
--- a/sys/dev/netif/ix/if_ix.c
+++ b/sys/dev/netif/ix/if_ix.c
@@ -3931,9 +3931,9 @@ ix_newbuf(struct ix_rx_ring *rxr, int i, boolean_t wait)
 	struct ix_rx_buf *rxbuf;
 	int flags, error, nseg;
 
-	flags = MB_DONTWAIT;
+	flags = M_NOWAIT;
 	if (__predict_false(wait))
-		flags = MB_WAIT;
+		flags = M_WAITOK;
 
 	m = m_getjcl(flags, MT_DATA, M_PKTHDR, rxr->rx_mbuf_sz);
 	if (m == NULL) {
diff --git a/sys/dev/netif/jme/if_jme.c b/sys/dev/netif/jme/if_jme.c
index acc6d07..ef085fe 100644
--- a/sys/dev/netif/jme/if_jme.c
+++ b/sys/dev/netif/jme/if_jme.c
@@ -3069,7 +3069,7 @@ jme_newbuf(struct jme_rxdata *rdata, struct jme_rxdesc *rxd, int init)
 	bus_dmamap_t map;
 	int error, nsegs;
 
-	m = m_getcl(init ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(init ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return ENOBUFS;
 	/*
diff --git a/sys/dev/netif/lge/if_lge.c b/sys/dev/netif/lge/if_lge.c
index 8c26601..d2c9262 100644
--- a/sys/dev/netif/lge/if_lge.c
+++ b/sys/dev/netif/lge/if_lge.c
@@ -664,7 +664,7 @@ lge_newbuf(struct lge_softc *sc, struct lge_rx_desc *c, struct mbuf *m)
 	struct lge_jslot *buf;
 
 	if (m == NULL) {
-		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			kprintf("lge%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->lge_unit);
@@ -1168,7 +1168,7 @@ again:
 				continue;
 			}
 
-			m_defragged = m_defrag(m_head, MB_DONTWAIT);
+			m_defragged = m_defrag(m_head, M_NOWAIT);
 			if (m_defragged == NULL) {
 				m_freem(m_head);
 				continue;
diff --git a/sys/dev/netif/lnc/lance.c b/sys/dev/netif/lnc/lance.c
index 87889f6..f2fc0bc 100644
--- a/sys/dev/netif/lnc/lance.c
+++ b/sys/dev/netif/lnc/lance.c
@@ -1,6 +1,5 @@
 /*	$NetBSD: lance.c,v 1.34 2005/12/24 20:27:30 perry Exp $	*/
 /*	$FreeBSD: src/sys/dev/le/lance.c,v 1.2 2006/05/16 21:04:01 marius Exp $	*/
-/*	$DragonFly: src/sys/dev/netif/lnc/lance.c,v 1.7 2008/05/14 11:59:20 sephe Exp $	*/
 
 
 /*-
@@ -346,7 +345,7 @@ lance_get(struct lance_softc *sc, int boff, int totlen)
 	}
 
 	do {
-		newm = m_getl(totlen, MB_DONTWAIT, MT_DATA,
+		newm = m_getl(totlen, M_NOWAIT, MT_DATA,
 			      m0 == NULL ? M_PKTHDR : 0, &mlen);
 		if (newm == NULL)
 			goto bad;
diff --git a/sys/dev/netif/mn/if_mn.c b/sys/dev/netif/mn/if_mn.c
index aab52b6..46441bb 100644
--- a/sys/dev/netif/mn/if_mn.c
+++ b/sys/dev/netif/mn/if_mn.c
@@ -683,7 +683,7 @@ ngmn_connect(hook_p hook)
 	/* Setup a transmit chain with one descriptor */
 	/* XXX: we actually send a 1 byte packet */
 	dp = mn_alloc_desc();
-	MGETHDR(m, MB_WAIT, MT_DATA);
+	MGETHDR(m, M_WAITOK, MT_DATA);
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_pkthdr.len = 0;
@@ -700,12 +700,12 @@ ngmn_connect(hook_p hook)
 
 	dp = mn_alloc_desc();
 	m = NULL;
-	MGETHDR(m, MB_WAIT, MT_DATA);
+	MGETHDR(m, M_WAITOK, MT_DATA);
 	if (m == NULL) {
 		mn_free_desc(dp);
 		return (ENOBUFS);
 	}
-	MCLGET(m, MB_WAIT);
+	MCLGET(m, M_WAITOK);
 	if ((m->m_flags & M_EXT) == 0) {
 		mn_free_desc(dp);
 		m_freem(m);
@@ -723,13 +723,13 @@ ngmn_connect(hook_p hook)
 		dp2 = dp;
 		dp = mn_alloc_desc();
 		m = NULL;
-		MGETHDR(m, MB_WAIT, MT_DATA);
+		MGETHDR(m, M_WAITOK, MT_DATA);
 		if (m == NULL) {
 			mn_free_desc(dp);
 			m_freem(m);
 			return (ENOBUFS);
 		}
-		MCLGET(m, MB_WAIT);
+		MCLGET(m, M_WAITOK);
 		if ((m->m_flags & M_EXT) == 0) {
 			mn_free_desc(dp);
 			m_freem(m);
@@ -1171,12 +1171,12 @@ mn_rx_intr(struct softc *sc, u_int32_t vector)
 
 		/* Replenish desc + mbuf supplies */
 		if (!m) {
-			MGETHDR(m, MB_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if (m == NULL) {
 				mn_free_desc(dp);
 				return; /* ENOBUFS */
 			}
-			MCLGET(m, MB_DONTWAIT);
+			MCLGET(m, M_NOWAIT);
 			if((m->m_flags & M_EXT) == 0) {
 				mn_free_desc(dp);
 				m_freem(m);
diff --git a/sys/dev/netif/msk/if_msk.c b/sys/dev/netif/msk/if_msk.c
index 38480b1..e4b70b0 100644
--- a/sys/dev/netif/msk/if_msk.c
+++ b/sys/dev/netif/msk/if_msk.c
@@ -724,7 +724,7 @@ msk_newbuf(struct msk_if_softc *sc_if, int idx, int init)
 	bus_dmamap_t map;
 	int error, nseg;
 
-	m = m_getcl(init ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(init ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return (ENOBUFS);
 
@@ -773,7 +773,7 @@ msk_jumbo_newbuf(struct msk_if_softc *sc_if, int idx)
 	int nsegs;
 	void *buf;
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return (ENOBUFS);
 	buf = msk_jalloc(sc_if);
@@ -2427,7 +2427,7 @@ msk_encap(struct msk_if_softc *sc_if, struct mbuf **m_head)
 		}
 	}
 	if (defrag) {
-		m = m_defrag(*m_head, MB_DONTWAIT);
+		m = m_defrag(*m_head, M_NOWAIT);
 		if (m == NULL) {
 			m_freem(*m_head);
 			*m_head = NULL;
diff --git a/sys/dev/netif/mxge/if_mxge.c b/sys/dev/netif/mxge/if_mxge.c
index 209c5a9..1327de1 100644
--- a/sys/dev/netif/mxge/if_mxge.c
+++ b/sys/dev/netif/mxge/if_mxge.c
@@ -2058,9 +2058,9 @@ mxge_get_buf_small(mxge_rx_ring_t *rx, bus_dmamap_t map, int idx,
 	struct mbuf *m;
 	int cnt, err, mflag;
 
-	mflag = MB_DONTWAIT;
+	mflag = M_NOWAIT;
 	if (__predict_false(init))
-		mflag = MB_WAIT;
+		mflag = M_WAITOK;
 
 	m = m_gethdr(mflag, MT_DATA);
 	if (m == NULL) {
@@ -2108,9 +2108,9 @@ mxge_get_buf_big(mxge_rx_ring_t *rx, bus_dmamap_t map, int idx,
 	struct mbuf *m;
 	int cnt, err, mflag;
 
-	mflag = MB_DONTWAIT;
+	mflag = M_NOWAIT;
 	if (__predict_false(init))
-		mflag = MB_WAIT;
+		mflag = M_WAITOK;
 
 	if (rx->cl_size == MCLBYTES)
 		m = m_getcl(mflag, MT_DATA, M_PKTHDR);
diff --git a/sys/dev/netif/my/if_my.c b/sys/dev/netif/my/if_my.c
index 393c8b4..1830f2a 100644
--- a/sys/dev/netif/my/if_my.c
+++ b/sys/dev/netif/my/if_my.c
@@ -1058,13 +1058,13 @@ my_newbuf(struct my_softc * sc, struct my_chain_onefrag * c)
 {
 	struct mbuf    *m_new = NULL;
 
-	MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, M_NOWAIT, MT_DATA);
 	if (m_new == NULL) {
 		kprintf("my%d: no memory for rx list -- packet dropped!\n",
 		       sc->my_unit);
 		return (ENOBUFS);
 	}
-	MCLGET(m_new, MB_DONTWAIT);
+	MCLGET(m_new, M_NOWAIT);
 	if (!(m_new->m_flags & M_EXT)) {
 		kprintf("my%d: no memory for rx list -- packet dropped!\n",
 		       sc->my_unit);
@@ -1287,13 +1287,13 @@ my_encap(struct my_softc * sc, struct my_chain * c, struct mbuf * m_head)
 	 * chain.
 	 */
 	m = m_head;
-	MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, M_NOWAIT, MT_DATA);
 	if (m_new == NULL) {
 		kprintf("my%d: no memory for tx list", sc->my_unit);
 		return (1);
 	}
 	if (m_head->m_pkthdr.len > MHLEN) {
-		MCLGET(m_new, MB_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			kprintf("my%d: no memory for tx list", sc->my_unit);
diff --git a/sys/dev/netif/ndis/if_ndis.c b/sys/dev/netif/ndis/if_ndis.c
index d76c8fe..564d5be 100644
--- a/sys/dev/netif/ndis/if_ndis.c
+++ b/sys/dev/netif/ndis/if_ndis.c
@@ -1163,7 +1163,7 @@ ndis_rxeof_eth(ndis_handle adapter, ndis_handle ctx, char *addr, void *hdr,
 
 	block = adapter;
 
-	m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return;
 
@@ -1396,7 +1396,7 @@ ndis_rxeof(ndis_handle adapter, ndis_packet **packets, uint32_t pktcnt)
 		} else {
 #ifdef notdef
 			if (p->np_oob.npo_status == NDIS_STATUS_RESOURCES) {
-				m = m_dup(m0, MB_DONTWAIT);
+				m = m_dup(m0, M_NOWAIT);
 				/*
 				 * NOTE: we want to destroy the mbuf here, but
 				 * we don't actually want to return it to the
@@ -1414,7 +1414,7 @@ ndis_rxeof(ndis_handle adapter, ndis_packet **packets, uint32_t pktcnt)
 			} else
 				p->np_oob.npo_status = NDIS_STATUS_PENDING;
 #endif
-			m = m_dup(m0, MB_DONTWAIT);
+			m = m_dup(m0, M_NOWAIT);
 			if (p->np_oob.npo_status == NDIS_STATUS_RESOURCES)
 				p->np_refcnt++;
 			else
diff --git a/sys/dev/netif/nfe/if_nfe.c b/sys/dev/netif/nfe/if_nfe.c
index b67cf8c..5c65e59 100644
--- a/sys/dev/netif/nfe/if_nfe.c
+++ b/sys/dev/netif/nfe/if_nfe.c
@@ -2202,7 +2202,7 @@ nfe_newbuf_std(struct nfe_softc *sc, struct nfe_rx_ring *ring, int idx,
 	struct mbuf *m;
 	int nsegs, error;
 
-	m = m_getcl(wait ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(wait ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return ENOBUFS;
 	m->m_len = m->m_pkthdr.len = MCLBYTES;
@@ -2251,7 +2251,7 @@ nfe_newbuf_jumbo(struct nfe_softc *sc, struct nfe_rx_ring *ring, int idx,
 	struct nfe_jbuf *jbuf;
 	struct mbuf *m;
 
-	MGETHDR(m, wait ? MB_WAIT : MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, wait ? M_WAITOK : M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOBUFS;
 
diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c
index 2506b7a..4fc949e 100644
--- a/sys/dev/netif/nge/if_nge.c
+++ b/sys/dev/netif/nge/if_nge.c
@@ -1038,7 +1038,7 @@ nge_newbuf(struct nge_softc *sc, struct nge_desc *c, struct mbuf *m)
 	struct nge_jslot *buf;
 
 	if (m == NULL) {
-		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			kprintf("nge%d: no memory for rx list "
 			    "-- packet dropped!\n", sc->nge_unit);
@@ -1669,7 +1669,7 @@ again:
 				break;
 			}
 
-			m_defragged = m_defrag(m_head, MB_DONTWAIT);
+			m_defragged = m_defrag(m_head, M_NOWAIT);
 			if (m_defragged == NULL) {
 				m_freem(m_head);
 				continue;
diff --git a/sys/dev/netif/pcn/if_pcn.c b/sys/dev/netif/pcn/if_pcn.c
index 5b34bd1..ffddea9 100644
--- a/sys/dev/netif/pcn/if_pcn.c
+++ b/sys/dev/netif/pcn/if_pcn.c
@@ -723,11 +723,11 @@ pcn_newbuf(struct pcn_softc *sc, int idx, struct mbuf *m)
 	c = &sc->pcn_ldata->pcn_rx_list[idx];
 
 	if (m == NULL) {
-		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, MB_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1039,7 +1039,7 @@ again:
 				break;
 			}
 
-			m_defragged = m_defrag(m_head, MB_DONTWAIT);
+			m_defragged = m_defrag(m_head, M_NOWAIT);
 			if (m_defragged == NULL) {
 				m_freem(m_head);
 				continue;
diff --git a/sys/dev/netif/ral/rt2560.c b/sys/dev/netif/ral/rt2560.c
index 3c4da86..d292aca 100644
--- a/sys/dev/netif/ral/rt2560.c
+++ b/sys/dev/netif/ral/rt2560.c
@@ -669,7 +669,7 @@ rt2560_alloc_rx_ring(struct rt2560_softc *sc, struct rt2560_rx_ring *ring,
 			goto fail;
 		}
 
-		data->m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		data->m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (data->m == NULL) {
 			device_printf(sc->sc_dev,
 			    "could not allocate rx mbuf\n");
@@ -1157,7 +1157,7 @@ rt2560_decryption_intr(struct rt2560_softc *sc)
 		 * mbuf. In the unlikely case that the old mbuf can't be
 		 * reloaded either, explicitly panic.
 		 */
-		mnew = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		mnew = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (mnew == NULL) {
 			IFNET_STAT_INC(ifp, ierrors, 1);
 			goto skip;
@@ -1834,7 +1834,7 @@ rt2560_tx_data(struct rt2560_softc *sc, struct mbuf *m0,
 		return error;
 	}
 	if (error != 0) {
-		mnew = m_defrag(m0, MB_DONTWAIT);
+		mnew = m_defrag(m0, M_NOWAIT);
 		if (mnew == NULL) {
 			device_printf(sc->sc_dev,
 			    "could not defragment mbuf\n");
diff --git a/sys/dev/netif/ral/rt2661.c b/sys/dev/netif/ral/rt2661.c
index 1b5fdf4..33d1f2b 100644
--- a/sys/dev/netif/ral/rt2661.c
+++ b/sys/dev/netif/ral/rt2661.c
@@ -679,7 +679,7 @@ rt2661_alloc_rx_ring(struct rt2661_softc *sc, struct rt2661_rx_ring *ring,
 			goto fail;
 		}
 
-		data->m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		data->m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (data->m == NULL) {
 			device_printf(sc->sc_dev,
 			    "could not allocate rx mbuf\n");
@@ -1028,7 +1028,7 @@ rt2661_rx_intr(struct rt2661_softc *sc)
 		 * mbuf. In the unlikely case that the old mbuf can't be
 		 * reloaded either, explicitly panic.
 		 */
-		mnew = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		mnew = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (mnew == NULL) {
 			IFNET_STAT_INC(ifp, ierrors, 1);
 			goto skip;
@@ -1526,7 +1526,7 @@ rt2661_tx_data(struct rt2661_softc *sc, struct mbuf *m0,
 		return error;
 	}
 	if (error != 0) {
-		mnew = m_defrag(m0, MB_DONTWAIT);
+		mnew = m_defrag(m0, M_NOWAIT);
 		if (mnew == NULL) {
 			device_printf(sc->sc_dev,
 			    "could not defragment mbuf\n");
diff --git a/sys/dev/netif/re/if_re.c b/sys/dev/netif/re/if_re.c
index 8df2e73..8224212 100644
--- a/sys/dev/netif/re/if_re.c
+++ b/sys/dev/netif/re/if_re.c
@@ -814,7 +814,7 @@ re_diag(struct re_softc *sc)
 
 	/* Allocate a single mbuf */
 
-	MGETHDR(m0, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m0, M_NOWAIT, MT_DATA);
 	if (m0 == NULL)
 		return(ENOBUFS);
 
@@ -1741,7 +1741,7 @@ re_newbuf_std(struct re_softc *sc, int idx, int init)
 	struct mbuf *m;
 	int error, nsegs;
 
-	m = m_getcl(init ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(init ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
 		error = ENOBUFS;
 
@@ -1798,7 +1798,7 @@ re_newbuf_jumbo(struct re_softc *sc, int idx, int init)
 	struct re_jbuf *jbuf;
 	int error = 0;
 
-	MGETHDR(m, init ? MB_WAIT : MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, init ? M_WAITOK : M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		error = ENOBUFS;
 		if (init) {
diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c
index 86285fe..b95aa26 100644
--- a/sys/dev/netif/rl/if_rl.c
+++ b/sys/dev/netif/rl/if_rl.c
@@ -1300,7 +1300,7 @@ rl_encap(struct rl_softc *sc, struct mbuf *m_head)
 	 * TX buffers, plus we can only have one fragment buffer
 	 * per packet.  We have to copy pretty much all the time.
 	 */
-	m_new = m_defrag(m_head, MB_DONTWAIT);
+	m_new = m_defrag(m_head, M_NOWAIT);
 	if (m_new == NULL) {
 		m_freem(m_head);
 		return ENOBUFS;
diff --git a/sys/dev/netif/rtw/rtw.c b/sys/dev/netif/rtw/rtw.c
index 6e12f55..9e150ce 100644
--- a/sys/dev/netif/rtw/rtw.c
+++ b/sys/dev/netif/rtw/rtw.c
@@ -1203,7 +1203,7 @@ rtw_rxsoft_alloc(struct rtw_softc *sc, struct rtw_rxsoft *rs, int waitok)
 	struct mbuf *m;
 	int rc;
 
-	m = m_getcl(waitok ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(waitok ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return ENOBUFS;
 
@@ -3066,7 +3066,7 @@ rtw_load_txbuf(struct rtw_softc *sc, struct rtw_txsoft *ts,
 		if (error == 0)
 			bus_dmamap_unload(sc->sc_txsoft_dmat, ts->ts_dmamap);
 
-		m_new = m_defrag(m, MB_DONTWAIT);
+		m_new = m_defrag(m, M_NOWAIT);
 		if (m_new == NULL) {
 			if_printf(&sc->sc_ic.ic_if, "can't defrag tx mbuf\n");
 			error = ENOBUFS;
diff --git a/sys/dev/netif/sbni/if_sbni.c b/sys/dev/netif/sbni/if_sbni.c
index f071b96..b2b5b33 100644
--- a/sys/dev/netif/sbni/if_sbni.c
+++ b/sys/dev/netif/sbni/if_sbni.c
@@ -798,7 +798,7 @@ get_rx_buf(struct sbni_softc *sc)
 {
 	struct mbuf *m;
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		kprintf("%s: cannot allocate header mbuf\n",
 		       sc->arpcom.ac_if.if_xname);
@@ -813,7 +813,7 @@ get_rx_buf(struct sbni_softc *sc)
 	 */
 	if (ETHER_MAX_LEN + 2 > MHLEN) {
 		/* Attach an mbuf cluster */
-		MCLGET(m, MB_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_freem(m);
 			return (0);
diff --git a/sys/dev/netif/sbsh/if_sbsh.c b/sys/dev/netif/sbsh/if_sbsh.c
index 3d81414..78c3301 100644
--- a/sys/dev/netif/sbsh/if_sbsh.c
+++ b/sys/dev/netif/sbsh/if_sbsh.c
@@ -681,7 +681,7 @@ repack(struct sbsh_softc *sc, struct mbuf *m)
 {
 	struct mbuf  *m_new;
 
-	MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, M_NOWAIT, MT_DATA);
 	if (!m_new) {
 		if_printf (&sc->arpcom.ac_if,
 			   "unable to get mbuf.\n");
@@ -689,7 +689,7 @@ repack(struct sbsh_softc *sc, struct mbuf *m)
 	}
 
 	if (m->m_pkthdr.len > MHLEN) {
-		MCLGET(m_new, MB_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			if_printf (&sc->arpcom.ac_if,
@@ -738,7 +738,7 @@ alloc_rx_buffers(struct sbsh_softc *sc)
 	struct mbuf	*m;
 
 	while (sc->tail_rq != ((sc->head_rq - 1) & (RQLEN - 1))) {
-		MGETHDR(m, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (!m) {
 			if_printf (&sc->arpcom.ac_if,
 				   "unable to get mbuf.\n");
@@ -746,7 +746,7 @@ alloc_rx_buffers(struct sbsh_softc *sc)
 		}
 
 		if (SBNI16_MAX_FRAME > MHLEN) {
-			MCLGET(m, MB_DONTWAIT);
+			MCLGET(m, M_NOWAIT);
 			if (!(m->m_flags & M_EXT)) {
 				m_freem(m);
 				if_printf (&sc->arpcom.ac_if,
diff --git a/sys/dev/netif/sf/if_sf.c b/sys/dev/netif/sf/if_sf.c
index 3405c80..ad44580 100644
--- a/sys/dev/netif/sf/if_sf.c
+++ b/sys/dev/netif/sf/if_sf.c
@@ -871,11 +871,11 @@ sf_newbuf(struct sf_softc *sc, struct sf_rx_bufdesc_type0 *c,
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
-		MCLGET(m_new, MB_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1302,7 +1302,7 @@ again:
 				continue;
 			}
 
-			m_defragged = m_defrag(m_head, MB_DONTWAIT);
+			m_defragged = m_defrag(m_head, M_NOWAIT);
 			if (m_defragged == NULL) {
 				m_freem(m_head);
 				continue;
diff --git a/sys/dev/netif/sis/if_sis.c b/sys/dev/netif/sis/if_sis.c
index d84a657..5e0c2b5 100644
--- a/sys/dev/netif/sis/if_sis.c
+++ b/sys/dev/netif/sis/if_sis.c
@@ -1293,7 +1293,7 @@ sis_newbuf(struct sis_softc *sc, int idx, int init)
 	struct mbuf *m;
 	int nseg, error;
 
-	m = m_getcl(init ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(init ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
 		if (init)
 			if_printf(&sc->arpcom.ac_if, "can't alloc RX mbuf\n");
diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c
index 4f237b5..f961eb9 100644
--- a/sys/dev/netif/sk/if_sk.c
+++ b/sys/dev/netif/sk/if_sk.c
@@ -762,7 +762,7 @@ sk_newbuf_jumbo(struct sk_if_softc *sc_if, int idx, int wait)
 
 	KKASSERT(idx < SK_RX_RING_CNT && idx >= 0);
 
-	MGETHDR(m_new, wait ? MB_WAIT : MB_DONTWAIT, MT_DATA);
+	MGETHDR(m_new, wait ? M_WAITOK : M_NOWAIT, MT_DATA);
 	if (m_new == NULL)
 		return ENOBUFS;
 
@@ -818,7 +818,7 @@ sk_newbuf_std(struct sk_if_softc *sc_if, int idx, int wait)
 
 	KKASSERT(idx < SK_RX_RING_CNT && idx >= 0);
 
-	m_new = m_getcl(wait ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m_new = m_getcl(wait ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m_new == NULL)
 		return ENOBUFS;
 
diff --git a/sys/dev/netif/sln/if_sln.c b/sys/dev/netif/sln/if_sln.c
index 82bda0b..5086e07 100644
--- a/sys/dev/netif/sln/if_sln.c
+++ b/sys/dev/netif/sln/if_sln.c
@@ -751,14 +751,14 @@ sln_tx(struct ifnet *ifp, struct ifaltq_subque *ifsq)
 		if (m_head == NULL)
 			break;
 
-		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			if_printf(ifp, "no memory for tx descriptor");
 			m_freem(m_head);
 			break;
 		}
 		if ((m_head->m_pkthdr.len > MHLEN) || (60 > MHLEN)) {
-			MCLGET(m_new, MB_DONTWAIT);
+			MCLGET(m_new, M_NOWAIT);
 			if (!(m_new->m_flags & M_EXT)) {
 				m_freem(m_new);
 				m_freem(m_head);
diff --git a/sys/dev/netif/sn/if_sn.c b/sys/dev/netif/sn/if_sn.c
index 03f44ec..066a07a 100644
--- a/sys/dev/netif/sn/if_sn.c
+++ b/sys/dev/netif/sn/if_sn.c
@@ -1016,7 +1016,7 @@ read_another:
 	/*
 	 * Allocate a header mbuf from the kernel.
 	 */
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		goto out;
 
@@ -1026,7 +1026,7 @@ read_another:
 	/*
 	 * Attach an mbuf cluster
 	 */
-	MCLGET(m, MB_DONTWAIT);
+	MCLGET(m, M_NOWAIT);
 
 	/*
 	 * Insist on getting a cluster
diff --git a/sys/dev/netif/sr/if_sr.c b/sys/dev/netif/sr/if_sr.c
index 8fc8796..fbb5661 100644
--- a/sys/dev/netif/sr/if_sr.c
+++ b/sys/dev/netif/sr/if_sr.c
@@ -1992,7 +1992,7 @@ sr_get_packets(struct sr_softc *sc)
 			       sc->unit, rxstat, len);
 #endif
 
-			MGETHDR(m, MB_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if (m == NULL) {
 				/*
 				 * eat (flush) packet if get mbuf fail!!
@@ -2010,7 +2010,7 @@ sr_get_packets(struct sr_softc *sc)
 #endif /* NETGRAPH */
 			m->m_pkthdr.len = m->m_len = len;
 			if (len > MHLEN) {
-				MCLGET(m, MB_DONTWAIT);
+				MCLGET(m, M_NOWAIT);
 				if ((m->m_flags & M_EXT) == 0) {
 					/*
 					 * We couldn't get a big enough
diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c
index 4360728..10c081a 100644
--- a/sys/dev/netif/ste/if_ste.c
+++ b/sys/dev/netif/ste/if_ste.c
@@ -1024,10 +1024,10 @@ ste_newbuf(struct ste_softc *sc, struct ste_chain_onefrag *c,
 	struct mbuf		*m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
-		MCLGET(m_new, MB_DONTWAIT);
+		MCLGET(m_new, M_NOWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			m_freem(m_new);
 			return(ENOBUFS);
@@ -1378,13 +1378,13 @@ encap_retry:
 		 * mbuf chain first. Bail out if we can't get the
 		 * new buffers.  Code borrowed from if_fxp.c.
 		 */
-		MGETHDR(mn, MB_DONTWAIT, MT_DATA);
+		MGETHDR(mn, M_NOWAIT, MT_DATA);
 		if (mn == NULL) {
 			m_freem(m_head);
 			return ENOMEM;
 		}
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(mn, MB_DONTWAIT);
+			MCLGET(mn, M_NOWAIT);
 			if ((mn->m_flags & M_EXT) == 0) {
 				m_freem(mn);
 				m_freem(m_head);
diff --git a/sys/dev/netif/stge/if_stge.c b/sys/dev/netif/stge/if_stge.c
index 3a36181..31dc548 100644
--- a/sys/dev/netif/stge/if_stge.c
+++ b/sys/dev/netif/stge/if_stge.c
@@ -1528,7 +1528,7 @@ stge_fixup_rx(struct stge_softc *sc, struct mbuf *m)
 		m->m_data += ETHER_HDR_LEN;
 		n = m;
 	} else {
-		MGETHDR(n, MB_DONTWAIT, MT_DATA);
+		MGETHDR(n, M_NOWAIT, MT_DATA);
 		if (n != NULL) {
 			bcopy(m->m_data, n->m_data, ETHER_HDR_LEN);
 			m->m_data += ETHER_HDR_LEN;
@@ -2325,7 +2325,7 @@ stge_newbuf(struct stge_softc *sc, int idx, int waitok)
 	bus_dmamap_t map;
 	int error, nseg;
 
-	m = m_getcl(waitok ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getcl(waitok ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return ENOBUFS;
 	m->m_len = m->m_pkthdr.len = MCLBYTES;
diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c
index 2dc4609..b37c3b9 100644
--- a/sys/dev/netif/ti/if_ti.c
+++ b/sys/dev/netif/ti/if_ti.c
@@ -692,7 +692,7 @@ ti_newbuf_std(struct ti_softc *sc, int i, struct mbuf *m)
 	struct ti_rx_desc *r;
 
 	if (m == NULL) {
-		m_new = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		m_new = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (m_new == NULL)
 			return (ENOBUFS);
 		m_new->m_len = m_new->m_pkthdr.len = MCLBYTES;
@@ -728,7 +728,7 @@ ti_newbuf_mini(struct ti_softc *sc, int i, struct mbuf *m)
 	struct ti_rx_desc *r;
 
 	if (m == NULL) {
-		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
@@ -766,7 +766,7 @@ ti_newbuf_jumbo(struct ti_softc *sc, int i, struct mbuf *m)
 
 	if (m == NULL) {
 		/* Allocate the mbuf. */
-		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			return(ENOBUFS);
 		}
diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c
index 02171ac..0057a57 100644
--- a/sys/dev/netif/tl/if_tl.c
+++ b/sys/dev/netif/tl/if_tl.c
@@ -1345,7 +1345,7 @@ tl_newbuf(struct tl_softc *sc, struct tl_chain_onefrag *c)
 {
 	struct mbuf *m_new;
 
-	m_new = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m_new = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m_new == NULL)
 		return (ENOBUFS);
 
@@ -1771,7 +1771,7 @@ tl_encap(struct tl_softc *sc, struct tl_chain *c, struct mbuf *m_head)
 	if (m != NULL) {
 		struct mbuf *m_new;
 
-		m_new = m_getl(m_head->m_pkthdr.len, MB_DONTWAIT, MT_DATA,
+		m_new = m_getl(m_head->m_pkthdr.len, M_NOWAIT, MT_DATA,
 			       M_PKTHDR, NULL);
 		if (m_new == NULL) {
 			if_printf(&sc->arpcom.ac_if, "no memory for tx list\n");
diff --git a/sys/dev/netif/tx/if_tx.c b/sys/dev/netif/tx/if_tx.c
index caf4820..7c66ce7 100644
--- a/sys/dev/netif/tx/if_tx.c
+++ b/sys/dev/netif/tx/if_tx.c
@@ -510,7 +510,7 @@ epic_ifstart(struct ifnet *ifp, struct ifaltq_subque *ifsq)
 		/* If packet was more than EPIC_MAX_FRAGS parts, */
 		/* recopy packet to new allocated mbuf cluster */
 		if (NULL != m) {
-			m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+			m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 			if (NULL == m) {
 				m_freem(m0);
 				IFNET_STAT_INC(ifp, oerrors, 1);
@@ -584,7 +584,7 @@ epic_rx_done(epic_softc_t *sc)
 		m = buf->mbuf;
 
 		/* Try to get mbuf cluster */
-		buf->mbuf = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		buf->mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (NULL == buf->mbuf) {
 			buf->mbuf = m;
 			desc->status = 0x8000;
@@ -1289,7 +1289,7 @@ epic_queue_last_packet(epic_softc_t *sc)
 	if ((desc->status & 0x8000) || (buf->mbuf != NULL))
 		return (EBUSY);
 
-	MGETHDR(m0, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m0, M_NOWAIT, MT_DATA);
 	if (NULL == m0)
 		return (ENOBUFS);
 
@@ -1420,7 +1420,7 @@ epic_init_rings(epic_softc_t *sc)
 			return EFAULT;
 		}
 
-		buf->mbuf = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		buf->mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (NULL == buf->mbuf) {
 			epic_free_rings(sc);
 			return ENOBUFS;
diff --git a/sys/dev/netif/txp/if_txp.c b/sys/dev/netif/txp/if_txp.c
index 0042f51..f97bb29 100644
--- a/sys/dev/netif/txp/if_txp.c
+++ b/sys/dev/netif/txp/if_txp.c
@@ -686,13 +686,13 @@ txp_rx_reclaim(struct txp_softc *sc, struct txp_rx_ring *r)
 			 */
 			struct mbuf *mnew;
 
-			MGETHDR(mnew, MB_DONTWAIT, MT_DATA);
+			MGETHDR(mnew, M_NOWAIT, MT_DATA);
 			if (mnew == NULL) {
 				m_freem(m);
 				goto next;
 			}
 			if (m->m_len > (MHLEN - 2)) {
-				MCLGET(mnew, MB_DONTWAIT);
+				MCLGET(mnew, M_NOWAIT);
 				if (!(mnew->m_flags & M_EXT)) {
 					m_freem(mnew);
 					m_freem(m);
@@ -764,11 +764,11 @@ txp_rxbuf_reclaim(struct txp_softc *sc)
 		if (sd->sd_mbuf != NULL)
 			break;
 
-		MGETHDR(sd->sd_mbuf, MB_DONTWAIT, MT_DATA);
+		MGETHDR(sd->sd_mbuf, M_NOWAIT, MT_DATA);
 		if (sd->sd_mbuf == NULL)
 			goto err_sd;
 
-		MCLGET(sd->sd_mbuf, MB_DONTWAIT);
+		MCLGET(sd->sd_mbuf, M_NOWAIT);
 		if ((sd->sd_mbuf->m_flags & M_EXT) == 0)
 			goto err_mbuf;
 		sd->sd_mbuf->m_pkthdr.rcvif = ifp;
@@ -1047,11 +1047,11 @@ txp_rxring_fill(struct txp_softc *sc)
 
 	for (i = 0; i < RXBUF_ENTRIES; i++) {
 		sd = sc->sc_rxbufs[i].rb_sd;
-		MGETHDR(sd->sd_mbuf, MB_DONTWAIT, MT_DATA);
+		MGETHDR(sd->sd_mbuf, M_NOWAIT, MT_DATA);
 		if (sd->sd_mbuf == NULL)
 			return(ENOBUFS);
 
-		MCLGET(sd->sd_mbuf, MB_DONTWAIT);
+		MCLGET(sd->sd_mbuf, M_NOWAIT);
 		if ((sd->sd_mbuf->m_flags & M_EXT) == 0) {
 			m_freem(sd->sd_mbuf);
 			return(ENOBUFS);
@@ -1230,7 +1230,7 @@ again:
 				goto oactive;
 			}
 
-			m_defragged = m_defrag(m, MB_DONTWAIT);
+			m_defragged = m_defrag(m, M_NOWAIT);
 			if (m_defragged == NULL) {
 				m_freem(m);
 				continue;
diff --git a/sys/dev/netif/vge/if_vge.c b/sys/dev/netif/vge/if_vge.c
index f3bc6b4..74ead1e 100644
--- a/sys/dev/netif/vge/if_vge.c
+++ b/sys/dev/netif/vge/if_vge.c
@@ -1112,7 +1112,7 @@ vge_newbuf(struct vge_softc *sc, int idx, struct mbuf *m)
 	int i, error;
 
 	if (m == NULL) {
-		n = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		n = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (n == NULL)
 			return (ENOBUFS);
 		m = n;
@@ -1638,7 +1638,7 @@ vge_encap(struct vge_softc *sc, struct mbuf *m_head, int idx)
 	if (error || arg.vge_maxsegs == 0) {
 		struct mbuf *m_new;
 
-		m_new = m_defrag(m_head, MB_DONTWAIT);
+		m_new = m_defrag(m_head, M_NOWAIT);
 		if (m_new == NULL) {
 			error = ENOBUFS;
 			goto fail;
diff --git a/sys/dev/netif/vr/if_vr.c b/sys/dev/netif/vr/if_vr.c
index eda67d8..4e8da76 100644
--- a/sys/dev/netif/vr/if_vr.c
+++ b/sys/dev/netif/vr/if_vr.c
@@ -930,7 +930,7 @@ vr_newbuf(struct vr_softc *sc, struct vr_chain_onefrag *c, struct mbuf *m)
 	struct mbuf *m_new = NULL;
 
 	if (m == NULL) {
-		m_new = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		m_new = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (m_new == NULL)
 			return (ENOBUFS);
 		m_new->m_len = m_new->m_pkthdr.len = MCLBYTES;
diff --git a/sys/dev/netif/vx/if_vx.c b/sys/dev/netif/vx/if_vx.c
index 513aa43..4a15c85 100644
--- a/sys/dev/netif/vx/if_vx.c
+++ b/sys/dev/netif/vx/if_vx.c
@@ -28,8 +28,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/vx/if_vx.c,v 1.25.2.6 2002/02/13 00:43:10 dillon Exp $
- * $DragonFly: src/sys/dev/netif/vx/if_vx.c,v 1.29 2008/05/14 11:59:22 sephe Exp $
- *
  */
 
 /*
@@ -738,7 +736,7 @@ vxget(struct vx_softc *sc, u_int totlen)
     m = sc->mb[sc->next_mb];
     sc->mb[sc->next_mb] = NULL;
     if (m == NULL) {
-        MGETHDR(m, MB_DONTWAIT, MT_DATA);
+        MGETHDR(m, M_NOWAIT, MT_DATA);
         if (m == NULL)
             return NULL;
     } else {
@@ -777,7 +775,7 @@ vxget(struct vx_softc *sc, u_int totlen)
             m = sc->mb[sc->next_mb];
             sc->mb[sc->next_mb] = NULL;
             if (m == NULL) {
-                MGET(m, MB_DONTWAIT, MT_DATA);
+                MGET(m, M_NOWAIT, MT_DATA);
                 if (m == NULL) {
                     crit_exit();
                     m_freem(top);
@@ -789,7 +787,7 @@ vxget(struct vx_softc *sc, u_int totlen)
             len = MLEN;
         }
         if (totlen >= MINCLSIZE) {
-	    MCLGET(m, MB_DONTWAIT);
+	    MCLGET(m, M_NOWAIT);
 	    if (m->m_flags & M_EXT)
 		len = MCLBYTES;
         }
@@ -963,7 +961,7 @@ vxmbuffill_serialized(void *sp)
     i = sc->last_mb;
     do {
 	if (sc->mb[i] == NULL)
-	    MGET(sc->mb[i], MB_DONTWAIT, MT_DATA);
+	    MGET(sc->mb[i], M_NOWAIT, MT_DATA);
 	if (sc->mb[i] == NULL)
 	    break;
 	i = (i + 1) % MAX_MBS;
diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c
index 66c8147..71081aa 100644
--- a/sys/dev/netif/wb/if_wb.c
+++ b/sys/dev/netif/wb/if_wb.c
@@ -929,7 +929,7 @@ wb_newbuf(struct wb_softc *sc, struct wb_chain_onefrag *c, struct mbuf *m)
 	struct mbuf *m_new = NULL;
 
 	if (m == NULL) {
-		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(ENOBUFS);
 
@@ -1247,11 +1247,11 @@ wb_encap(struct wb_softc *sc, struct wb_chain *c, struct mbuf *m_head)
 	if (m != NULL) {
 		struct mbuf *m_new = NULL;
 
-		MGETHDR(m_new, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL)
 			return(1);
 		if (m_head->m_pkthdr.len > MHLEN) {
-			MCLGET(m_new, MB_DONTWAIT);
+			MCLGET(m_new, M_NOWAIT);
 			if ((m_new->m_flags & M_EXT) == 0) {
 				m_freem(m_new);
 				return(1);
diff --git a/sys/dev/netif/wi/if_wi.c b/sys/dev/netif/wi/if_wi.c
index 8ce6b3f..e3a590f 100644
--- a/sys/dev/netif/wi/if_wi.c
+++ b/sys/dev/netif/wi/if_wi.c
@@ -1319,9 +1319,9 @@ wi_rx_intr(struct wi_softc *sc)
 	}
 
 	if (off + len > MHLEN)
-		m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	else
-		m = m_gethdr(MB_DONTWAIT, MT_DATA);
+		m = m_gethdr(M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX);
 		IFNET_STAT_INC(ifp, ierrors, 1);
diff --git a/sys/dev/netif/wpi/if_wpi.c b/sys/dev/netif/wpi/if_wpi.c
index 67cb525..dcf65fe 100644
--- a/sys/dev/netif/wpi/if_wpi.c
+++ b/sys/dev/netif/wpi/if_wpi.c
@@ -999,7 +999,7 @@ wpi_alloc_rx_ring(struct wpi_softc *sc, struct wpi_rx_ring *ring)
 			    __func__, error);
 			goto fail;
 		}
-		m = m_getjcl(MB_DONTWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
+		m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
 		if (m == NULL) {
 			device_printf(sc->sc_dev,
 			   "%s: could not allocate rx mbuf\n", __func__);
@@ -1495,7 +1495,7 @@ wpi_rx_intr(struct wpi_softc *sc, struct wpi_rx_desc *desc,
 	}
 
 	/* XXX don't need mbuf, just dma buffer */
-	mnew = m_getjcl(MB_DONTWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
+	mnew = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
 	if (mnew == NULL) {
 		DPRINTFN(WPI_DEBUG_RX, ("%s: no mbuf to restock ring\n",
 		    __func__));
@@ -1960,7 +1960,7 @@ wpi_tx_data(struct wpi_softc *sc, struct mbuf *m0, struct ieee80211_node *ni,
 	}
 	if (error != 0) {
 		/* XXX use m_collapse */
-		mnew = m_defrag(m0, MB_DONTWAIT);
+		mnew = m_defrag(m0, M_NOWAIT);
 		if (mnew == NULL) {
 			device_printf(sc->sc_dev,
 			    "could not defragment mbuf\n");
@@ -2559,7 +2559,7 @@ wpi_scan(struct wpi_softc *sc)
 	desc = &ring->desc[ring->cur];
 	data = &ring->data[ring->cur];
 
-	data->m = m_getjcl(MB_DONTWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
+	data->m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
 	if (data->m == NULL) {
 		device_printf(sc->sc_dev,
 		    "could not allocate mbuf for scan command\n");
diff --git a/sys/dev/netif/xe/if_xe.c b/sys/dev/netif/xe/if_xe.c
index c061e64..a2a4e9c 100644
--- a/sys/dev/netif/xe/if_xe.c
+++ b/sys/dev/netif/xe/if_xe.c
@@ -765,14 +765,14 @@ xe_intr(void *xscp)
 	 * packet length (we always read 16-bit words).
 	 * XXX - Surely there's a better way to do this alignment?
 	 */
-	MGETHDR(mbp, MB_DONTWAIT, MT_DATA);
+	MGETHDR(mbp, M_NOWAIT, MT_DATA);
 	if (mbp == NULL) {
 	  IFNET_STAT_INC(ifp, iqdrops, 1);
 	  continue;
 	}
 
 	if (len + 3 > MHLEN) {
-	  MCLGET(mbp, MB_DONTWAIT);
+	  MCLGET(mbp, M_NOWAIT);
 	  if ((mbp->m_flags & M_EXT) == 0) {
 	    m_freem(mbp);
 	    IFNET_STAT_INC(ifp, iqdrops, 1);
diff --git a/sys/dev/netif/xl/if_xl.c b/sys/dev/netif/xl/if_xl.c
index 0bd5632..692b892 100644
--- a/sys/dev/netif/xl/if_xl.c
+++ b/sys/dev/netif/xl/if_xl.c
@@ -1881,7 +1881,7 @@ xl_newbuf(struct xl_softc *sc, struct xl_chain_onefrag *c, int init)
 	int			error, nsegs;
 	bus_dma_segment_t	seg;
 
-	m_new = m_getcl(init ? MB_WAIT : MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m_new = m_getcl(init ? M_WAITOK : M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m_new == NULL)
 		return(ENOBUFS);
 
diff --git a/sys/dev/virtual/virtio/net/if_vtnet.c b/sys/dev/virtual/virtio/net/if_vtnet.c
index 7277c1d..f4d8356 100644
--- a/sys/dev/virtual/virtio/net/if_vtnet.c
+++ b/sys/dev/virtual/virtio/net/if_vtnet.c
@@ -1184,7 +1184,7 @@ vtnet_alloc_rxbuf(struct vtnet_softc *sc, int nbufs, struct mbuf **m_tailp)
 
 	/*use getcl instead of getjcl. see  if_mxge.c comment line 2398*/
 	//m_head = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, clsize);
-	m_head = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR );
+	m_head = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR );
 	if (m_head == NULL)
 		goto fail;
 
@@ -1197,7 +1197,7 @@ vtnet_alloc_rxbuf(struct vtnet_softc *sc, int nbufs, struct mbuf **m_tailp)
 
 		for (i = 0; i < nbufs - 1; i++) {
 			//m = m_getjcl(M_DONTWAIT, MT_DATA, 0, clsize);
-			m = m_getcl(MB_DONTWAIT, MT_DATA, 0);
+			m = m_getcl(M_NOWAIT, MT_DATA, 0);
 			if (m == NULL)
 				goto fail;
 
@@ -1855,8 +1855,8 @@ again:
 		if (collapsed)
 			goto fail;
 
-		//m = m_collapse(m, MB_DONTWAIT, VTNET_MAX_TX_SEGS - 1);
-		m = m_defrag(m, MB_DONTWAIT);
+		//m = m_collapse(m, MB_NOWAIT, VTNET_MAX_TX_SEGS - 1);
+		m = m_defrag(m, M_NOWAIT);
 		if (m == NULL)
 			goto fail;
 
@@ -1883,13 +1883,13 @@ vtnet_vlan_tag_insert(struct mbuf *m)
 	struct ether_vlan_header *evl;
 
 	if (M_WRITABLE(m) == 0) {
-		n = m_dup(m, MB_DONTWAIT);
+		n = m_dup(m, M_NOWAIT);
 		m_freem(m);
 		if ((m = n) == NULL)
 			return (NULL);
 	}
 
-	M_PREPEND(m, ETHER_VLAN_ENCAP_LEN, MB_DONTWAIT);
+	M_PREPEND(m, ETHER_VLAN_ENCAP_LEN, M_NOWAIT);
 	if (m == NULL)
 		return (NULL);
 	if (m->m_len < sizeof(struct ether_vlan_header)) {
diff --git a/sys/dev/virtual/vkernel/net/if_vke.c b/sys/dev/virtual/vkernel/net/if_vke.c
index 87ff9c1..11a8176 100644
--- a/sys/dev/virtual/vkernel/net/if_vke.c
+++ b/sys/dev/virtual/vkernel/net/if_vke.c
@@ -316,7 +316,8 @@ vke_init(void *xsc)
 	sc->sc_rxfifo->array = kmalloc(ringsize, M_DEVBUF, M_WAITOK | M_ZERO);
 
 	for (i = 0; i < sc->sc_ringsize; i++) {
-		sc->sc_rxfifo->array[i] = m_getcl(MB_WAIT, MT_DATA, M_PKTHDR);
+		sc->sc_rxfifo->array[i] = m_getcl(M_WAITOK, MT_DATA,
+						  M_PKTHDR);
 		sc->sc_txfifo->array[i] = NULL;
 		sc->sc_txfifo_done->array[i] = NULL;
 	}
@@ -536,7 +537,7 @@ vke_rx_intr(cothread_t cotd)
 	cothread_unlock(cotd, 0);
 
 	while ((m = vke_rxfifo_sniff(sc)) != NULL) {
-		nm = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		nm = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (nm) {
 			vke_rxfifo_dequeue(sc, nm);
 			ifp->if_input(ifp, m, NULL, -1);
diff --git a/sys/emulation/43bsd/43bsd_socket.c b/sys/emulation/43bsd/43bsd_socket.c
index d50b05e..bfd67dd 100644
--- a/sys/emulation/43bsd/43bsd_socket.c
+++ b/sys/emulation/43bsd/43bsd_socket.c
@@ -274,7 +274,7 @@ sys_osendmsg(struct osendmsg_args *uap)
 			error = EINVAL;
 			goto cleanup;
 		}
-		control = m_get(MB_WAIT, MT_CONTROL);
+		control = m_get(M_WAITOK, MT_CONTROL);
 		if (control == NULL) {
 			error = ENOBUFS;
 			goto cleanup;
@@ -293,7 +293,7 @@ sys_osendmsg(struct osendmsg_args *uap)
 		 * control data with the proper cmsghdr structure
 		 * so that the kernel recognizes it as access rights.
 		 */
-		M_PREPEND(control, sizeof(*cm), MB_WAIT);
+		M_PREPEND(control, sizeof(*cm), M_WAITOK);
 		if (control == NULL) {
 			error = ENOBUFS;
 			goto cleanup;
diff --git a/sys/emulation/linux/linux_socket.c b/sys/emulation/linux/linux_socket.c
index 5912a55..633a728 100644
--- a/sys/emulation/linux/linux_socket.c
+++ b/sys/emulation/linux/linux_socket.c
@@ -868,7 +868,7 @@ linux_sendmsg(struct linux_sendmsg_args *args, size_t *res)
 			error = EINVAL;
 			goto cleanup;
 		}
-		control = m_get(MB_WAIT, MT_CONTROL);
+		control = m_get(M_WAITOK, MT_CONTROL);
 		if (control == NULL) {
 			error = ENOBUFS;
 			goto cleanup;
diff --git a/sys/emulation/ndis/kern_ndis.c b/sys/emulation/ndis/kern_ndis.c
index 5143334..b10282a 100644
--- a/sys/emulation/ndis/kern_ndis.c
+++ b/sys/emulation/ndis/kern_ndis.c
@@ -668,9 +668,9 @@ ndis_ptom(struct mbuf **m0, ndis_packet *p)
 	for (buf = priv->npp_head; buf != NULL; buf = buf->mdl_next) {
 		if (buf == priv->npp_head) {
 			/* XXX swildner: why not MT_HEADER? (see FreeBSD) */
-			MGETHDR(m, MB_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 		} else {
-			MGET(m, MB_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 		}
 		if (m == NULL) {
 			m_freem(*m0);
diff --git a/sys/kern/libmchain/subr_mchain.c b/sys/kern/libmchain/subr_mchain.c
index f62de35..8ba5da5 100644
--- a/sys/kern/libmchain/subr_mchain.c
+++ b/sys/kern/libmchain/subr_mchain.c
@@ -71,7 +71,7 @@ mb_init(struct mbchain *mbp)
 {
 	struct mbuf *m;
 
-	m = m_gethdr(MB_WAIT, MT_DATA);
+	m = m_gethdr(M_WAITOK, MT_DATA);
 	if (m == NULL) 
 		return ENOBUFS;
 	m->m_pkthdr.rcvif = NULL;
@@ -129,7 +129,7 @@ mb_reserve(struct mbchain *mbp, int size)
 		panic("mb_reserve: size = %d", size);
 	m = mbp->mb_cur;
 	if (mbp->mb_mleft < size) {
-		mn = m_get(MB_WAIT, MT_DATA);
+		mn = m_get(M_WAITOK, MT_DATA);
 		if (mn == NULL)
 			return NULL;
 		mbp->mb_cur = m->m_next = mn;
@@ -207,7 +207,7 @@ mb_put_mem(struct mbchain *mbp, c_caddr_t source, int size, int type)
 	while (size > 0) {
 		if (mleft == 0) {
 			if (m->m_next == NULL) {
-				m->m_next = m_getc(size, MB_WAIT, MT_DATA);
+				m->m_next = m_getc(size, M_WAITOK, MT_DATA);
 				if (m->m_next == NULL)
 					return ENOBUFS;
 			}
@@ -311,7 +311,7 @@ md_init(struct mdchain *mdp)
 {
 	struct mbuf *m;
 
-	m = m_gethdr(MB_WAIT, MT_DATA);
+	m = m_gethdr(M_WAITOK, MT_DATA);
 	if (m == NULL) 
 		return ENOBUFS;
 	m->m_pkthdr.rcvif = NULL;
@@ -520,7 +520,7 @@ md_get_mbuf(struct mdchain *mdp, int size, struct mbuf **ret)
 {
 	struct mbuf *m = mdp->md_cur, *rm;
 
-	rm = m_copym(m, mdp->md_pos - mtod(m, u_char*), size, MB_WAIT);
+	rm = m_copym(m, mdp->md_pos - mtod(m, u_char*), size, M_WAITOK);
 	if (rm == NULL)
 		return EBADRPC;
 	md_get_mem(mdp, NULL, size, MB_MZERO);
diff --git a/sys/kern/subr_busdma.c b/sys/kern/subr_busdma.c
index 3e4e797..41a015b 100644
--- a/sys/kern/subr_busdma.c
+++ b/sys/kern/subr_busdma.c
@@ -129,7 +129,7 @@ bus_dmamap_load_mbuf_defrag(bus_dma_tag_t dmat, bus_dmamap_t map,
 	if (error == EFBIG) {
 		struct mbuf *m_new;
 
-		m_new = m_defrag(m, MB_DONTWAIT);
+		m_new = m_defrag(m, M_NOWAIT);
 		if (m_new == NULL)
 			return ENOBUFS;
 		else
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index a4bc987..81fa933 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -847,14 +847,14 @@ m_get(int how, int type)
 {
 	struct mbuf *m;
 	int ntries = 0;
-	int ocf = MBTOM(how);
+	int ocf = MB_OCFLAG(how);
 
 retryonce:
 
 	m = objcache_get(mbuf_cache, ocf);
 
 	if (m == NULL) {
-		if ((how & MB_TRYWAIT) && ntries++ == 0) {
+		if ((ocf & M_WAITOK) && ntries++ == 0) {
 			struct objcache *reclaimlist[] = {
 				mbufphdr_cache,
 				mbufcluster_cache,
@@ -884,7 +884,7 @@ struct mbuf *
 m_gethdr(int how, int type)
 {
 	struct mbuf *m;
-	int ocf = MBTOM(how);
+	int ocf = MB_OCFLAG(how);
 	int ntries = 0;
 
 retryonce:
@@ -892,7 +892,7 @@ retryonce:
 	m = objcache_get(mbufphdr_cache, ocf);
 
 	if (m == NULL) {
-		if ((how & MB_TRYWAIT) && ntries++ == 0) {
+		if ((ocf & M_WAITOK) && ntries++ == 0) {
 			struct objcache *reclaimlist[] = {
 				mbuf_cache,
 				mbufcluster_cache, mbufphdrcluster_cache,
@@ -937,7 +937,7 @@ m_getcl_cache(int how, short type, int flags, struct objcache *mbclc,
     struct objcache *mbphclc, u_long *cl_stats)
 {
 	struct mbuf *m = NULL;
-	int ocflags = MBTOM(how);
+	int ocflags = MB_OCFLAG(how);
 	int ntries = 0;
 
 retryonce:
@@ -948,7 +948,7 @@ retryonce:
 		m = objcache_get(mbclc, ocflags);
 
 	if (m == NULL) {
-		if ((how & MB_TRYWAIT) && ntries++ == 0) {
+		if ((ocflags & M_WAITOK) && ntries++ == 0) {
 			struct objcache *reclaimlist[1];
 
 			if (flags & M_PKTHDR)
@@ -1077,7 +1077,7 @@ m_mclget(struct mbuf *m, int how)
 	struct mbcluster *mcl;
 
 	KKASSERT((m->m_flags & M_EXT) == 0);
-	mcl = objcache_get(mclmeta_cache, MBTOM(how));
+	mcl = objcache_get(mclmeta_cache, MB_OCFLAG(how));
 	if (mcl != NULL) {
 		linkcluster(m, mcl);
 		++mbstat[mycpu->gd_cpuid].m_clusters;
@@ -1363,7 +1363,7 @@ m_prepend(struct mbuf *m, int len, int how)
 /*
  * 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 MB_WAIT/MB_DONTWAIT from caller.
+ * The wait parameter is a choice of M_WAITOK/M_NOWAIT from caller.
  * Note that the copy is read-only, because clusters are not copied,
  * only their reference counts are incremented.
  */
@@ -1601,8 +1601,8 @@ nospace0:
  * copying any mbuf clusters.  This is typically used to realign a data
  * chain by nfs_realign().
  *
- * The original chain is left intact.  how should be MB_WAIT or MB_DONTWAIT
- * and NULL can be returned if MB_DONTWAIT is passed.
+ * The original chain is left intact.  how should be M_WAITOK or M_NOWAIT
+ * and NULL can be returned if M_NOWAIT is passed.
  *
  * Be careful to use cluster mbufs, a large mbuf chain converted to non
  * cluster mbufs can exhaust our supply of mbufs.
@@ -1964,9 +1964,9 @@ m_pullup(struct mbuf *n, int len)
 		if (len > MHLEN)
 			goto bad;
 		if (n->m_flags & M_PKTHDR)
-			m = m_gethdr(MB_DONTWAIT, n->m_type);
+			m = m_gethdr(M_NOWAIT, n->m_type);
 		else
-			m = m_get(MB_DONTWAIT, n->m_type);
+			m = m_get(M_NOWAIT, n->m_type);
 		if (m == NULL)
 			goto bad;
 		m->m_len = 0;
@@ -2086,7 +2086,7 @@ m_devget(char *buf, int len, int offset, struct ifnet *ifp,
 	flags = M_PKTHDR;
 
 	while (len > 0) {
-		m = m_getl(len, MB_DONTWAIT, MT_DATA, flags, &nsize);
+		m = m_getl(len, M_NOWAIT, MT_DATA, flags, &nsize);
 		if (m == NULL) {
 			m_freem(mfirst);
 			return (NULL);
@@ -2141,7 +2141,7 @@ m_devpad(struct mbuf *m, int padto)
 			struct mbuf *n;
 
 			/* Allocate new empty mbuf, pad it.  Compact later. */
-			MGET(n, MB_DONTWAIT, MT_DATA);
+			MGET(n, M_NOWAIT, MT_DATA);
 			if (n == NULL)
 				return ENOBUFS;
 			n->m_len = 0;
@@ -2177,7 +2177,7 @@ m_copyback(struct mbuf *m0, int off, int len, caddr_t cp)
 		off -= mlen;
 		totlen += mlen;
 		if (m->m_next == NULL) {
-			n = m_getclr(MB_DONTWAIT, m->m_type);
+			n = m_getclr(M_NOWAIT, m->m_type);
 			if (n == NULL)
 				goto out;
 			n->m_len = min(MLEN, len + off);
@@ -2196,7 +2196,7 @@ m_copyback(struct mbuf *m0, int off, int len, caddr_t cp)
 		if (len == 0)
 			break;
 		if (m->m_next == NULL) {
-			n = m_get(MB_DONTWAIT, m->m_type);
+			n = m_get(M_NOWAIT, m->m_type);
 			if (n == NULL)
 				break;
 			n->m_len = min(MLEN, len);
@@ -2240,7 +2240,7 @@ m_append(struct mbuf *m0, int len, c_caddr_t cp)
 		 * Allocate a new mbuf; could check space
 		 * and allocate a cluster instead.
 		 */
-		n = m_get(MB_DONTWAIT, m->m_type);
+		n = m_get(M_NOWAIT, m->m_type);
 		if (n == NULL)
 			break;
 		n->m_len = min(MLEN, remainder);
@@ -2468,7 +2468,7 @@ m_uiomove(struct uio *uio)
 			resid = INT_MAX;
 		else
 			resid = (int)uio->uio_resid;
-		m = m_getl(resid, MB_WAIT, MT_DATA, flags, &nsize);
+		m = m_getl(resid, M_WAITOK, MT_DATA, flags, &nsize);
 		if (flags) {
 			m->m_pkthdr.len = 0;
 			/* Leave room for protocol headers. */
diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c
index 4bd412d..50129ad 100644
--- a/sys/kern/uipc_mbuf2.c
+++ b/sys/kern/uipc_mbuf2.c
@@ -1,5 +1,4 @@
 /*	$FreeBSD: src/sys/kern/uipc_mbuf2.c,v 1.2.2.5 2003/01/23 21:06:44 sam Exp $	*/
-/*	$DragonFly: src/sys/kern/uipc_mbuf2.c,v 1.15 2007/10/20 10:28:44 sephe Exp $	*/
 /*	$KAME: uipc_mbuf2.c,v 1.31 2001/11/28 11:08:53 itojun Exp $	*/
 /*	$NetBSD: uipc_mbuf.c,v 1.40 1999/04/01 00:23:25 thorpej Exp $	*/
 
@@ -142,7 +141,7 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp)
 	 * 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, MB_DONTWAIT);
+		o = m_dup1(n, off, n->m_len - off, M_NOWAIT);
 		if (o == NULL) {
 			m_freem(m);
 			return NULL;	/* ENOBUFS */
@@ -201,7 +200,7 @@ m_pulldown(struct mbuf *m, int off, int len, int *offp)
 	 * now, we need to do the hard way.  don't m_copy as there's no room
 	 * on both end.
 	 */
-	o = m_getl(len, MB_DONTWAIT, m->m_type, 0, NULL);
+	o = m_getl(len, M_NOWAIT, m->m_type, 0, NULL);
 	if (!o) {
 		m_freem(m);
 		return NULL;	/* ENOBUFS */
@@ -260,7 +259,7 @@ m_tag_alloc(uint32_t cookie, int type, int len, int wait)
 
 	if (len < 0)
 		return NULL;
-	t = kmalloc(len + sizeof(struct m_tag), M_PACKET_TAGS, MBTOM(wait));
+	t = kmalloc(len + sizeof(struct m_tag), M_PACKET_TAGS, MB_OCFLAG(wait));
 	if (t == NULL)
 		return NULL;
 	t->m_tag_id = type;
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index 6738603..12a9b07 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -29,7 +29,6 @@
  *
  * @(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/kern/uipc_socket2.c,v 1.55.2.17 2002/08/31 19:04:55 dwmalone Exp $
- * $DragonFly: src/sys/kern/uipc_sockbuf.c,v 1.3 2007/08/09 01:10:04 dillon Exp $
  */
 
 #include "opt_param.h"
@@ -248,7 +247,7 @@ sbappendaddr(struct sockbuf *sb, const struct sockaddr *asa, struct mbuf *m0,
 	}
 	if (asa->sa_len > MLEN)
 		return (0);
-	MGET(m, MB_DONTWAIT, MT_SONAME);
+	MGET(m, M_NOWAIT, MT_SONAME);
 	if (m == NULL)
 		return (0);
 	KKASSERT(m->m_nextpkt == NULL);
@@ -591,7 +590,7 @@ sbcreatecontrol(caddr_t p, int size, int type, int level)
 
 	if (CMSG_SPACE((u_int)size) > MCLBYTES)
 		return (NULL);
-	m = m_getl(CMSG_SPACE((u_int)size), MB_DONTWAIT, MT_CONTROL, 0, NULL);
+	m = m_getl(CMSG_SPACE((u_int)size), M_NOWAIT, MT_CONTROL, 0, NULL);
 	if (m == NULL)
 		return (NULL);
 	m->m_len = CMSG_SPACE(size);
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 9e33a1a..5c96cce 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -913,7 +913,7 @@ restart:
 		    } else do {
 			if (resid > INT_MAX)
 				resid = INT_MAX;
-			m = m_getl((int)resid, MB_WAIT, MT_DATA,
+			m = m_getl((int)resid, M_WAITOK, MT_DATA,
 				   top == NULL ? M_PKTHDR : 0, &mlen);
 			if (top == NULL) {
 				m->m_pkthdr.len = 0;
@@ -1073,7 +1073,7 @@ restart:
 		} else {
 			int nsize;
 
-			top = m_getl(uio->uio_resid + hdrlen, MB_WAIT,
+			top = m_getl(uio->uio_resid + hdrlen, M_WAITOK,
 			    MT_DATA, M_PKTHDR, &nsize);
 			KASSERT(nsize >= uio->uio_resid + hdrlen,
 			    ("sosendudp invalid nsize %d, "
@@ -1208,10 +1208,10 @@ restart:
 			if (resid > INT_MAX)
 				resid = INT_MAX;
 			if (tcp_sosend_jcluster) {
-				m = m_getlj((int)resid, MB_WAIT, MT_DATA,
+				m = m_getlj((int)resid, M_WAITOK, MT_DATA,
 					   top == NULL ? M_PKTHDR : 0, &mlen);
 			} else {
-				m = m_getl((int)resid, MB_WAIT, MT_DATA,
+				m = m_getl((int)resid, M_WAITOK, MT_DATA,
 					   top == NULL ? M_PKTHDR : 0, &mlen);
 			}
 			if (top == NULL) {
@@ -1333,7 +1333,7 @@ soreceive(struct socket *so, struct sockaddr **psa, struct uio *uio,
 	else
 		flags = 0;
 	if (flags & MSG_OOB) {
-		m = m_get(MB_WAIT, MT_DATA);
+		m = m_get(M_WAITOK, MT_DATA);
 		if (m == NULL)
 			return (ENOBUFS);
 		error = so_pru_rcvoob(so, m, flags & MSG_PEEK);
@@ -1569,7 +1569,7 @@ dontblock:
 				moff += len;
 			} else {
 				if (sio) {
-					n = m_copym(m, 0, len, MB_WAIT);
+					n = m_copym(m, 0, len, M_WAITOK);
 					if (n)
 						sbappend(sio, n);
 				}
@@ -1684,7 +1684,7 @@ sorecvtcp(struct socket *so, struct sockaddr **psa, struct uio *uio,
 	else
 		flags = 0;
 	if (flags & MSG_OOB) {
-		m = m_get(MB_WAIT, MT_DATA);
+		m = m_get(M_WAITOK, MT_DATA);
 		if (m == NULL)
 			return (ENOBUFS);
 		error = so_pru_rcvoob(so, m, flags & MSG_PEEK);
@@ -1896,7 +1896,7 @@ dontblock:
 		if (offset) {
 			KKASSERT(m);
 			if (sio) {
-				n = m_copym(m, 0, offset, MB_WAIT);
+				n = m_copym(m, 0, offset, M_WAITOK);
 				if (n)
 					sbappend(sio, n);
 			}
@@ -2460,7 +2460,8 @@ soopt_getm(struct sockopt *sopt, struct mbuf **mp)
 	struct mbuf *m, *m_prev;
 	int sopt_size = sopt->sopt_valsize, msize;
 
-	m = m_getl(sopt_size, sopt->sopt_td ? MB_WAIT : MB_DONTWAIT, MT_DATA,
+	m = m_getl(sopt_size, sopt->sopt_td ? M_WAITOK : M_NOWAIT,
+		   MT_DATA,
 		   0, &msize);
 	if (m == NULL)
 		return (ENOBUFS);
@@ -2470,7 +2471,7 @@ soopt_getm(struct sockopt *sopt, struct mbuf **mp)
 	m_prev = m;
 
 	while (sopt_size > 0) {
-		m = m_getl(sopt_size, sopt->sopt_td ? MB_WAIT : MB_DONTWAIT,
+		m = m_getl(sopt_size, sopt->sopt_td ? M_WAITOK : M_NOWAIT,
 			   MT_DATA, 0, &msize);
 		if (m == NULL) {
 			m_freem(*mp);
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 7ad2c51..ac8e860 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -29,7 +29,6 @@
  *
  *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/kern/uipc_socket2.c,v 1.55.2.17 2002/08/31 19:04:55 dwmalone Exp $
- * $DragonFly: src/sys/kern/uipc_socket2.c,v 1.33 2008/09/02 16:17:52 dillon Exp $
  */
 
 #include "opt_param.h"
@@ -561,7 +560,7 @@ sowakeup(struct socket *so, struct signalsockbuf *ssb)
 	if ((so->so_state & SS_ASYNC) && so->so_sigio != NULL)
 		pgsigio(so->so_sigio, SIGIO, 0);
 	if (ssb->ssb_flags & SSB_UPCALL)
-		(*so->so_upcall)(so, so->so_upcallarg, MB_DONTWAIT);
+		(*so->so_upcall)(so, so->so_upcallarg, M_NOWAIT);
 	KNOTE(&kqinfo->ki_note, 0);
 
 	/*
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 962859c..5af03c2 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -818,7 +818,7 @@ sys_sendmsg(struct sendmsg_args *uap)
 			error = EINVAL;
 			goto cleanup;
 		}
-		control = m_get(MB_WAIT, MT_CONTROL);
+		control = m_get(M_WAITOK, MT_CONTROL);
 		if (control == NULL) {
 			error = ENOBUFS;
 			goto cleanup;
@@ -1763,7 +1763,7 @@ retry_lookup:
 		/*
 		 * Get an mbuf header and set it up as having external storage.
 		 */
-		MGETHDR(m, MB_WAIT, MT_DATA);
+		MGETHDR(m, M_WAITOK, MT_DATA);
 		if (m == NULL) {
 			error = ENOBUFS;
 			vm_page_wakeup(pg);
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index c3b9278..3ff4365 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -1502,7 +1502,7 @@ unp_internalize(struct mbuf *control, struct thread *td)
 			error = E2BIG;
 			goto done;
 		}
-		MCLGET(control, MB_WAIT);
+		MCLGET(control, M_WAITOK);
 		if (!(control->m_flags & M_EXT)) {
 			error = ENOBUFS;
 			goto done;
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 23d4957..819cfd5 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -212,7 +212,7 @@ bpf_movein(struct uio *uio, int linktype, struct mbuf **mp,
 	if ((unsigned)len > MCLBYTES)
 		return(EIO);
 
-	m = m_getl(len, MB_WAIT, MT_DATA, M_PKTHDR, NULL);
+	m = m_getl(len, M_WAITOK, MT_DATA, M_PKTHDR, NULL);
 	if (m == NULL)
 		return(ENOBUFS);
 	m->m_pkthdr.len = m->m_len = len;
diff --git a/sys/net/bridge/bridgestp.c b/sys/net/bridge/bridgestp.c
index 02eb95b..7235c26 100644
--- a/sys/net/bridge/bridgestp.c
+++ b/sys/net/bridge/bridgestp.c
@@ -253,7 +253,7 @@ bstp_send_config_bpdu(struct bridge_softc *sc, struct bridge_iflist *bif,
 	if ((ifp->if_flags & IFF_RUNNING) == 0)
 		return;
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 
@@ -435,7 +435,7 @@ bstp_transmit_tcn(struct bridge_softc *sc)
 	if ((ifp->if_flags & IFF_RUNNING) == 0)
 		return;
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return;
 
diff --git a/sys/net/bridge/if_bridge.c b/sys/net/bridge/if_bridge.c
index ed314fd..49893a0 100644
--- a/sys/net/bridge/if_bridge.c
+++ b/sys/net/bridge/if_bridge.c
@@ -2219,7 +2219,7 @@ bridge_output(struct ifnet *ifp, struct mbuf *m)
 				used = 1;
 				mc = m;
 			} else {
-				mc = m_copypacket(m, MB_DONTWAIT);
+				mc = m_copypacket(m, M_NOWAIT);
 				if (mc == NULL) {
 					IFNET_STAT_INC(bifp, oerrors, 1);
 					continue;
@@ -2715,7 +2715,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m)
 		 * for bridge processing; return the original packet for
 		 * local processing.
 		 */
-		mc = m_dup(m, MB_DONTWAIT);
+		mc = m_dup(m, M_NOWAIT);
 		if (mc == NULL)
 			goto out;
 
@@ -2737,7 +2737,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m)
 		 */
 		KASSERT(bifp->if_bridge == NULL,
 			("loop created in bridge_input"));
-		mc2 = m_dup(m, MB_DONTWAIT);
+		mc2 = m_dup(m, M_NOWAIT);
 #ifdef notyet
 		if (mc2 != NULL) {
 			/* Keep the layer3 header aligned */
@@ -2931,7 +2931,7 @@ bridge_start_bcast(struct bridge_softc *sc, struct mbuf *m)
 			mc = m;
 			used = 1;
 		} else {
-			mc = m_copypacket(m, MB_DONTWAIT);
+			mc = m_copypacket(m, M_NOWAIT);
 			if (mc == NULL) {
 				IFNET_STAT_INC(bifp, oerrors, 1);
 				continue;
@@ -3064,7 +3064,7 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if,
 			mc = m;
 			used = 1;
 		} else {
-			mc = m_copypacket(m, MB_DONTWAIT);
+			mc = m_copypacket(m, M_NOWAIT);
 			if (mc == NULL) {
 				IFNET_STAT_INC(sc->sc_ifp, oerrors, 1);
 				continue;
@@ -3129,7 +3129,7 @@ bridge_span(struct bridge_softc *sc, struct mbuf *m)
 		if ((dst_if->if_flags & IFF_RUNNING) == 0)
 			continue;
 
-		mc = m_copypacket(m, MB_DONTWAIT);
+		mc = m_copypacket(m, M_NOWAIT);
 		if (mc == NULL) {
 			IFNET_STAT_INC(sc->sc_ifp, oerrors, 1);
 			continue;
@@ -4033,13 +4033,13 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir)
 	 * Finally, put everything back the way it was and return
 	 */
 	if (snap) {
-		M_PREPEND(*mp, sizeof(struct llc), MB_DONTWAIT);
+		M_PREPEND(*mp, sizeof(struct llc), M_NOWAIT);
 		if (*mp == NULL)
 			return (error);
 		bcopy(&llc1, mtod(*mp, caddr_t), sizeof(struct llc));
 	}
 
-	M_PREPEND(*mp, ETHER_HDR_LEN, MB_DONTWAIT);
+	M_PREPEND(*mp, ETHER_HDR_LEN, M_NOWAIT);
 	if (*mp == NULL)
 		return (error);
 	bcopy(&eh2, mtod(*mp, caddr_t), ETHER_HDR_LEN);
@@ -4242,7 +4242,7 @@ bridge_fragment(struct ifnet *ifp, struct mbuf *m, struct ether_header *eh,
 	for (m0 = m; m0; m0 = m0->m_nextpkt) {
 		if (error == 0) {
 			if (snap) {
-				M_PREPEND(m0, sizeof(struct llc), MB_DONTWAIT);
+				M_PREPEND(m0, sizeof(struct llc), M_NOWAIT);
 				if (m0 == NULL) {
 					error = ENOBUFS;
 					continue;
@@ -4250,7 +4250,7 @@ bridge_fragment(struct ifnet *ifp, struct mbuf *m, struct ether_header *eh,
 				bcopy(llc, mtod(m0, caddr_t),
 				    sizeof(struct llc));
 			}
-			M_PREPEND(m0, ETHER_HDR_LEN, MB_DONTWAIT);
+			M_PREPEND(m0, ETHER_HDR_LEN, M_NOWAIT);
 			if (m0 == NULL) {
 				error = ENOBUFS;
 				continue;
diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c
index 619f9f6..3401da1 100644
--- a/sys/net/bsd_comp.c
+++ b/sys/net/bsd_comp.c
@@ -468,12 +468,12 @@ bsd_compress(void *state, struct mbuf **mret, struct mbuf *mp,
 	*wptr++ = (v);					\
 	if (wptr >= cp_end) {				\
 	    m->m_len = wptr - mtod(m, u_char *);	\
-	    MGET(m->m_next, MB_DONTWAIT, MT_DATA);	\
+	    MGET(m->m_next, M_NOWAIT, MT_DATA);		\
 	    m = m->m_next;				\
 	    if (m) {					\
 		m->m_len = 0;				\
 		if (maxolen - olen > MLEN)		\
-		    MCLGET(m, MB_DONTWAIT);		\
+		    MCLGET(m, M_NOWAIT);		\
 		wptr = mtod(m, u_char *);		\
 		cp_end = wptr + M_TRAILINGSPACE(m);	\
 	    } else					\
@@ -510,12 +510,12 @@ bsd_compress(void *state, struct mbuf **mret, struct mbuf *mp,
 	maxolen = slen;
 
     /* Allocate one mbuf to start with. */
-    MGET(m, MB_DONTWAIT, MT_DATA);
+    MGET(m, M_NOWAIT, MT_DATA);
     *mret = m;
     if (m != NULL) {
 	m->m_len = 0;
 	if (maxolen + db->hdrlen > MLEN)
-	    MCLGET(m, MB_DONTWAIT);
+	    MCLGET(m, M_NOWAIT);
 	m->m_data += db->hdrlen;
 	wptr = mtod(m, u_char *);
 	cp_end = wptr + M_TRAILINGSPACE(m);
@@ -840,13 +840,13 @@ bsd_decompress(void *state, struct mbuf *cmp, struct mbuf **dmpp)
     /*
      * Allocate one mbuf to start with.
      */
-    MGETHDR(dmp, MB_DONTWAIT, MT_DATA);
+    MGETHDR(dmp, M_NOWAIT, MT_DATA);
     if (dmp == NULL)
 	return DECOMP_ERROR;
     mret = dmp;
     dmp->m_len = 0;
     dmp->m_next = NULL;
-    MCLGET(dmp, MB_DONTWAIT);
+    MCLGET(dmp, M_NOWAIT);
     dmp->m_data += db->hdrlen;
     wptr = mtod(dmp, u_char *);
     space = M_TRAILINGSPACE(dmp) - PPP_HDRLEN + 1;
@@ -952,7 +952,7 @@ bsd_decompress(void *state, struct mbuf *cmp, struct mbuf **dmpp)
 	 */
 	if ((space -= codelen + extra) < 0) {
 	    dmp->m_len = wptr - mtod(dmp, u_char *);
-	    MGET(m, MB_DONTWAIT, MT_DATA);
+	    MGET(m, M_NOWAIT, MT_DATA);
 	    if (m == NULL) {
 		m_freem(mret);
 		return DECOMP_ERROR;
@@ -960,7 +960,7 @@ bsd_decompress(void *state, struct mbuf *cmp, struct mbuf **dmpp)
 	    m->m_len = 0;
 	    m->m_next = NULL;
 	    dmp->m_next = m;
-	    MCLGET(m, MB_DONTWAIT);
+	    MCLGET(m, M_NOWAIT);
 	    space = M_TRAILINGSPACE(m) - (codelen + extra);
 	    if (space < 0) {
 		/* now that's what I call *compression*. */
diff --git a/sys/net/gre/if_gre.c b/sys/net/gre/if_gre.c
index fc7db67..c47da15 100644
--- a/sys/net/gre/if_gre.c
+++ b/sys/net/gre/if_gre.c
@@ -312,7 +312,7 @@ gre_output_serialized(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 
 			if ((m->m_data - msiz) < m->m_pktdat) {
 				/* need new mbuf */
-				MGETHDR(m0, MB_DONTWAIT, MT_HEADER);
+				MGETHDR(m0, M_NOWAIT, MT_HEADER);
 				if (m0 == NULL) {
 					m_freem(m);
 					error = ENOBUFS;
@@ -353,7 +353,7 @@ gre_output_serialized(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 			error = EAFNOSUPPORT;
 			goto end;
 		}
-		M_PREPEND(m, sizeof(struct greip), MB_DONTWAIT);
+		M_PREPEND(m, sizeof(struct greip), M_NOWAIT);
 	} else {
 		m_freem(m);
 		error = EINVAL;
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index c415dbf..ff9a4ba 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -226,7 +226,7 @@ ether_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 	if ((ifp->if_flags & (IFF_UP | IFF_RUNNING)) != (IFF_UP | IFF_RUNNING))
 		gotoerr(ENETDOWN);
 
-	M_PREPEND(m, sizeof(struct ether_header), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ether_header), M_NOWAIT);
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_pkthdr.csum_lhlen = sizeof(struct ether_header);
@@ -311,7 +311,7 @@ ether_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 		if ((m->m_flags & M_BCAST) || (loop_copy > 0)) {
 			struct mbuf *n;
 
-			if ((n = m_copypacket(m, MB_DONTWAIT)) != NULL) {
+			if ((n = m_copypacket(m, M_NOWAIT)) != NULL) {
 				n->m_pkthdr.csum_flags |= csum_flags;
 				if (csum_flags & CSUM_DATA_VALID)
 					n->m_pkthdr.csum_data = 0xffff;
@@ -910,7 +910,7 @@ ether_restore_header(struct mbuf **m0, const struct ether_header *eh,
 	} else {
 		ether_prepend_hdr++;
 
-		M_PREPEND(m, ETHER_HDR_LEN, MB_DONTWAIT);
+		M_PREPEND(m, ETHER_HDR_LEN, M_NOWAIT);
 		if (m != NULL) {
 			bcopy(save_eh, mtod(m, struct ether_header *),
 			      ETHER_HDR_LEN);
@@ -1101,7 +1101,7 @@ post_stats:
 			 * Put back the ethernet header so netgraph has a
 			 * consistent view of inbound packets.
 			 */
-			M_PREPEND(m, ETHER_HDR_LEN, MB_DONTWAIT);
+			M_PREPEND(m, ETHER_HDR_LEN, M_NOWAIT);
 			if (m == NULL) {
 				/*
 				 * M_PREPEND frees the mbuf in case of failure.
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 62a17bc..623efe9 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -223,7 +223,7 @@ rel:
 		 */
 		ifq_classify(&ifp->if_snd, m, af, &pktattr);
 
-		M_PREPEND(m, sizeof(int32_t), MB_DONTWAIT);
+		M_PREPEND(m, sizeof(int32_t), M_NOWAIT);
 		if (m == NULL)
 			return(ENOBUFS);
 		afp = mtod(m, int32_t *);
diff --git a/sys/net/ip6fw/ip6_fw.c b/sys/net/ip6fw/ip6_fw.c
index 9dd63cb..91c9f77 100644
--- a/sys/net/ip6fw/ip6_fw.c
+++ b/sys/net/ip6fw/ip6_fw.c
@@ -1100,11 +1100,11 @@ ip6_fw_ctl(int stage, struct mbuf **mm)
 
 	if (stage == IPV6_FW_GET) {
 		struct ip6_fw_chain *fcp = ip6_fw_chain.lh_first;
-		*mm = m = m_get(MB_WAIT, MT_DATA); /* XXX */
+		*mm = m = m_get(M_WAITOK, MT_DATA); /* XXX */
 		if (!m)
 			return(ENOBUFS);
 		if (sizeof *(fcp->rule) > MLEN) {
-			MCLGET(m, MB_WAIT);
+			MCLGET(m, M_WAITOK);
 			if ((m->m_flags & M_EXT) == 0) {
 				m_free(m);
 				return(ENOBUFS);
@@ -1113,14 +1113,14 @@ ip6_fw_ctl(int stage, struct mbuf **mm)
 		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(MB_WAIT, MT_DATA); /* XXX */
+			m->m_next = m_get(M_WAITOK, MT_DATA); /* XXX */
 			if (!m->m_next) {
 				m_freem(*mm);
 				return(ENOBUFS);
 			}
 			m = m->m_next;
 			if (sizeof *(fcp->rule) > MLEN) {
-				MCLGET(m, MB_WAIT);
+				MCLGET(m, M_WAITOK);
 				if ((m->m_flags & M_EXT) == 0) {
 					m_freem(*mm);
 					return(ENOBUFS);
diff --git a/sys/net/ip_mroute/ip_mroute.c b/sys/net/ip_mroute/ip_mroute.c
index 492cbd0..eff6706 100644
--- a/sys/net/ip_mroute/ip_mroute.c
+++ b/sys/net/ip_mroute/ip_mroute.c
@@ -1253,7 +1253,7 @@ X_ip_mforward(struct ip *ip, struct ifnet *ifp, struct mbuf *m,
 		return ENOBUFS;
 	}
 
-	mb0 = m_copypacket(m, MB_DONTWAIT);
+	mb0 = m_copypacket(m, M_NOWAIT);
 	if (mb0 && (M_HASCL(mb0) || mb0->m_len < hlen))
 	    mb0 = m_pullup(mb0, hlen);
 	if (mb0 == NULL) {
@@ -1624,7 +1624,7 @@ phyint_send(struct ip *ip, struct vif *vifp, struct mbuf *m)
      * the IP header is actually copied, not just referenced,
      * so that ip_output() only scribbles on the copy.
      */
-    mb_copy = m_copypacket(m, MB_DONTWAIT);
+    mb_copy = m_copypacket(m, M_NOWAIT);
     if (mb_copy && (M_HASCL(mb_copy) || mb_copy->m_len < hlen))
 	mb_copy = m_pullup(mb_copy, hlen);
     if (mb_copy == NULL)
@@ -1654,13 +1654,13 @@ encap_send(struct ip *ip, struct vif *vifp, struct mbuf *m)
      * 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, MB_DONTWAIT, MT_HEADER);
+    MGETHDR(mb_copy, M_NOWAIT, MT_HEADER);
     if (mb_copy == NULL)
 	return;
     mb_copy->m_data += max_linkhdr;
     mb_copy->m_len = sizeof(multicast_encap_iphdr);
 
-    if ((mb_copy->m_next = m_copypacket(m, MB_DONTWAIT)) == NULL) {
+    if ((mb_copy->m_next = m_copypacket(m, M_NOWAIT)) == NULL) {
 	m_freem(mb_copy);
 	return;
     }
@@ -2568,7 +2568,7 @@ bw_upcalls_send(void)
      * Allocate a new mbuf, initialize it with the header and
      * the payload for the pending calls.
      */
-    MGETHDR(m, MB_DONTWAIT, MT_HEADER);
+    MGETHDR(m, M_NOWAIT, MT_HEADER);
     if (m == NULL) {
 	log(LOG_WARNING, "bw_upcalls_send: cannot allocate mbuf\n");
 	return;
@@ -2857,7 +2857,7 @@ pim_register_prepare(struct ip *ip, struct mbuf *m)
      * Copy the old packet & pullup its IP header into the
      * new mbuf so we can modify it.
      */
-    mb_copy = m_copypacket(m, MB_DONTWAIT);
+    mb_copy = m_copypacket(m, M_NOWAIT);
     if (mb_copy == NULL)
 	return NULL;
     mb_copy = m_pullup(mb_copy, ip->ip_hl << 2);
@@ -2902,7 +2902,7 @@ pim_register_send_upcall(struct ip *ip, struct vif *vifp,
     /*
      * Add a new mbuf with an upcall header
      */
-    MGETHDR(mb_first, MB_DONTWAIT, MT_HEADER);
+    MGETHDR(mb_first, M_NOWAIT, MT_HEADER);
     if (mb_first == NULL) {
 	m_freem(mb_copy);
 	return ENOBUFS;
@@ -2960,7 +2960,7 @@ pim_register_send_rp(struct ip *ip, struct vif *vifp,
     /*
      * Add a new mbuf with the encapsulating header
      */
-    MGETHDR(mb_first, MB_DONTWAIT, MT_HEADER);
+    MGETHDR(mb_first, M_NOWAIT, MT_HEADER);
     if (mb_first == NULL) {
 	m_freem(mb_copy);
 	return ENOBUFS;
diff --git a/sys/net/ipfw/ip_fw2.c b/sys/net/ipfw/ip_fw2.c
index cef01d0..0afc943 100644
--- a/sys/net/ipfw/ip_fw2.c
+++ b/sys/net/ipfw/ip_fw2.c
@@ -1416,7 +1416,7 @@ send_pkt(struct ipfw_flow_id *id, uint32_t seq, uint32_t ack, int flags)
 	struct tcphdr *tcp;
 	struct route sro;	/* fake route */
 
-	MGETHDR(m, MB_DONTWAIT, MT_HEADER);
+	MGETHDR(m, M_NOWAIT, MT_HEADER);
 	if (m == NULL)
 		return;
 	m->m_pkthdr.rcvif = NULL;
@@ -2321,7 +2321,7 @@ check_body:
 					break;
 
 				mtag = m_tag_get(PACKET_TAG_IPFW_DIVERT,
-						 sizeof(*divinfo), MB_DONTWAIT);
+						 sizeof(*divinfo), M_NOWAIT);
 				if (mtag == NULL) {
 					retval = IP_FW_DENY;
 					goto done;
@@ -2392,7 +2392,7 @@ check_body:
 					struct sockaddr_in *sin;
 
 					mtag = m_tag_get(PACKET_TAG_IPFORWARD,
-					       sizeof(*sin), MB_DONTWAIT);
+					       sizeof(*sin), M_NOWAIT);
 					if (mtag == NULL) {
 						retval = IP_FW_DENY;
 						goto done;
@@ -2458,7 +2458,7 @@ ipfw_dummynet_io(struct mbuf *m, int pipe_nr, int dir, struct ip_fw_args *fwa)
 
 	M_ASSERTPKTHDR(m);
 
-	mtag = m_tag_get(PACKET_TAG_DUMMYNET, sizeof(*pkt), MB_DONTWAIT);
+	mtag = m_tag_get(PACKET_TAG_DUMMYNET, sizeof(*pkt), M_NOWAIT);
 	if (mtag == NULL) {
 		m_freem(m);
 		return;
diff --git a/sys/net/pf/pf.c b/sys/net/pf/pf.c
index cfc8ac6..7f695c8 100644
--- a/sys/net/pf/pf.c
+++ b/sys/net/pf/pf.c
@@ -2143,7 +2143,7 @@ pf_send_tcp(const struct pf_rule *r, sa_family_t af,
 	 * DragonFly doesn't zero the auxillary pkghdr fields, only fw_flags,
 	 * so make sure pf.flags is clear.
 	 */
-	m = m_gethdr(MB_DONTWAIT, MT_HEADER);
+	m = m_gethdr(M_NOWAIT, MT_HEADER);
 	if (m == NULL) {
 		return;
 	}
@@ -6022,7 +6022,7 @@ pf_route(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp,
 	}
 
 	if (r->rt == PF_DUPTO) {
-		if ((m0 = m_dup(*m, MB_DONTWAIT)) == NULL) {
+		if ((m0 = m_dup(*m, M_NOWAIT)) == NULL) {
 			return;
 		}
 	} else {
@@ -6212,7 +6212,7 @@ pf_route6(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp,
 	}
 
 	if (r->rt == PF_DUPTO) {
-		if ((m0 = m_dup(*m, MB_DONTWAIT)) == NULL)
+		if ((m0 = m_dup(*m, M_NOWAIT)) == NULL)
 			return;
 	} else {
 		if ((r->rt == PF_REPLYTO) == (r->direction == dir))
diff --git a/sys/net/pf/pf_norm.c b/sys/net/pf/pf_norm.c
index 6900020..d4ab380 100644
--- a/sys/net/pf/pf_norm.c
+++ b/sys/net/pf/pf_norm.c
@@ -616,7 +616,7 @@ pf_fragcache(struct mbuf **m0, struct ip *h, struct pf_fragment **frag, int mff,
 				 * than this mbuf magic.  For my next trick,
 				 * I'll pull a rabbit out of my laptop.
 				 */
-				*m0 = m_dup(m, MB_DONTWAIT);
+				*m0 = m_dup(m, M_NOWAIT);
 				/* From KAME Project : We have missed this! */
 				m_adj(*m0, (h->ip_hl << 2) -
 				    (*m0)->m_pkthdr.len);
diff --git a/sys/net/ppp/if_ppp.c b/sys/net/ppp/if_ppp.c
index c287862..f8d930b 100644
--- a/sys/net/ppp/if_ppp.c
+++ b/sys/net/ppp/if_ppp.c
@@ -771,7 +771,7 @@ pppoutput_serialized(struct ifnet *ifp, struct ifaltq_subque *ifsq,
      * (This assumes M_LEADINGSPACE is always 0 for a cluster mbuf.)
      */
     if (M_LEADINGSPACE(m0) < PPP_HDRLEN) {
-	m0 = m_prepend(m0, PPP_HDRLEN, MB_DONTWAIT);
+	m0 = m_prepend(m0, PPP_HDRLEN, M_NOWAIT);
 	if (m0 == NULL) {
 	    error = ENOBUFS;
 	    goto bad;
@@ -1353,13 +1353,13 @@ ppp_inproc(struct ppp_softc *sc, struct mbuf *m)
 	}
 
 	/* Copy the PPP and IP headers into a new mbuf. */
-	MGETHDR(mp, MB_DONTWAIT, MT_DATA);
+	MGETHDR(mp, M_NOWAIT, MT_DATA);
 	if (mp == NULL)
 	    goto bad;
 	mp->m_len = 0;
 	mp->m_next = NULL;
 	if (hlen + PPP_HDRLEN > MHLEN) {
-	    MCLGET(mp, MB_DONTWAIT);
+	    MCLGET(mp, M_NOWAIT);
 	    if (M_TRAILINGSPACE(mp) < hlen + PPP_HDRLEN) {
 		m_freem(mp);
 		goto bad;	/* lose if big headers and no clusters */
@@ -1415,7 +1415,7 @@ ppp_inproc(struct ppp_softc *sc, struct mbuf *m)
      * whole cluster on it.
      */
     if (ilen <= MHLEN && M_IS_CLUSTER(m)) {
-	MGETHDR(mp, MB_DONTWAIT, MT_DATA);
+	MGETHDR(mp, M_NOWAIT, MT_DATA);
 	if (mp != NULL) {
 	    m_copydata(m, 0, ilen, mtod(mp, caddr_t));
 	    m_freem(m);
diff --git a/sys/net/ppp_layer/ppp_deflate.c b/sys/net/ppp_layer/ppp_deflate.c
index bf5f3b6..43a920f 100644
--- a/sys/net/ppp_layer/ppp_deflate.c
+++ b/sys/net/ppp_layer/ppp_deflate.c
@@ -237,12 +237,12 @@ z_compress(void *arg, struct mbuf **mret, struct mbuf *mp, int orig_len,
     /* Allocate one mbuf initially. */
     if (maxolen > orig_len)
 	maxolen = orig_len;
-    MGET(m, MB_DONTWAIT, MT_DATA);
+    MGET(m, M_NOWAIT, MT_DATA);
     *mret = m;
     if (m != NULL) {
 	m->m_len = 0;
 	if (maxolen + state->hdrlen > MLEN)
-	    MCLGET(m, MB_DONTWAIT);
+	    MCLGET(m, M_NOWAIT);
 	wspace = M_TRAILINGSPACE(m);
 	if (state->hdrlen + PPP_HDRLEN + 2 < wspace) {
 	    m->m_data += state->hdrlen;
@@ -297,12 +297,12 @@ z_compress(void *arg, struct mbuf **mret, struct mbuf *mp, int orig_len,
 	    if (m != NULL) {
 		m->m_len = wspace;
 		olen += wspace;
-		MGET(m->m_next, MB_DONTWAIT, MT_DATA);
+		MGET(m->m_next, M_NOWAIT, MT_DATA);
 		m = m->m_next;
 		if (m != NULL) {
 		    m->m_len = 0;
 		    if (maxolen - olen > MLEN)
-			MCLGET(m, MB_DONTWAIT);
+			MCLGET(m, M_NOWAIT);
 		    state->strm.next_out = mtod(m, u_char *);
 		    state->strm.avail_out = wspace = M_TRAILINGSPACE(m);
 		}
@@ -483,13 +483,13 @@ z_decompress(void *arg, struct mbuf *mi, struct mbuf **mop)
     ++state->seqno;
 
     /* Allocate an output mbuf. */
-    MGETHDR(mo, MB_DONTWAIT, MT_DATA);
+    MGETHDR(mo, M_NOWAIT, MT_DATA);
     if (mo == NULL)
 	return DECOMP_ERROR;
     mo_head = mo;
     mo->m_len = 0;
     mo->m_next = NULL;
-    MCLGET(mo, MB_DONTWAIT);
+    MCLGET(mo, M_NOWAIT);
     ospace = M_TRAILINGSPACE(mo);
     if (state->hdrlen + PPP_HDRLEN < ospace) {
 	mo->m_data += state->hdrlen;
@@ -558,13 +558,13 @@ z_decompress(void *arg, struct mbuf *mi, struct mbuf **mop)
 	    } else {
 		mo->m_len = ospace;
 		olen += ospace;
-		MGET(mo->m_next, MB_DONTWAIT, MT_DATA);
+		MGET(mo->m_next, M_NOWAIT, MT_DATA);
 		mo = mo->m_next;
 		if (mo == NULL) {
 		    m_freem(mo_head);
 		    return DECOMP_ERROR;
 		}
-		MCLGET(mo, MB_DONTWAIT);
+		MCLGET(mo, M_NOWAIT);
 		state->strm.next_out = mtod(mo, u_char *);
 		state->strm.avail_out = ospace = M_TRAILINGSPACE(mo);
 	    }
diff --git a/sys/net/ppp_layer/ppp_tty.c b/sys/net/ppp_layer/ppp_tty.c
index 00ab1d2..496965b 100644
--- a/sys/net/ppp_layer/ppp_tty.c
+++ b/sys/net/ppp_layer/ppp_tty.c
@@ -73,7 +73,6 @@
  */
 
 /* $FreeBSD: src/sys/net/ppp_tty.c,v 1.43.2.1 2002/02/13 00:43:11 dillon Exp $ */
-/* $DragonFly: src/sys/net/ppp_layer/ppp_tty.c,v 1.25 2008/05/14 11:59:23 sephe Exp $ */
 
 #include "opt_ppp.h"		/* XXX for ppp_defs.h */
 
@@ -409,11 +408,11 @@ pppwrite(struct tty *tp, struct uio *uio, int flag)
     crit_enter();
     for (mp = &m0; uio->uio_resid; mp = &m->m_next) {
 	if (mp == &m0) {
-		MGETHDR(m, MB_WAIT, MT_DATA);
+		MGETHDR(m, M_WAITOK, MT_DATA);
 		m->m_pkthdr.len = uio->uio_resid - PPP_HDRLEN;
 		m->m_pkthdr.rcvif = NULL;
 	} else {
-		MGET(m, MB_WAIT, MT_DATA);
+		MGET(m, M_WAITOK, MT_DATA);
 	}
 	if ((*mp = m) == NULL) {
 	    m_freem(m0);
@@ -423,7 +422,7 @@ pppwrite(struct tty *tp, struct uio *uio, int flag)
 	}
 	m->m_len = 0;
 	if (uio->uio_resid >= MCLBYTES / 2)
-	    MCLGET(m, MB_DONTWAIT);
+	    MCLGET(m, M_NOWAIT);
 	len = M_TRAILINGSPACE(m);
 	if (len > uio->uio_resid)
 	    len = uio->uio_resid;
@@ -838,11 +837,11 @@ pppgetm(struct ppp_softc *sc)
     mp = &sc->sc_m;
     for (len = sc->sc_mru + PPP_HDRLEN + PPP_FCSLEN; len > 0; ){
 	if ((m = *mp) == NULL) {
-	    MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	    MGETHDR(m, M_NOWAIT, MT_DATA);
 	    if (m == NULL)
 		break;
 	    *mp = m;
-	    MCLGET(m, MB_DONTWAIT);
+	    MCLGET(m, M_NOWAIT);
 	}
 	len -= M_DATASIZE(m);
 	mp = &m->m_next;
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index c181302..63e1ca1 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -28,7 +28,6 @@
  *
  *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/net/raw_cb.c,v 1.16 1999/08/28 00:48:27 peter Exp $
- * $DragonFly: src/sys/net/raw_cb.c,v 1.11 2006/09/05 00:55:46 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -121,7 +120,7 @@ raw_bind(struct socket *so, struct mbuf *nam)
 	if (ifnet == NULL)
 		return (EADDRNOTAVAIL);
 	rp = sotorawcb(so);
-	nam = m_copym(nam, 0, M_COPYALL, MB_TRYWAIT);
+	nam = m_copym(nam, 0, M_COPYALL, M_WAITOK);
 	rp->rcb_laddr = mtod(nam, struct sockaddr *);
 	return (0);
 }
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index fa87199..2c6bdd0 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -28,7 +28,6 @@
  *
  *	@(#)raw_usrreq.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.18 1999/08/28 00:48:28 peter Exp $
- * $DragonFly: src/sys/net/raw_usrreq.c,v 1.14 2007/06/24 20:00:00 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -104,7 +103,7 @@ raw_input(struct mbuf *m0, const struct sockproto *proto,
 		if (last) {
 			struct mbuf *n;
 
-			n = m_copypacket(m, MB_DONTWAIT);
+			n = m_copypacket(m, M_NOWAIT);
 			if (n != NULL) {
 				lwkt_gettoken(&last->so_rcv.ssb_token);
 				if (ssb_appendaddr(&last->so_rcv, src, n,
diff --git a/sys/net/route.c b/sys/net/route.c
index 06bb456..3d1ec31 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1517,7 +1517,7 @@ rtinit(struct ifaddr *ifa, int cmd, int flags)
 		 * (Assuming we have a mask)
 		 */
 		if (netmask != NULL) {
-			m = m_get(MB_DONTWAIT, MT_SONAME);
+			m = m_get(M_NOWAIT, MT_SONAME);
 			if (m == NULL)
 				return (ENOBUFS);
 			mbuftrackid(m, 34);
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 82bbb65..3a43a24 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -916,7 +916,7 @@ rt_msg_mbuf(int type, struct rt_addrinfo *rtinfo)
 	hlen = rt_msghdrsize(type);
 	KASSERT(hlen <= MCLBYTES, ("rt_msg_mbuf: hlen %d doesn't fit", hlen));
 
-	m = m_getl(hlen, MB_DONTWAIT, MT_DATA, M_PKTHDR, NULL);
+	m = m_getl(hlen, M_NOWAIT, MT_DATA, M_PKTHDR, NULL);
 	if (m == NULL)
 		return (NULL);
 	mbuftrackid(m, 32);
@@ -1201,8 +1201,8 @@ rt_ieee80211msg(struct ifnet *ifp, int what, void *data, size_t data_len)
 	 * NB: we assume m is a single mbuf.
 	 */
 	if (data_len > M_TRAILINGSPACE(m)) {
-		/* XXX use m_getb(data_len, MB_DONTWAIT, MT_DATA, 0); */
-		struct mbuf *n = m_get(MB_DONTWAIT, MT_DATA);
+		/* XXX use m_getb(data_len, M_NOWAIT, MT_DATA, 0); */
+		struct mbuf *n = m_get(M_NOWAIT, MT_DATA);
 		if (n == NULL) {
 			m_freem(m);
 			return;
diff --git a/sys/net/sl/if_sl.c b/sys/net/sl/if_sl.c
index f082cad..44b2586 100644
--- a/sys/net/sl/if_sl.c
+++ b/sys/net/sl/if_sl.c
@@ -30,7 +30,6 @@
  *
  *	@(#)if_sl.c	8.6 (Berkeley) 2/1/94
  * $FreeBSD: src/sys/net/if_sl.c,v 1.84.2.2 2002/02/13 00:43:10 dillon Exp $
- * $DragonFly: src/sys/net/sl/if_sl.c,v 1.32 2008/05/14 11:59:23 sephe Exp $
  */
 
 /*
@@ -746,7 +745,7 @@ sl_btom(struct sl_softc *sc, int len)
 	if (len >= MCLBYTES)
 		return (NULL);
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return (NULL);
 
@@ -758,7 +757,7 @@ sl_btom(struct sl_softc *sc, int len)
 	 * guarantees that packet will fit in a cluster.
 	 */
 	if (len >= MHLEN) {
-		MCLGET(m, MB_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			/*
 			 * we couldn't get a cluster - if memory's this
diff --git a/sys/net/sppp/if_spppsubr.c b/sys/net/sppp/if_spppsubr.c
index b412bc8..9819085 100644
--- a/sys/net/sppp/if_spppsubr.c
+++ b/sys/net/sppp/if_spppsubr.c
@@ -558,7 +558,7 @@ drop2:
 				 * enough leading space in the existing mbuf).
 				 */
 				m_adj(m, vjlen);
-				M_PREPEND(m, hlen, MB_DONTWAIT);
+				M_PREPEND(m, hlen, M_NOWAIT);
 				if (m == NULL)
 					goto drop2;
 				bcopy(iphdr, mtod(m, u_char *), hlen);
@@ -796,7 +796,7 @@ sppp_output_serialized(struct ifnet *ifp, struct ifaltq_subque *ifsq,
 	/*
 	 * Prepend general data packet PPP header. For now, IP only.
 	 */
-	M_PREPEND (m, PPP_HEADER_LEN, MB_DONTWAIT);
+	M_PREPEND (m, PPP_HEADER_LEN, M_NOWAIT);
 	if (! m) {
 		if (debug)
 			log(LOG_DEBUG, SPP_FMT "no memory for transmit header\n",
@@ -1282,7 +1282,7 @@ sppp_cisco_send(struct sppp *sp, int type, long par1, long par2)
 
 	getmicrouptime(&tv);
 
-	MGETHDR (m, MB_DONTWAIT, MT_DATA);
+	MGETHDR (m, M_NOWAIT, MT_DATA);
 	if (! m)
 		return;
 	m->m_pkthdr.len = m->m_len = PPP_HEADER_LEN + CISCO_PACKET_LEN;
@@ -1338,7 +1338,7 @@ sppp_cp_send(struct sppp *sp, u_short proto, u_char type,
 
 	if (len > MHLEN - PPP_HEADER_LEN - LCP_HEADER_LEN)
 		len = MHLEN - PPP_HEADER_LEN - LCP_HEADER_LEN;
-	MGETHDR (m, MB_DONTWAIT, MT_DATA);
+	MGETHDR (m, M_NOWAIT, MT_DATA);
 	if (! m)
 		return;
 	m->m_pkthdr.len = m->m_len = PPP_HEADER_LEN + LCP_HEADER_LEN + len;
@@ -4633,7 +4633,7 @@ sppp_auth_send(const struct cp *cp, struct sppp *sp,
 	struct ifaltq_subque *ifsq;
 	__va_list ap;
 
-	MGETHDR (m, MB_DONTWAIT, MT_DATA);
+	MGETHDR (m, M_NOWAIT, MT_DATA);
 	if (! m)
 		return;
 	m->m_pkthdr.rcvif = 0;
diff --git a/sys/net/stf/if_stf.c b/sys/net/stf/if_stf.c
index 64effaf..7dae157 100644
--- a/sys/net/stf/if_stf.c
+++ b/sys/net/stf/if_stf.c
@@ -1,5 +1,4 @@
 /*	$FreeBSD: src/sys/net/if_stf.c,v 1.1.2.11 2003/01/23 21:06:44 sam Exp $	*/
-/*	$DragonFly: src/sys/net/stf/if_stf.c,v 1.25 2008/10/27 02:56:30 sephe Exp $	*/
 /*	$KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $	*/
 
 /*
@@ -373,7 +372,7 @@ stf_output_serialized(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 		bpf_reltoken();
 	}
 
-	M_PREPEND(m, sizeof(struct ip), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ip), M_NOWAIT);
 	if (m && m->m_len < sizeof(struct ip))
 		m = m_pullup(m, sizeof(struct ip));
 	if (m == NULL)
diff --git a/sys/net/tap/if_tap.c b/sys/net/tap/if_tap.c
index 15e7349..cd9b9b6 100644
--- a/sys/net/tap/if_tap.c
+++ b/sys/net/tap/if_tap.c
@@ -927,7 +927,7 @@ tapwrite(struct dev_write_args *ap)
 	tlen = uio->uio_resid;
 
 	/* get a header mbuf */
-	MGETHDR(m, MB_WAIT, MT_DATA);
+	MGETHDR(m, M_WAITOK, MT_DATA);
 	if (m == NULL)
 		return (ENOBUFS);
 	mlen = MHLEN;
@@ -942,7 +942,7 @@ tapwrite(struct dev_write_args *ap)
 		*mp = m;
 		mp = &m->m_next;
 		if (uio->uio_resid > 0) {
-			MGET(m, MB_WAIT, MT_DATA);
+			MGET(m, M_WAITOK, MT_DATA);
 			if (m == NULL) {
 				error = ENOBUFS;
 				break;
diff --git a/sys/net/tun/if_tun.c b/sys/net/tun/if_tun.c
index dc8e599..8f1b9ce 100644
--- a/sys/net/tun/if_tun.c
+++ b/sys/net/tun/if_tun.c
@@ -355,7 +355,7 @@ tunoutput_serialized(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
 	/* 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, MB_DONTWAIT);
+		M_PREPEND(m0, dst->sa_len, M_NOWAIT);
 
 		/* if allocation failed drop packet */
 		if (m0 == NULL){
@@ -368,7 +368,7 @@ tunoutput_serialized(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
 
 	if (tp->tun_flags & TUN_IFHEAD) {
 		/* Prepend the address family */
-		M_PREPEND(m0, 4, MB_DONTWAIT);
+		M_PREPEND(m0, 4, M_NOWAIT);
 
 		/* if allocation failed drop packet */
 		if (m0 == NULL){
@@ -598,7 +598,7 @@ tunwrite(struct dev_write_args *ap)
 	tlen = uio->uio_resid;
 
 	/* get a header mbuf */
-	MGETHDR(m, MB_WAIT, MT_DATA);
+	MGETHDR(m, M_WAITOK, MT_DATA);
 	if (m == NULL)
 		return ENOBUFS;
 	mlen = MHLEN;
@@ -611,7 +611,7 @@ tunwrite(struct dev_write_args *ap)
 		*mp = m;
 		mp = &m->m_next;
 		if (uio->uio_resid > 0) {
-			MGET (m, MB_WAIT, MT_DATA);
+			MGET (m, M_WAITOK, MT_DATA);
 			if (m == NULL) {
 				error = ENOBUFS;
 				break;
diff --git a/sys/net/vlan/if_vlan_ether.c b/sys/net/vlan/if_vlan_ether.c
index f2de53a..ce9d429 100644
--- a/sys/net/vlan/if_vlan_ether.c
+++ b/sys/net/vlan/if_vlan_ether.c
@@ -76,7 +76,7 @@ vlan_start_dispatch(netmsg_t msg)
 		uint16_t vlantag = m->m_pkthdr.ether_vlantag;
 		struct ether_vlan_header *evl;
 
-		M_PREPEND(m, EVL_ENCAPLEN, MB_DONTWAIT);
+		M_PREPEND(m, EVL_ENCAPLEN, M_NOWAIT);
 		if (m == NULL) {
 			if_printf(ifp, "vlan%u M_PREPEND failed", vlantag);
 			return;
@@ -129,7 +129,7 @@ vlan_ether_ptap(struct bpf_if *bp, struct mbuf *m, uint16_t vlantag)
 	bpf_ptap(bp, m, &evh, ETHER_HDR_LEN + EVL_ENCAPLEN);
 
 	/* XXX assumes data was left intact */
-	M_PREPEND(m, ETHER_HDR_LEN, MB_WAIT);
+	M_PREPEND(m, ETHER_HDR_LEN, M_WAITOK);
 }
 
 void
diff --git a/sys/netbt/hci_link.c b/sys/netbt/hci_link.c
index 8995ff1..d85981f 100644
--- a/sys/netbt/hci_link.c
+++ b/sys/netbt/hci_link.c
@@ -1,4 +1,3 @@
-/* $DragonFly: src/sys/netbt/hci_link.c,v 1.2 2008/03/18 13:41:42 hasso Exp $ */
 /* $OpenBSD: src/sys/netbt/hci_link.c,v 1.7 2008/02/24 21:34:48 uwe Exp $ */
 /* $NetBSD: hci_link.c,v 1.16 2007/11/10 23:12:22 plunky Exp $ */
 
@@ -566,7 +565,7 @@ hci_acl_send(struct mbuf *m, struct hci_link *link,
 
 	while (plen > 0) {
 		if (plen > mlen) {
-			n = m_split(m, mlen, MB_DONTWAIT);
+			n = m_split(m, mlen, M_NOWAIT);
 			if (n == NULL)
 				goto nomem;
 		} else {
@@ -655,7 +654,7 @@ hci_acl_start(struct hci_link *link)
 			handle = HCI_MK_CON_HANDLE(link->hl_handle,
 						HCI_PACKET_FRAGMENT, 0);
 
-		M_PREPEND(m, sizeof(*hdr), MB_DONTWAIT);
+		M_PREPEND(m, sizeof(*hdr), M_NOWAIT);
 		if (m == NULL)
 			break;
 
diff --git a/sys/netbt/hci_socket.c b/sys/netbt/hci_socket.c
index 87d7efa..bededfc 100644
--- a/sys/netbt/hci_socket.c
+++ b/sys/netbt/hci_socket.c
@@ -513,7 +513,7 @@ hci_send(struct hci_pcb *pcb, struct mbuf *m, bdaddr_t *addr)
 	}
 
 	/* makes a copy for precious to keep */
-	m0 = m_copym(m, 0, M_COPYALL, MB_DONTWAIT);
+	m0 = m_copym(m, 0, M_COPYALL, M_NOWAIT);
 	if (m0 == NULL) {
 		err = ENOMEM;
 		goto bad;
@@ -999,7 +999,7 @@ hci_mtap(struct mbuf *m, struct hci_unit *unit)
 		/*
 		 * copy to socket
 		 */
-		m0 = m_copym(m, 0, M_COPYALL, MB_DONTWAIT);
+		m0 = m_copym(m, 0, M_COPYALL, M_NOWAIT);
 		if (m0 && sbappendaddr(&pcb->hp_socket->so_rcv.sb,
 				(struct sockaddr *)&sa, m0, ctlmsg)) {
 			sorwakeup(pcb->hp_socket);
diff --git a/sys/netbt/hci_unit.c b/sys/netbt/hci_unit.c
index 0fced4d..fc83344 100644
--- a/sys/netbt/hci_unit.c
+++ b/sys/netbt/hci_unit.c
@@ -1,4 +1,3 @@
-/* $DragonFly: src/sys/netbt/hci_unit.c,v 1.2 2008/03/18 13:41:42 hasso Exp $ */
 /* $OpenBSD: src/sys/netbt/hci_unit.c,v 1.8 2008/02/24 21:34:48 uwe Exp $ */
 /* $NetBSD: hci_unit.c,v 1.9 2007/12/30 18:26:42 plunky Exp $ */
 
@@ -290,7 +289,7 @@ hci_send_cmd(struct hci_unit *unit, uint16_t opcode, void *buf, uint8_t len)
 
 	KKASSERT(unit != NULL);
 
-	m = m_gethdr(MB_DONTWAIT, MT_DATA);
+	m = m_gethdr(M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 
diff --git a/sys/netbt/l2cap_signal.c b/sys/netbt/l2cap_signal.c
index 4e02721..4638960 100644
--- a/sys/netbt/l2cap_signal.c
+++ b/sys/netbt/l2cap_signal.c
@@ -1,4 +1,3 @@
-/* $DragonFly: src/sys/netbt/l2cap_signal.c,v 1.2 2008/03/18 13:41:42 hasso Exp $ */
 /* $OpenBSD: src/sys/netbt/l2cap_signal.c,v 1.3 2008/02/24 21:34:48 uwe Exp $ */
 /* $NetBSD: l2cap_signal.c,v 1.9 2007/11/10 23:12:23 plunky Exp $ */
 
@@ -952,7 +951,7 @@ l2cap_send_signal(struct hci_link *link, uint8_t code, uint8_t ident,
 		    device_get_nameunit(link->hl_unit->hci_dev));
 #endif
 
-	m = m_gethdr(MB_DONTWAIT, MT_DATA);
+	m = m_gethdr(M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 
diff --git a/sys/netbt/l2cap_socket.c b/sys/netbt/l2cap_socket.c
index 94a0639..938c7f9 100644
--- a/sys/netbt/l2cap_socket.c
+++ b/sys/netbt/l2cap_socket.c
@@ -429,13 +429,13 @@ l2cap_ssend(netmsg_t msg)
 		goto out;
 	}
 
-	m0 = m_copym(m, 0, M_COPYALL, MB_DONTWAIT);
+	m0 = m_copym(m, 0, M_COPYALL, M_NOWAIT);
 	if (m0 == NULL) {
 		error = ENOMEM;
 		goto out;
 	}
 
-	m0 = m_copym(m, 0, M_COPYALL, MB_DONTWAIT);
+	m0 = m_copym(m, 0, M_COPYALL, M_NOWAIT);
 	if (m0 == NULL) {
 		error = ENOMEM;
 		goto out;
diff --git a/sys/netbt/l2cap_upper.c b/sys/netbt/l2cap_upper.c
index 2f37462..b7406e6 100644
--- a/sys/netbt/l2cap_upper.c
+++ b/sys/netbt/l2cap_upper.c
@@ -382,7 +382,7 @@ l2cap_send(struct l2cap_channel *chan, struct mbuf *m)
 		plen, chan->lc_lcid, chan->lc_pending);
 
 	/* Encapsulate with B-Frame */
-	M_PREPEND(m, sizeof(l2cap_hdr_t), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(l2cap_hdr_t), M_NOWAIT);
 	if (m == NULL)
 		return ENOMEM;
 
diff --git a/sys/netbt/rfcomm_dlc.c b/sys/netbt/rfcomm_dlc.c
index ad4ef4f..904d415 100644
--- a/sys/netbt/rfcomm_dlc.c
+++ b/sys/netbt/rfcomm_dlc.c
@@ -1,4 +1,3 @@
-/* $DragonFly: src/sys/netbt/rfcomm_dlc.c,v 1.2 2008/03/18 13:41:42 hasso Exp $ */
 /* $OpenBSD: src/sys/netbt/rfcomm_dlc.c,v 1.2 2008/02/24 21:34:48 uwe Exp $ */
 /* $NetBSD: rfcomm_dlc.c,v 1.4 2007/11/03 17:20:17 plunky Exp $ */
 
@@ -380,7 +379,7 @@ rfcomm_dlc_start(struct rfcomm_dlc *dlc)
 			 */
 			m = dlc->rd_txbuf;
 			if (len < m->m_pkthdr.len) {
-				dlc->rd_txbuf = m_split(m, len, MB_DONTWAIT);
+				dlc->rd_txbuf = m_split(m, len, M_NOWAIT);
 				if (dlc->rd_txbuf == NULL) {
 					dlc->rd_txbuf = m;
 					break;
diff --git a/sys/netbt/rfcomm_session.c b/sys/netbt/rfcomm_session.c
index 58531e3..47c81ce 100644
--- a/sys/netbt/rfcomm_session.c
+++ b/sys/netbt/rfcomm_session.c
@@ -1,4 +1,3 @@
-/* $DragonFly: src/sys/netbt/rfcomm_session.c,v 1.2 2008/03/18 13:41:42 hasso Exp $ */
 /* $OpenBSD: src/sys/netbt/rfcomm_session.c,v 1.3 2008/02/24 21:34:48 uwe Exp $ */
 /* $NetBSD: rfcomm_session.c,v 1.12 2008/01/31 19:30:23 plunky Exp $ */
 
@@ -1462,7 +1461,7 @@ rfcomm_session_send_frame(struct rfcomm_session *rs, int type, int dlci)
 	if (credit == NULL)
 		return ENOMEM;
 
-	m = m_gethdr(MB_DONTWAIT, MT_DATA);
+	m = m_gethdr(M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		zfree(rfcomm_credit_pool, credit);
 		return ENOMEM;
@@ -1552,7 +1551,7 @@ rfcomm_session_send_uih(struct rfcomm_session *rs, struct rfcomm_dlc *dlc,
 	 * If there are credits to be sent, we will set the PF
 	 * flag and include them in the frame.
 	 */
-	m0 = m_gethdr(MB_DONTWAIT, MT_DATA);
+	m0 = m_gethdr(M_NOWAIT, MT_DATA);
 	if (m0 == NULL)
 		goto nomem;
 
@@ -1636,7 +1635,7 @@ rfcomm_session_send_mcc(struct rfcomm_session *rs, int cr,
 	uint8_t *hdr;
 	int hlen;
 
-	m = m_gethdr(MB_DONTWAIT, MT_DATA);
+	m = m_gethdr(M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return ENOMEM;
 
diff --git a/sys/netbt/rfcomm_socket.c b/sys/netbt/rfcomm_socket.c
index d526f64..2a0f1d1 100644
--- a/sys/netbt/rfcomm_socket.c
+++ b/sys/netbt/rfcomm_socket.c
@@ -439,7 +439,7 @@ rfcomm_ssend(netmsg_t msg)
 		control = NULL;
 	}
 
-	m0 = m_copym(m, 0, M_COPYALL, MB_DONTWAIT);
+	m0 = m_copym(m, 0, M_COPYALL, M_NOWAIT);
 	if (m0) {
 		sbappendstream(&so->so_snd.sb, m);
 		error = rfcomm_send(pcb, m0);
diff --git a/sys/netbt/sco_socket.c b/sys/netbt/sco_socket.c
index 7a8da06..7782238 100644
--- a/sys/netbt/sco_socket.c
+++ b/sys/netbt/sco_socket.c
@@ -107,7 +107,7 @@ sco_ctloutput(netmsg_t msg)
 
 	switch(sopt->sopt_dir) {
 	case PRCO_GETOPT:
-		m = m_get(MB_WAIT, MT_DATA);
+		m = m_get(M_WAITOK, MT_DATA);
 		m->m_len = sco_getopt(pcb, sopt->sopt_name, mtod(m, uint8_t *));
 		if (m->m_len == 0) {
 			m_freem(m);
@@ -396,7 +396,7 @@ sco_ssend(netmsg_t msg)
 		goto out;
 	}
 
-	m0 = m_copym(m, 0, M_COPYALL, MB_DONTWAIT);
+	m0 = m_copym(m, 0, M_COPYALL, M_NOWAIT);
 	if (m0 == NULL) {
 		error = ENOMEM;
 		goto out;
diff --git a/sys/netbt/sco_upper.c b/sys/netbt/sco_upper.c
index 657c5ec..0d63a3e 100644
--- a/sys/netbt/sco_upper.c
+++ b/sys/netbt/sco_upper.c
@@ -296,7 +296,7 @@ sco_send(struct sco_pcb *pcb, struct mbuf *m)
 		return EMSGSIZE;
 	}
 
-	M_PREPEND(m, sizeof(hci_scodata_hdr_t), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(hci_scodata_hdr_t), M_NOWAIT);
 	if (m == NULL)
 		return ENOMEM;
 
diff --git a/sys/netgraph/UI/ng_UI.c b/sys/netgraph/UI/ng_UI.c
index 944e1ca..a823c39 100644
--- a/sys/netgraph/UI/ng_UI.c
+++ b/sys/netgraph/UI/ng_UI.c
@@ -181,7 +181,7 @@ ng_UI_rcvdata(hook_p hook, struct mbuf *m, meta_p meta)
 		m_adj(m, ptr - start);
 		NG_SEND_DATA(error, priv->uplink, m, meta);	/* m -> NULL */
 	} else if (hook == priv->uplink) {
-		M_PREPEND(m, 1, MB_DONTWAIT);	/* Prepend IP NLPID */
+		M_PREPEND(m, 1, M_NOWAIT);	/* Prepend IP NLPID */
 		if (!m)
 			ERROUT(ENOBUFS);
 		mtod(m, u_char *)[0] = HDLC_UI;
diff --git a/sys/netgraph/cisco/ng_cisco.c b/sys/netgraph/cisco/ng_cisco.c
index 34871e8..e7ae26d 100644
--- a/sys/netgraph/cisco/ng_cisco.c
+++ b/sys/netgraph/cisco/ng_cisco.c
@@ -360,7 +360,7 @@ cisco_rcvdata(hook_p hook, struct mbuf *m, meta_p meta)
 
 	/* OK so it came from a protocol, heading out. Prepend general data
 	   packet header. For now, IP,IPX only  */
-	M_PREPEND(m, CISCO_HEADER_LEN, MB_DONTWAIT);
+	M_PREPEND(m, CISCO_HEADER_LEN, M_NOWAIT);
 	if (!m) {
 		error = ENOBUFS;
 		goto out;
@@ -597,7 +597,7 @@ cisco_send(sc_p sc, int type, long par1, long par2)
 
 	getmicrotime(&time);
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (!m)
 		return (ENOBUFS);
 
diff --git a/sys/netgraph/frame_relay/ng_frame_relay.c b/sys/netgraph/frame_relay/ng_frame_relay.c
index 4202373..7893448 100644
--- a/sys/netgraph/frame_relay/ng_frame_relay.c
+++ b/sys/netgraph/frame_relay/ng_frame_relay.c
@@ -371,7 +371,7 @@ ngfrm_rcvdata(hook_p hook, struct mbuf *m, meta_p meta)
 	alen = sc->addrlen;
 	if (alen == 0)
 		alen = 2;	/* default value for transmit */
-	M_PREPEND(m, alen, MB_DONTWAIT);
+	M_PREPEND(m, alen, M_NOWAIT);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto bad;
diff --git a/sys/netgraph/l2tp/ng_l2tp.c b/sys/netgraph/l2tp/ng_l2tp.c
index 34a55e7..3ba96a2 100644
--- a/sys/netgraph/l2tp/ng_l2tp.c
+++ b/sys/netgraph/l2tp/ng_l2tp.c
@@ -838,7 +838,7 @@ ng_l2tp_recv_lower(node_p node, struct mbuf *m, meta_p meta)
 		 * later because of a memory error, because then the upper
 		 * layer would never get the packet.
 		 */
-		M_PREPEND(m, 2, MB_DONTWAIT);
+		M_PREPEND(m, 2, M_NOWAIT);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			NG_FREE_META(meta);
@@ -937,7 +937,7 @@ ng_l2tp_recv_ctrl(node_p node, struct mbuf *m, meta_p meta)
 	}
 
 	/* Copy packet */
-	if ((m = L2TP_COPY_MBUF(seq->xwin[i], MB_DONTWAIT)) == NULL) {
+	if ((m = L2TP_COPY_MBUF(seq->xwin[i], M_NOWAIT)) == NULL) {
 		priv->stats.memoryFailures++;
 		return (ENOBUFS);
 	}
@@ -969,7 +969,7 @@ ng_l2tp_recv_data(node_p node, struct mbuf *m, meta_p meta, hookpriv_p hpriv)
 	M_PREPEND(m, 6
 	    + (2 * (hpriv->conf.include_length != 0))
 	    + (4 * (hpriv->conf.enable_dseq != 0)),
-	    MB_DONTWAIT);
+	    M_NOWAIT);
 	if (m == NULL) {
 		priv->stats.memoryFailures++;
 		NG_FREE_META(meta);
@@ -1204,7 +1204,7 @@ ng_l2tp_seq_recv_nr(priv_p priv, u_int16_t nr)
 	 */
 	while ((i = L2TP_SEQ_DIFF(seq->ns, seq->rack)) < seq->cwnd
 	    && seq->xwin[i] != NULL) {
-		if ((m = L2TP_COPY_MBUF(seq->xwin[i], MB_DONTWAIT)) == NULL)
+		if ((m = L2TP_COPY_MBUF(seq->xwin[i], M_NOWAIT)) == NULL)
 			priv->stats.memoryFailures++;
 		else
 			ng_l2tp_xmit_ctrl(priv, m, seq->ns);
@@ -1348,7 +1348,7 @@ ng_l2tp_seq_rack_timeout(void *arg)
 	seq->acks = 0;
 
 	/* Retransmit oldest unack'd packet */
-	if ((m = L2TP_COPY_MBUF(seq->xwin[0], MB_DONTWAIT)) == NULL)
+	if ((m = L2TP_COPY_MBUF(seq->xwin[0], M_NOWAIT)) == NULL)
 		priv->stats.memoryFailures++;
 	else
 		ng_l2tp_xmit_ctrl(priv, m, seq->rack);
@@ -1375,7 +1375,7 @@ ng_l2tp_xmit_ctrl(priv_p priv, struct mbuf *m, u_int16_t ns)
 	if (m == NULL) {
 
 		/* Create a new mbuf for ZLB packet */
-		MGETHDR(m, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			return (ENOBUFS);
@@ -1394,7 +1394,7 @@ ng_l2tp_xmit_ctrl(priv_p priv, struct mbuf *m, u_int16_t ns)
 		m_adj(m, 2);
 
 		/* Make room for L2TP header */
-		M_PREPEND(m, 12, MB_DONTWAIT);
+		M_PREPEND(m, 12, M_NOWAIT);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			return (ENOBUFS);
diff --git a/sys/netgraph/lmi/ng_lmi.c b/sys/netgraph/lmi/ng_lmi.c
index 54cda2b..8152b70 100644
--- a/sys/netgraph/lmi/ng_lmi.c
+++ b/sys/netgraph/lmi/ng_lmi.c
@@ -330,7 +330,7 @@ nglmi_inquire(sc_p sc, int full)
 
 	if (sc->lmi_channel == NULL)
 		return;
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		log(LOG_ERR, "nglmi: unable to start up LMI processing\n");
 		return;
diff --git a/sys/netgraph/ppp/ng_ppp.c b/sys/netgraph/ppp/ng_ppp.c
index cb5bca2..2442562 100644
--- a/sys/netgraph/ppp/ng_ppp.c
+++ b/sys/netgraph/ppp/ng_ppp.c
@@ -1545,7 +1545,7 @@ deliver:
 			/* Split off next fragment as "m2" */
 			m2 = m;
 			if (!lastFragment) {
-				struct mbuf *n = m_split(m, len, MB_DONTWAIT);
+				struct mbuf *n = m_split(m, len, M_NOWAIT);
 
 				if (n == NULL) {
 					NG_FREE_DATA(m, meta);
@@ -1863,7 +1863,7 @@ ng_ppp_addproto(struct mbuf *m, int proto, int compOK)
 static struct mbuf *
 ng_ppp_prepend(struct mbuf *m, const void *buf, int len)
 {
-	M_PREPEND(m, len, MB_DONTWAIT);
+	M_PREPEND(m, len, M_NOWAIT);
 	if (m == NULL || (m->m_len < len && (m = m_pullup(m, len)) == NULL))
 		return (NULL);
 	bcopy(buf, mtod(m, u_char *), len);
diff --git a/sys/netgraph/pppoe/ng_pppoe.c b/sys/netgraph/pppoe/ng_pppoe.c
index af9b869..adeb2bb 100644
--- a/sys/netgraph/pppoe/ng_pppoe.c
+++ b/sys/netgraph/pppoe/ng_pppoe.c
@@ -659,14 +659,14 @@ AAA
 				kprintf("pppoe: Session out of memory\n");
 				LEAVE(ENOMEM);
 			}
-			MGETHDR(neg->m, MB_DONTWAIT, MT_DATA);
+			MGETHDR(neg->m, M_NOWAIT, MT_DATA);
 			if(neg->m == NULL) {
 				kprintf("pppoe: Session out of mbufs\n");
 				kfree(neg, M_NETGRAPH);
 				LEAVE(ENOBUFS);
 			}
 			neg->m->m_pkthdr.rcvif = NULL;
-			MCLGET(neg->m, MB_DONTWAIT);
+			MCLGET(neg->m, M_NOWAIT);
 			if ((neg->m->m_flags & M_EXT) == 0) {
 				kprintf("pppoe: Session out of mcls\n");
 				m_freem(neg->m);
@@ -1283,7 +1283,7 @@ AAA
 			 * But first correct the length.
 			 */
 			sp->pkt_hdr.ph.length = htons((short)(m->m_pkthdr.len));
-			M_PREPEND(m, sizeof(*wh), MB_DONTWAIT);
+			M_PREPEND(m, sizeof(*wh), M_NOWAIT);
 			if (m == NULL) {
 				LEAVE(ENOBUFS);
 			}
@@ -1457,7 +1457,7 @@ AAA
 				wh->eh.ether_type = ETHERTYPE_PPPOE_DISC;
 
 			/* generate a packet of that type */
-			MGETHDR(m, MB_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if(m == NULL)
 				kprintf("pppoe: Session out of mbufs\n");
 			else {
@@ -1528,7 +1528,7 @@ AAA
 	case	PPPOE_SINIT:
 	case	PPPOE_SREQ:
 		/* timeouts on these produce resends */
-		m0 = m_copypacket(sp->neg->m, MB_DONTWAIT);
+		m0 = m_copypacket(sp->neg->m, M_NOWAIT);
 		NG_SEND_DATA( error, privp->ethernet_hook, m0, dummy);
 		callout_reset(&neg->timeout_ch, neg->timeout * hz,
 				pppoe_ticker, hook);
@@ -1575,7 +1575,7 @@ AAA
 
 	case	PPPOE_NEWCONNECTED:
 		/* send the PADS without a timeout - we're now connected */
-		m0 = m_copypacket(sp->neg->m, MB_DONTWAIT);
+		m0 = m_copypacket(sp->neg->m, M_NOWAIT);
 		NG_SEND_DATA( error, privp->ethernet_hook, m0, dummy);
 		break;
 
@@ -1590,7 +1590,7 @@ AAA
 		 * send the offer but if they don't respond
 		 * in PPPOE_OFFER_TIMEOUT seconds, forget about it.
 		 */
-		m0 = m_copypacket(sp->neg->m, MB_DONTWAIT);
+		m0 = m_copypacket(sp->neg->m, M_NOWAIT);
 		NG_SEND_DATA( error, privp->ethernet_hook, m0, dummy);
 		callout_reset(&neg->timeout_ch, PPPOE_OFFER_TIMEOUT * hz,
 				pppoe_ticker, hook);
@@ -1598,7 +1598,7 @@ AAA
 
 	case	PPPOE_SINIT:
 	case	PPPOE_SREQ:
-		m0 = m_copypacket(sp->neg->m, MB_DONTWAIT);
+		m0 = m_copypacket(sp->neg->m, M_NOWAIT);
 		NG_SEND_DATA( error, privp->ethernet_hook, m0, dummy);
 		callout_reset(&neg->timeout_ch, PPPOE_INITIAL_TIMEOUT * hz,
 				pppoe_ticker, hook);
diff --git a/sys/netgraph/pptpgre/ng_pptpgre.c b/sys/netgraph/pptpgre/ng_pptpgre.c
index 48c3c38..dd14c1f 100644
--- a/sys/netgraph/pptpgre/ng_pptpgre.c
+++ b/sys/netgraph/pptpgre/ng_pptpgre.c
@@ -528,7 +528,7 @@ ng_pptpgre_xmit(node_p node, struct mbuf *m, meta_p meta)
 	/* Prepend GRE header to outgoing frame */
 	grelen = sizeof(*gre) + sizeof(u_int32_t) * (gre->hasSeq + gre->hasAck);
 	if (m == NULL) {
-		MGETHDR(m, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			NG_FREE_META(meta);
@@ -537,7 +537,7 @@ ng_pptpgre_xmit(node_p node, struct mbuf *m, meta_p meta)
 		m->m_len = m->m_pkthdr.len = grelen;
 		m->m_pkthdr.rcvif = NULL;
 	} else {
-		M_PREPEND(m, grelen, MB_DONTWAIT);
+		M_PREPEND(m, grelen, M_NOWAIT);
 		if (m == NULL || (m->m_len < grelen
 		    && (m = m_pullup(m, grelen)) == NULL)) {
 			priv->stats.memoryFailures++;
diff --git a/sys/netgraph/rfc1490/ng_rfc1490.c b/sys/netgraph/rfc1490/ng_rfc1490.c
index 0b3c2fb..6d3a396 100644
--- a/sys/netgraph/rfc1490/ng_rfc1490.c
+++ b/sys/netgraph/rfc1490/ng_rfc1490.c
@@ -283,14 +283,14 @@ ng_rfc1490_rcvdata(hook_p hook, struct mbuf *m, meta_p meta)
 			break;
 		}
 	} else if (hook == priv->ppp) {
-		M_PREPEND(m, 2, MB_DONTWAIT);	/* Prepend PPP NLPID */
+		M_PREPEND(m, 2, M_NOWAIT);	/* Prepend PPP NLPID */
 		if (!m)
 			ERROUT(ENOBUFS);
 		mtod(m, u_char *)[0] = HDLC_UI;
 		mtod(m, u_char *)[1] = NLPID_PPP;
 		NG_SEND_DATA(error, priv->downlink, m, meta);
 	} else if (hook == priv->inet) {
-		M_PREPEND(m, 2, MB_DONTWAIT);	/* Prepend IP NLPID */
+		M_PREPEND(m, 2, M_NOWAIT);	/* Prepend IP NLPID */
 		if (!m)
 			ERROUT(ENOBUFS);
 		mtod(m, u_char *)[0] = HDLC_UI;
diff --git a/sys/netgraph/tty/ng_tty.c b/sys/netgraph/tty/ng_tty.c
index 8576f72..9fbb366 100644
--- a/sys/netgraph/tty/ng_tty.c
+++ b/sys/netgraph/tty/ng_tty.c
@@ -374,7 +374,7 @@ ngt_input(int c, struct tty *tp)
 
 	/* Get a new header mbuf if we need one */
 	if (!(m = sc->m)) {
-		MGETHDR(m, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (!m) {
 			if (sc->flags & FLG_DEBUG)
 				log(LOG_ERR,
diff --git a/sys/netgraph/vjc/ng_vjc.c b/sys/netgraph/vjc/ng_vjc.c
index e65c396..59ea1a5 100644
--- a/sys/netgraph/vjc/ng_vjc.c
+++ b/sys/netgraph/vjc/ng_vjc.c
@@ -479,7 +479,7 @@ ng_vjc_rcvdata(hook_p hook, struct mbuf *m, meta_p meta)
 		m_adj(m, vjlen);
 
 		/* Copy the reconstructed TCP/IP headers into a new mbuf */
-		MGETHDR(hm, MB_DONTWAIT, MT_DATA);
+		MGETHDR(hm, M_NOWAIT, MT_DATA);
 		if (hm == NULL) {
 			priv->slc.sls_errorin++;
 			NG_FREE_DATA(m, meta);
@@ -488,7 +488,7 @@ ng_vjc_rcvdata(hook_p hook, struct mbuf *m, meta_p meta)
 		hm->m_len = 0;
 		hm->m_pkthdr.rcvif = NULL;
 		if (hlen > MHLEN) {		/* unlikely, but can happen */
-			MCLGET(hm, MB_DONTWAIT);
+			MCLGET(hm, M_NOWAIT);
 			if ((hm->m_flags & M_EXT) == 0) {
 				m_freem(hm);
 				priv->slc.sls_errorin++;
diff --git a/sys/netgraph7/UI/ng_UI.c b/sys/netgraph7/UI/ng_UI.c
index 454dde7..680e7f4 100644
--- a/sys/netgraph7/UI/ng_UI.c
+++ b/sys/netgraph7/UI/ng_UI.c
@@ -190,7 +190,7 @@ ng_UI_rcvdata(hook_p hook, item_p item)
 		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, MB_DONTWAIT);	/* Prepend IP NLPID */
+		M_PREPEND(m, 1, M_NOWAIT);	/* Prepend IP NLPID */
 		if (!m)
 			ERROUT(ENOBUFS);
 		mtod(m, u_char *)[0] = HDLC_UI;
diff --git a/sys/netgraph7/bluetooth/drivers/bt3c/ng_bt3c_pccard.c b/sys/netgraph7/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
index 5354c7c..5d1eb03 100644
--- a/sys/netgraph7/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
+++ b/sys/netgraph7/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
@@ -799,7 +799,7 @@ bt3c_receive(bt3c_softc_p sc)
 			sc->state = NG_BT3C_W4_PKT_IND;
 			sc->want = 1;
 
-			MGETHDR(sc->m, MB_DONTWAIT, MT_DATA);
+			MGETHDR(sc->m, M_NOWAIT, MT_DATA);
 			if (sc->m == NULL) {
 				NG_BT3C_ERR(sc->dev, "Could not get mbuf\n");
 				NG_BT3C_STAT_IERROR(sc->stat);
@@ -807,7 +807,7 @@ bt3c_receive(bt3c_softc_p sc)
 				break; /* XXX lost of sync */
 			}
 
-			MCLGET(sc->m, MB_DONTWAIT);
+			MCLGET(sc->m, M_NOWAIT);
 			if (!(sc->m->m_flags & M_EXT)) {
 				NG_FREE_M(sc->m);
 
diff --git a/sys/netgraph7/bluetooth/drivers/h4/ng_h4.c b/sys/netgraph7/bluetooth/drivers/h4/ng_h4.c
index c47dc0f..d226f4e 100644
--- a/sys/netgraph7/bluetooth/drivers/h4/ng_h4.c
+++ b/sys/netgraph7/bluetooth/drivers/h4/ng_h4.c
@@ -536,7 +536,7 @@ ng_h4_input(int c, struct tty *tp)
 		if (sc->hook != NULL && NG_HOOK_IS_VALID(sc->hook)) {
 			struct mbuf	*m = NULL;
 
-			MGETHDR(m, MB_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if (m != NULL) {
 				m->m_pkthdr.len = 0;
 
diff --git a/sys/netgraph7/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph7/bluetooth/drivers/ubt/ng_ubt.c
index 758e1fd..6aeba86 100644
--- a/sys/netgraph7/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph7/bluetooth/drivers/ubt/ng_ubt.c
@@ -807,13 +807,13 @@ ubt_intr_read_callback(struct usb_xfer *xfer, usb_error_t error)
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 		/* Allocate a new mbuf */
-		MGETHDR(m, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			UBT_STAT_IERROR(sc);
 			goto submit_next;
 		}
 
-		MCLGET(m, MB_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if (!(m->m_flags & M_EXT)) {
 			UBT_STAT_IERROR(sc);
 			goto submit_next;
@@ -907,13 +907,13 @@ ubt_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 		/* Allocate new mbuf */
-		MGETHDR(m, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			UBT_STAT_IERROR(sc);
 			goto submit_next;
 		}
 
-		MCLGET(m, MB_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if (!(m->m_flags & M_EXT)) {
 			UBT_STAT_IERROR(sc);
 			goto submit_next;
@@ -1117,13 +1117,13 @@ ubt_isoc_read_one_frame(struct usb_xfer *xfer, int frame_no)
 	while (total > 0) {
 		if (m == NULL) {
 			/* Start new reassembly buffer */
-			MGETHDR(m, MB_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if (m == NULL) {
 				UBT_STAT_IERROR(sc);
 				return (-1);	/* XXX out of sync! */
 			}
 
-			MCLGET(m, MB_DONTWAIT);
+			MCLGET(m, M_NOWAIT);
 			if (!(m->m_flags & M_EXT)) {
 				UBT_STAT_IERROR(sc);
 				NG_FREE_M(m);
diff --git a/sys/netgraph7/bluetooth/hci/ng_hci_cmds.c b/sys/netgraph7/bluetooth/hci/ng_hci_cmds.c
index bd9f7e5..124a8d4 100644
--- a/sys/netgraph7/bluetooth/hci/ng_hci_cmds.c
+++ b/sys/netgraph7/bluetooth/hci/ng_hci_cmds.c
@@ -118,7 +118,7 @@ ng_hci_send_command(ng_hci_unit_p unit)
 
 	ng_hci_mtap(unit, m0);
 
-	m = m_dup(m0, MB_DONTWAIT);
+	m = m_dup(m0, M_NOWAIT);
 	if (m != NULL)
 		NG_SEND_DATA_ONLY(error, unit->drv, m);
 	else
diff --git a/sys/netgraph7/bluetooth/hci/ng_hci_evnt.c b/sys/netgraph7/bluetooth/hci/ng_hci_evnt.c
index 5f51fad..60b7146 100644
--- a/sys/netgraph7/bluetooth/hci/ng_hci_evnt.c
+++ b/sys/netgraph7/bluetooth/hci/ng_hci_evnt.c
@@ -515,7 +515,7 @@ con_compl(ng_hci_unit_p unit, struct mbuf *event)
 			} __attribute__ ((packed))			*lp;
 			struct mbuf					*m;
 
-			MGETHDR(m, MB_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if (m != NULL) {
 				m->m_pkthdr.len = m->m_len = sizeof(*lp);
 				lp = mtod(m, struct __link_policy *);
diff --git a/sys/netgraph7/bluetooth/hci/ng_hci_misc.c b/sys/netgraph7/bluetooth/hci/ng_hci_misc.c
index b5c792b..e2fc270 100644
--- a/sys/netgraph7/bluetooth/hci/ng_hci_misc.c
+++ b/sys/netgraph7/bluetooth/hci/ng_hci_misc.c
@@ -65,7 +65,7 @@ ng_hci_mtap(ng_hci_unit_p unit, struct mbuf *m0)
 	int		 error = 0;
 
 	if (unit->raw != NULL && NG_HOOK_IS_VALID(unit->raw)) {
-		m = m_dup(m0, MB_DONTWAIT);
+		m = m_dup(m0, M_NOWAIT);
 		if (m != NULL)
 			NG_SEND_DATA_ONLY(error, unit->raw, m);
 
diff --git a/sys/netgraph7/bluetooth/hci/ng_hci_ulpi.c b/sys/netgraph7/bluetooth/hci/ng_hci_ulpi.c
index 4601251..edc28f5 100644
--- a/sys/netgraph7/bluetooth/hci/ng_hci_ulpi.c
+++ b/sys/netgraph7/bluetooth/hci/ng_hci_ulpi.c
@@ -224,7 +224,7 @@ ng_hci_lp_acl_con_req(ng_hci_unit_p unit, item_p item, hook_p hook)
 	 * Create HCI command 
 	 */
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		ng_hci_free_con(con);
 		error = ENOBUFS;
@@ -417,7 +417,7 @@ ng_hci_lp_sco_con_req(ng_hci_unit_p unit, item_p item, hook_p hook)
 	 * Create HCI command 
 	 */
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		ng_hci_free_con(sco_con);
 		error = ENOBUFS;
@@ -531,7 +531,7 @@ ng_hci_lp_discon_req(ng_hci_unit_p unit, item_p item, hook_p hook)
 	 * Create HCI command
 	 */
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto out;
@@ -776,7 +776,7 @@ ng_hci_lp_con_rsp(ng_hci_unit_p unit, item_p item, hook_p hook)
 		 * Create HCI command 
 		 */
 
-		MGETHDR(m, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
@@ -996,7 +996,7 @@ ng_hci_lp_qos_req(ng_hci_unit_p unit, item_p item, hook_p hook)
 	 * Create HCI command 
 	 */
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto out;
diff --git a/sys/netgraph7/bluetooth/l2cap/ng_l2cap_cmds.h b/sys/netgraph7/bluetooth/l2cap/ng_l2cap_cmds.h
index c631eb6..f6404c2 100644
--- a/sys/netgraph7/bluetooth/l2cap/ng_l2cap_cmds.h
+++ b/sys/netgraph7/bluetooth/l2cap/ng_l2cap_cmds.h
@@ -56,7 +56,7 @@ do {									\
 		ng_l2cap_cmd_rej_data_t	 data;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -90,7 +90,7 @@ do {									\
 		ng_l2cap_con_req_cp	 param;				\
 	} __attribute__ ((packed)) 	*c = NULL;			\
 									\
-	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -113,7 +113,7 @@ do {									\
 		ng_l2cap_con_rsp_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -138,7 +138,7 @@ do {									\
 		ng_l2cap_cfg_req_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) { 						\
 		NG_FREE_M((_data));					\
 		break;							\
@@ -172,7 +172,7 @@ do {									\
 		ng_l2cap_cfg_rsp_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) { 						\
 		NG_FREE_M((_data));					\
 		break;							\
@@ -204,7 +204,7 @@ do {									\
 do {									\
 	u_int8_t	*p = NULL;					\
 									\
-	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -281,7 +281,7 @@ do {									\
 		ng_l2cap_discon_req_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -304,7 +304,7 @@ do {									\
 		ng_l2cap_discon_rsp_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -324,7 +324,7 @@ do {									\
 do {									\
 	ng_l2cap_cmd_hdr_t	*c = NULL;				\
 									\
-	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
@@ -351,7 +351,7 @@ do {									\
 		ng_l2cap_info_req_cp	 param;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL)						\
 		break;							\
 									\
@@ -374,7 +374,7 @@ do {									\
 		ng_l2cap_info_rsp_data_t data;				\
 	} __attribute__ ((packed))	*c = NULL;			\
 									\
-	MGETHDR((_m), MB_DONTWAIT, MT_DATA);				\
+	MGETHDR((_m), M_NOWAIT, MT_DATA);				\
 	if ((_m) == NULL) 						\
 		break;							\
 									\
diff --git a/sys/netgraph7/bluetooth/l2cap/ng_l2cap_evnt.c b/sys/netgraph7/bluetooth/l2cap/ng_l2cap_evnt.c
index 43f4831..73d0fd1 100644
--- a/sys/netgraph7/bluetooth/l2cap/ng_l2cap_evnt.c
+++ b/sys/netgraph7/bluetooth/l2cap/ng_l2cap_evnt.c
@@ -192,7 +192,7 @@ ng_l2cap_process_signal_cmd(ng_l2cap_con_p con)
 
 		/* 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, MB_DONTWAIT);
+			m = m_split(con->rx_pkt, hdr->length, M_NOWAIT);
 		else
 			m = NULL;
 
diff --git a/sys/netgraph7/bluetooth/l2cap/ng_l2cap_llpi.c b/sys/netgraph7/bluetooth/l2cap/ng_l2cap_llpi.c
index 4570fe5..7b3a8c4 100644
--- a/sys/netgraph7/bluetooth/l2cap/ng_l2cap_llpi.c
+++ b/sys/netgraph7/bluetooth/l2cap/ng_l2cap_llpi.c
@@ -522,7 +522,7 @@ ng_l2cap_lp_send(ng_l2cap_con_p con, u_int16_t dcid, struct mbuf *m0)
 		/* 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, MB_DONTWAIT);
+			m = m_split(m0, l2cap->pkt_size, M_NOWAIT);
 			if (m == NULL) {
 				NG_L2CAP_ALERT(
 "%s: %s - m_split(%d) failed\n",	__func__, NG_NODE_NAME(l2cap->node),
diff --git a/sys/netgraph7/bluetooth/l2cap/ng_l2cap_misc.c b/sys/netgraph7/bluetooth/l2cap/ng_l2cap_misc.c
index 8caf653..44f2c42 100644
--- a/sys/netgraph7/bluetooth/l2cap/ng_l2cap_misc.c
+++ b/sys/netgraph7/bluetooth/l2cap/ng_l2cap_misc.c
@@ -558,7 +558,7 @@ ng_l2cap_command_untimeout(ng_l2cap_cmd_p cmd)
 struct mbuf *
 ng_l2cap_prepend(struct mbuf *m, int size)
 {
-	M_PREPEND(m, size, MB_DONTWAIT);
+	M_PREPEND(m, size, M_NOWAIT);
 	if (m == NULL || (m->m_len < size && (m = m_pullup(m, size)) == NULL))
 		return (NULL);
 
diff --git a/sys/netgraph7/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph7/bluetooth/socket/ng_btsocket_hci_raw.c
index f6c8b60..e4cc68f 100644
--- a/sys/netgraph7/bluetooth/socket/ng_btsocket_hci_raw.c
+++ b/sys/netgraph7/bluetooth/socket/ng_btsocket_hci_raw.c
@@ -307,7 +307,7 @@ ng_btsocket_hci_raw_node_rcvdata(hook_p hook, item_p item)
 	 * for now
 	 */
 
-	MGET(nam, MB_DONTWAIT, MT_SONAME);
+	MGET(nam, M_NOWAIT, MT_SONAME);
 	if (nam != NULL) {
 		struct sockaddr_hci	*sa = mtod(nam, struct sockaddr_hci *);
 
@@ -517,7 +517,7 @@ ng_btsocket_hci_raw_data_input(struct mbuf *nam)
 		 * will check if socket has enough buffer space.
 		 */
 
-		m = m_dup(m0, MB_DONTWAIT);
+		m = m_dup(m0, M_NOWAIT);
 		if (m != NULL) {
 			struct mbuf	*ctl = NULL;
 
@@ -1665,7 +1665,7 @@ ng_btsocket_hci_raw_send(netmsg_t msg)
 		sa = (struct sockaddr *) &pcb->addr;
 	}
 
-	MGET(nam, MB_DONTWAIT, MT_SONAME);
+	MGET(nam, M_NOWAIT, MT_SONAME);
 	if (nam == NULL) {
 		lockmgr(&pcb->pcb_lock, LK_RELEASE);
 		error = ENOBUFS;
diff --git a/sys/netgraph7/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph7/bluetooth/socket/ng_btsocket_l2cap.c
index 10cd243..4cbb59b 100644
--- a/sys/netgraph7/bluetooth/socket/ng_btsocket_l2cap.c
+++ b/sys/netgraph7/bluetooth/socket/ng_btsocket_l2cap.c
@@ -1524,7 +1524,7 @@ ng_btsocket_l2cap_data_input(struct mbuf *m, hook_p hook)
 			 * it is a broadcast traffic after all
 			 */
 
-			copy = m_dup(m, MB_DONTWAIT);
+			copy = m_dup(m, M_NOWAIT);
 			if (copy != NULL) {
 				sbappendrecord(&pcb->so->so_rcv.sb, copy);
 				sorwakeup(pcb->so);
@@ -2592,12 +2592,12 @@ ng_btsocket_l2cap_send2(ng_btsocket_l2cap_pcb_p pcb)
 	if (pcb->so->so_snd.sb.sb_cc == 0)
 		return (EINVAL); /* XXX */
 
-	m = m_dup(pcb->so->so_snd.sb.sb_mb, MB_DONTWAIT);
+	m = m_dup(pcb->so->so_snd.sb.sb_mb, M_NOWAIT);
 	if (m == NULL)
 		return (ENOBUFS);
 
 	/* Create L2CA packet header */
-	M_PREPEND(m, sizeof(*hdr), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(*hdr), M_NOWAIT);
 	if (m != NULL)
 		if (m->m_len < sizeof(*hdr))
 			m = m_pullup(m, sizeof(*hdr));
diff --git a/sys/netgraph7/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph7/bluetooth/socket/ng_btsocket_rfcomm.c
index 53658d6..b26b7ae 100644
--- a/sys/netgraph7/bluetooth/socket/ng_btsocket_rfcomm.c
+++ b/sys/netgraph7/bluetooth/socket/ng_btsocket_rfcomm.c
@@ -3077,7 +3077,7 @@ ng_btsocket_rfcomm_send_command(ng_btsocket_rfcomm_session_p s,
 		/* NOT REACHED */
 	}
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return (ENOBUFS);
 
@@ -3108,14 +3108,14 @@ ng_btsocket_rfcomm_send_uih(ng_btsocket_rfcomm_session_p s, u_int8_t address,
 
 	KKASSERT(lockowned(&s->session_lock) != 0);
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		NG_FREE_M(data);
 		return (ENOBUFS);
 	}
 	m->m_pkthdr.len = m->m_len = sizeof(*hdr);
 
-	MGET(mcrc, MB_DONTWAIT, MT_DATA);
+	MGET(mcrc, M_NOWAIT, MT_DATA);
 	if (mcrc == NULL) {
 		NG_FREE_M(data);
 		return (ENOBUFS);
@@ -3182,7 +3182,7 @@ ng_btsocket_rfcomm_send_msc(ng_btsocket_rfcomm_pcb_p pcb)
 	KKASSERT(lockowned(&pcb->session->session_lock) != 0);
 	KKASSERT(lockowned(&pcb->pcb_lock) != 0);
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return (ENOBUFS);
 
@@ -3220,7 +3220,7 @@ ng_btsocket_rfcomm_send_pn(ng_btsocket_rfcomm_pcb_p pcb)
 	KKASSERT(lockowned(&pcb->session->session_lock) != 0);
 	KKASSERT(lockowned(&pcb->pcb_lock) != 0);
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL)
 		return (ENOBUFS);
 
@@ -3592,7 +3592,7 @@ ng_btsocket_rfcomm_prepare_packet(struct sockbuf *sb, int length)
 	struct mbuf	*top = NULL, *m = NULL, *n = NULL, *nextpkt = NULL;
 	int		 mlen, noff, len;
 
-	MGETHDR(top, MB_DONTWAIT, MT_DATA);
+	MGETHDR(top, M_NOWAIT, MT_DATA);
 	if (top == NULL)
 		return (NULL);
 
@@ -3616,7 +3616,7 @@ ng_btsocket_rfcomm_prepare_packet(struct sockbuf *sb, int length)
 		length -= len;
 
 		if (length > 0 && m->m_len == mlen) {
-			MGET(m->m_next, MB_DONTWAIT, MT_DATA);
+			MGET(m->m_next, M_NOWAIT, MT_DATA);
 			if (m->m_next == NULL) {
 				NG_FREE_M(top);
 				return (NULL);
diff --git a/sys/netgraph7/bridge/ng_bridge.c b/sys/netgraph7/bridge/ng_bridge.c
index 93a0123..4774407 100644
--- a/sys/netgraph7/bridge/ng_bridge.c
+++ b/sys/netgraph7/bridge/ng_bridge.c
@@ -709,7 +709,7 @@ ng_bridge_rcvdata(hook_p hook, item_p item)
 			 * It's usable link but not the reserved (first) one.
 			 * Copy mbuf info for sending.
 			 */
-			m2 = m_dup(m, MB_DONTWAIT);	/* XXX m_copypacket() */
+			m2 = m_dup(m, M_NOWAIT);	/* XXX m_copypacket() */
 			if (m2 == NULL) {
 				link->stats.memoryFailures++;
 				NG_FREE_ITEM(item);
diff --git a/sys/netgraph7/cisco/ng_cisco.c b/sys/netgraph7/cisco/ng_cisco.c
index 848422b..1e023fc 100644
--- a/sys/netgraph7/cisco/ng_cisco.c
+++ b/sys/netgraph7/cisco/ng_cisco.c
@@ -352,7 +352,7 @@ cisco_rcvdata(hook_p hook, item_p item)
 	/* 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, MB_DONTWAIT);
+	M_PREPEND(m, CISCO_HEADER_LEN, M_NOWAIT);
 	if (!m) {
 		error = ENOBUFS;
 		goto out;
@@ -593,7 +593,7 @@ cisco_send(sc_p sc, int type, long par1, long par2)
 
 	getmicrouptime(&time);
 
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (!m)
 		return (ENOBUFS);
 
diff --git a/sys/netgraph7/frame_relay/ng_frame_relay.c b/sys/netgraph7/frame_relay/ng_frame_relay.c
index 2c22815..fa845a8 100644
--- a/sys/netgraph7/frame_relay/ng_frame_relay.c
+++ b/sys/netgraph7/frame_relay/ng_frame_relay.c
@@ -38,7 +38,6 @@
  * Author: Julian Elischer <julian@freebsd.org>
  *
  * $FreeBSD: src/sys/netgraph/ng_frame_relay.c,v 1.25 2006/01/14 21:49:31 glebius Exp $
- * $DragonFly: src/sys/netgraph7/ng_frame_relay.c,v 1.2 2008/06/26 23:05:35 dillon Exp $
  * $Whistle: ng_frame_relay.c,v 1.20 1999/11/01 09:24:51 julian Exp $
  */
 
@@ -363,7 +362,7 @@ ngfrm_rcvdata(hook_p hook, item_p item)
 	alen = sc->addrlen;
 	if (alen == 0)
 		alen = 2;	/* default value for transmit */
-	M_PREPEND(m, alen, MB_DONTWAIT);
+	M_PREPEND(m, alen, M_NOWAIT);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto bad;
diff --git a/sys/netgraph7/hub/ng_hub.c b/sys/netgraph7/hub/ng_hub.c
index 254f442..3cce473 100644
--- a/sys/netgraph7/hub/ng_hub.c
+++ b/sys/netgraph7/hub/ng_hub.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netgraph/ng_hub.c,v 1.3 2004/06/26 22:24:16 julian Exp $
- * $DragonFly: src/sys/netgraph7/ng_hub.c,v 1.2 2008/06/26 23:05:35 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -77,7 +76,7 @@ ng_hub_rcvdata(hook_p hook, item_p item)
 		if (--nhooks == 1)
 			NG_FWD_ITEM_HOOK(error, item, hook2);
 		else {
-			if ((m2 = m_dup(m, MB_DONTWAIT)) == NULL) {
+			if ((m2 = m_dup(m, M_NOWAIT)) == NULL) {
 				NG_FREE_ITEM(item);
 				return (ENOBUFS);
 			}
diff --git a/sys/netgraph7/iface/ng_iface.c b/sys/netgraph7/iface/ng_iface.c
index 99ec663..5744678 100644
--- a/sys/netgraph7/iface/ng_iface.c
+++ b/sys/netgraph7/iface/ng_iface.c
@@ -434,7 +434,7 @@ ng_iface_output(struct ifnet *ifp, struct mbuf *m,
 	ng_iface_bpftap(ifp, m, dst->sa_family);
 
 	if (ifq_is_enabled(&ifp->if_snd)) {
-		M_PREPEND(m, sizeof(sa_family_t), MB_DONTWAIT);
+		M_PREPEND(m, sizeof(sa_family_t), M_NOWAIT);
 		if (m == NULL) {
 			IFNET_STAT_INC(ifp, oerrors, 1);
 			return (ENOBUFS);
diff --git a/sys/netgraph7/ksocket/ng_ksocket.c b/sys/netgraph7/ksocket/ng_ksocket.c
index abb7b9f..886a124 100644
--- a/sys/netgraph7/ksocket/ng_ksocket.c
+++ b/sys/netgraph7/ksocket/ng_ksocket.c
@@ -1111,7 +1111,7 @@ ng_ksocket_incoming2(node_p node, hook_p hook, void *arg1, int arg2)
 
 			stag = (struct sa_tag *)m_tag_alloc(NGM_KSOCKET_COOKIE,
 			    NG_KSOCKET_TAG_SOCKADDR, sizeof(ng_ID_t) +
-			    sa->sa_len, MB_DONTWAIT);
+			    sa->sa_len, M_NOWAIT);
 			if (stag == NULL) {
 				kfree(sa, M_SONAME);
 				goto sendit;
@@ -1133,7 +1133,7 @@ sendit:		/* Forward data with optional peer sockaddr as packet tag */
 	if (so->so_state & SS_CANTRCVMORE && !(priv->flags & KSF_EOFSEEN)) {
 		struct mbuf *m;
 
-		MGETHDR(m, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m != NULL) {
 			m->m_len = m->m_pkthdr.len = 0;
 			NG_SEND_DATA_ONLY(error, priv->hook, m);
diff --git a/sys/netgraph7/l2tp/ng_l2tp.c b/sys/netgraph7/l2tp/ng_l2tp.c
index 3523d67..b9ddcb0 100644
--- a/sys/netgraph7/l2tp/ng_l2tp.c
+++ b/sys/netgraph7/l2tp/ng_l2tp.c
@@ -37,7 +37,6 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $FreeBSD: src/sys/netgraph/ng_l2tp.c,v 1.25 2008/03/16 21:33:12 mav Exp $
- * $DragonFly: src/sys/netgraph7/ng_l2tp.c,v 1.2 2008/06/26 23:05:35 dillon Exp $
  */
 
 /*
@@ -959,7 +958,7 @@ ng_l2tp_rcvdata_lower(hook_p h, item_p item)
 		mtx_unlock(&seq->mtx);
 
 		/* Prepend session ID to packet. */
-		M_PREPEND(m, 2, MB_DONTWAIT);
+		M_PREPEND(m, 2, M_NOWAIT);
 		if (m == NULL) {
 			seq->inproc = 0;
 			priv->stats.memoryFailures++;
@@ -1095,7 +1094,7 @@ ng_l2tp_rcvdata_ctrl(hook_p hook, item_p item)
 	mtx_unlock(&seq->mtx);
 
 	/* Copy packet */
-	if ((m = L2TP_COPY_MBUF(m, MB_DONTWAIT)) == NULL) {
+	if ((m = L2TP_COPY_MBUF(m, M_NOWAIT)) == NULL) {
 		priv->stats.memoryFailures++;
 		ERROUT(ENOBUFS);
 	}
@@ -1145,7 +1144,7 @@ ng_l2tp_rcvdata(hook_p hook, item_p item)
 	M_PREPEND(m, 6
 	    + (2 * (hpriv->conf.include_length != 0))
 	    + (4 * (hpriv->conf.enable_dseq != 0)),
-	    MB_DONTWAIT);
+	    M_NOWAIT);
 	if (m == NULL) {
 		priv->stats.memoryFailures++;
 		NG_FREE_ITEM(item);
@@ -1422,7 +1421,7 @@ ng_l2tp_seq_recv_nr(priv_p priv, u_int16_t nr)
 	 */
 	for (i = 0; i < j; i++) {
 		struct mbuf 	*m;
-		if ((m = L2TP_COPY_MBUF(xwin[i], MB_DONTWAIT)) == NULL)
+		if ((m = L2TP_COPY_MBUF(xwin[i], M_NOWAIT)) == NULL)
 			priv->stats.memoryFailures++;
 		else
 			ng_l2tp_xmit_ctrl(priv, m, ns);
@@ -1498,7 +1497,7 @@ ng_l2tp_seq_rack_timeout(node_p node, hook_p hook, void *arg1, int arg2)
 	seq->acks = 0;
 
 	/* Retransmit oldest unack'd packet */
-	if ((m = L2TP_COPY_MBUF(seq->xwin[0], MB_DONTWAIT)) == NULL)
+	if ((m = L2TP_COPY_MBUF(seq->xwin[0], M_NOWAIT)) == NULL)
 		priv->stats.memoryFailures++;
 	else
 		ng_l2tp_xmit_ctrl(priv, m, seq->ns++);
@@ -1536,7 +1535,7 @@ ng_l2tp_xmit_ctrl(priv_p priv, struct mbuf *m, u_int16_t ns)
 	if (m == NULL) {
 
 		/* Create a new mbuf for ZLB packet */
-		MGETHDR(m, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			return (ENOBUFS);
@@ -1555,7 +1554,7 @@ ng_l2tp_xmit_ctrl(priv_p priv, struct mbuf *m, u_int16_t ns)
 		m_adj(m, 2);
 
 		/* Make room for L2TP header */
-		M_PREPEND(m, 12, MB_DONTWAIT);
+		M_PREPEND(m, 12, M_NOWAIT);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			return (ENOBUFS);
diff --git a/sys/netgraph7/lmi/ng_lmi.c b/sys/netgraph7/lmi/ng_lmi.c
index ae6d99e..e0d7af5 100644
--- a/sys/netgraph7/lmi/ng_lmi.c
+++ b/sys/netgraph7/lmi/ng_lmi.c
@@ -319,7 +319,7 @@ nglmi_inquire(sc_p sc, int full)
 
 	if (sc->lmi_channel == NULL)
 		return;
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		log(LOG_ERR, "nglmi: unable to start up LMI processing\n");
 		return;
@@ -330,7 +330,7 @@ nglmi_inquire(sc_p sc, int full)
 	 * that device driver would put it in the beginning of queue */
 
 	ptag = (struct ng_tag_prio *)m_tag_alloc(NGM_GENERIC_COOKIE, NG_TAG_PRIO,
-	    (sizeof(struct ng_tag_prio) - sizeof(struct m_tag)), MB_DONTWAIT);
+	    (sizeof(struct ng_tag_prio) - sizeof(struct m_tag)), M_NOWAIT);
 	if (ptag != NULL) {	/* if it failed, well, it was optional anyhow */
 		ptag->priority = NG_PRIO_LINKSTATE;
 		ptag->discardability = -1;
diff --git a/sys/netgraph7/mppc/ng_mppc.c b/sys/netgraph7/mppc/ng_mppc.c
index c152e5a..d57a23e 100644
--- a/sys/netgraph7/mppc/ng_mppc.c
+++ b/sys/netgraph7/mppc/ng_mppc.c
@@ -39,7 +39,6 @@
  *
  * $Whistle: ng_mppc.c,v 1.4 1999/11/25 00:10:12 archie Exp $
  * $FreeBSD: src/sys/netgraph/ng_mppc.c,v 1.31 2007/05/18 15:28:01 mav Exp $
- * $DragonFly: src/sys/netgraph7/ng_mppc.c,v 1.2 2008/06/26 23:05:35 dillon Exp $
  */
 
 /*
@@ -564,7 +563,7 @@ ng_mppc_compress(node_p node, struct mbuf **datap)
 		}
 
 		/* We must own the mbuf chain exclusively to modify it. */
-		m = m_unshare(m, MB_DONTWAIT);
+		m = m_unshare(m, M_NOWAIT);
 		if (m == NULL)
 			return (ENOMEM);
 
@@ -582,7 +581,7 @@ ng_mppc_compress(node_p node, struct mbuf **datap)
 	MPPC_CCOUNT_INC(d->cc);
 
 	/* Install header */
-	M_PREPEND(m, MPPC_HDRLEN, MB_DONTWAIT);
+	M_PREPEND(m, MPPC_HDRLEN, M_NOWAIT);
 	if (m != NULL)
 		*(mtod(m, uint16_t *)) = htons(header);
 
@@ -683,7 +682,7 @@ ng_mppc_decompress(node_p node, struct mbuf **datap)
 		}
 
 		/* We must own the mbuf chain exclusively to modify it. */
-		m = m_unshare(m, MB_DONTWAIT);
+		m = m_unshare(m, M_NOWAIT);
 		if (m == NULL)
 			return (ENOMEM);
 
diff --git a/sys/netgraph7/netflow/netflow.c b/sys/netgraph7/netflow/netflow.c
index a0aa4dc..aab37ec 100644
--- a/sys/netgraph7/netflow/netflow.c
+++ b/sys/netgraph7/netflow/netflow.c
@@ -156,7 +156,7 @@ get_export_dgram(priv_p priv)
 		struct netflow_v5_export_dgram *dgram;
 		struct mbuf *m;
 
-		m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (m == NULL)
 			return (NULL);
 		item = ng_package_data(m, NG_NOFLAGS);
diff --git a/sys/netgraph7/ng_device.c b/sys/netgraph7/ng_device.c
index a4a292c..541e117 100644
--- a/sys/netgraph7/ng_device.c
+++ b/sys/netgraph7/ng_device.c
@@ -463,7 +463,7 @@ ngdwrite(struct cdev *dev, struct uio *uio, int flag)
 	if (uio->uio_resid > IP_MAXPACKET)
 		return (EIO);
 
-	if ((m = m_uiotombuf(uio, MB_DONTWAIT, 0, 0, M_PKTHDR)) == NULL)
+	if ((m = m_uiotombuf(uio, M_NOWAIT, 0, 0, M_PKTHDR)) == NULL)
 		return (ENOBUFS);
 
 	NG_SEND_DATA_ONLY(error, priv->hook, m);
diff --git a/sys/netgraph7/ng_gif.c b/sys/netgraph7/ng_gif.c
index 1d32e25..e15d16d 100644
--- a/sys/netgraph7/ng_gif.c
+++ b/sys/netgraph7/ng_gif.c
@@ -63,7 +63,6 @@
  * OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netgraph/ng_gif.c,v 1.19 2005/06/10 16:49:21 brooks Exp $
- * $DragonFly: src/sys/netgraph7/ng_gif.c,v 1.2 2008/06/26 23:05:35 dillon Exp $
  */
 
 /*
@@ -311,7 +310,7 @@ ng_gif_glue_af(struct mbuf **mp, int af)
 	 * hopefully everything after that will not
 	 * need one. So let's just use M_PREPEND.
 	 */
-	M_PREPEND(m, sizeof (tmp_af), MB_DONTWAIT);
+	M_PREPEND(m, sizeof (tmp_af), M_NOWAIT);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto done;
diff --git a/sys/netgraph7/ng_gif_demux.c b/sys/netgraph7/ng_gif_demux.c
index 2541223..e37b92a 100644
--- a/sys/netgraph7/ng_gif_demux.c
+++ b/sys/netgraph7/ng_gif_demux.c
@@ -343,7 +343,7 @@ ng_gif_demux_rcvdata(hook_p hook, item_p item)
 		 * Add address family header and set the output hook.
 		 */
 		iffam = get_iffam_from_hook(priv, hook);
-		M_PREPEND(m, sizeof (iffam->family), MB_DONTWAIT);
+		M_PREPEND(m, sizeof (iffam->family), M_NOWAIT);
 		if (m == NULL) {
 			NG_FREE_M(m);
 			NG_FREE_ITEM(item);
diff --git a/sys/netgraph7/ng_ipfw.c b/sys/netgraph7/ng_ipfw.c
index 08bc768..a9cd5c9 100644
--- a/sys/netgraph7/ng_ipfw.c
+++ b/sys/netgraph7/ng_ipfw.c
@@ -287,7 +287,7 @@ ng_ipfw_input(struct mbuf **m0, int dir, struct ip_fw_args *fwa, int tee)
 		*m0 = NULL;	/* it belongs now to netgraph */
 
 		if ((ngit = (struct ng_ipfw_tag *)m_tag_alloc(NGM_IPFW_COOKIE,
-		    0, TAGSIZ, MB_DONTWAIT)) == NULL) {
+		    0, TAGSIZ, M_NOWAIT)) == NULL) {
 			m_freem(m);
 			return (ENOMEM);
 		}
@@ -297,7 +297,7 @@ ng_ipfw_input(struct mbuf **m0, int dir, struct ip_fw_args *fwa, int tee)
 		m_tag_prepend(m, &ngit->mt);
 
 	} else
-		if ((m = m_dup(*m0, MB_DONTWAIT)) == NULL)
+		if ((m = m_dup(*m0, M_NOWAIT)) == NULL)
 			return (ENOMEM);	/* which is ignored */
 
 	if (m->m_len < sizeof(struct ip) &&
diff --git a/sys/netgraph7/ng_source.c b/sys/netgraph7/ng_source.c
index 0af2a64..fd76499 100644
--- a/sys/netgraph7/ng_source.c
+++ b/sys/netgraph7/ng_source.c
@@ -878,9 +878,9 @@ ng_source_dup_mod(sc_p sc, struct mbuf *m0, struct mbuf **m_ptr)
 
 	/* Duplicate the packet. */
 	if (modify)
-		m = m_dup(m0, MB_DONTWAIT);
+		m = m_dup(m0, M_NOWAIT);
 	else
-		m = m_copypacket(m0, MB_DONTWAIT);
+		m = m_copypacket(m0, M_NOWAIT);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto done;
diff --git a/sys/netgraph7/ng_tag.c b/sys/netgraph7/ng_tag.c
index 3413e76..432ad48 100644
--- a/sys/netgraph7/ng_tag.c
+++ b/sys/netgraph7/ng_tag.c
@@ -28,7 +28,6 @@
  * (ng_bpf by Archie Cobbs <archie@freebsd.org>)
  *
  * $FreeBSD: src/sys/netgraph/ng_tag.c,v 1.1 2006/06/27 12:45:28 glebius Exp $
- * $DragonFly: src/sys/netgraph7/ng_tag.c,v 1.2 2008/06/26 23:05:35 dillon Exp $
  */
 
 /*
@@ -573,7 +572,7 @@ ng_tag_rcvdata(hook_p hook, item_p item)
 	tag_len = dhip->out_tag_len;
 	
 	if ((cookie != 0) || (type != 0)) {
-		tag = m_tag_alloc(cookie, type, tag_len, MB_DONTWAIT);
+		tag = m_tag_alloc(cookie, type, tag_len, M_NOWAIT);
 		/* XXX may be free the mbuf if tag allocation failed? */
 		if (tag != NULL) {
 			if (tag_len != 0) {
diff --git a/sys/netgraph7/ng_vlan.c b/sys/netgraph7/ng_vlan.c
index 506b519..a88d4ca 100644
--- a/sys/netgraph7/ng_vlan.c
+++ b/sys/netgraph7/ng_vlan.c
@@ -410,7 +410,7 @@ ng_vlan_rcvdata(hook_p hook, item_p item)
 				NG_FREE_M(m);
 				return (EOPNOTSUPP);
 			}
-			M_PREPEND(m, ETHER_VLAN_ENCAP_LEN, MB_DONTWAIT);
+			M_PREPEND(m, ETHER_VLAN_ENCAP_LEN, M_NOWAIT);
 			/* M_PREPEND takes care of m_len and m_pkthdr.len. */
 			if (m == NULL || (m->m_len < sizeof(*evl) &&
 			    (m = m_pullup(m, sizeof(*evl))) == NULL)) {
diff --git a/sys/netgraph7/one2many/ng_one2many.c b/sys/netgraph7/one2many/ng_one2many.c
index 3ab57ff..1aed6e7 100644
--- a/sys/netgraph7/one2many/ng_one2many.c
+++ b/sys/netgraph7/one2many/ng_one2many.c
@@ -38,7 +38,6 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $FreeBSD: src/sys/netgraph/ng_one2many.c,v 1.21 2005/03/11 10:29:38 glebius Exp $
- * $DragonFly: src/sys/netgraph7/ng_one2many.c,v 1.2 2008/06/26 23:05:35 dillon Exp $
  */
 
 /*
@@ -462,7 +461,7 @@ ng_one2many_rcvdata(hook_p hook, item_p item)
 				struct ng_one2many_link *mdst;
 
 				mdst = &priv->many[priv->activeMany[i]];
-				m2 = m_dup(m, MB_DONTWAIT);        /* XXX m_copypacket() */
+				m2 = m_dup(m, M_NOWAIT);        /* XXX m_copypacket() */
 				if (m2 == NULL) {
 					mdst->stats.memoryFailures++;
 					NG_FREE_ITEM(item);
diff --git a/sys/netgraph7/ppp/ng_ppp.c b/sys/netgraph7/ppp/ng_ppp.c
index 8a8b84e..c361e5c 100644
--- a/sys/netgraph7/ppp/ng_ppp.c
+++ b/sys/netgraph7/ppp/ng_ppp.c
@@ -2080,7 +2080,7 @@ deliver:
 			/* Split off next fragment as "m2" */
 			m2 = m;
 			if (!lastFragment) {
-				struct mbuf *n = m_split(m, len, MB_DONTWAIT);
+				struct mbuf *n = m_split(m, len, M_NOWAIT);
 
 				if (n == NULL) {
 					NG_FREE_M(m);
@@ -2088,7 +2088,7 @@ deliver:
 						NG_FREE_ITEM(item);
 					return (ENOMEM);
 				}
-				m_tag_copy_chain(n, m, MB_DONTWAIT);
+				m_tag_copy_chain(n, m, M_NOWAIT);
 				m = n;
 			}
 
@@ -2432,7 +2432,7 @@ ng_ppp_cutproto(struct mbuf *m, uint16_t *proto)
 static struct mbuf *
 ng_ppp_prepend(struct mbuf *m, const void *buf, int len)
 {
-	M_PREPEND(m, len, MB_DONTWAIT);
+	M_PREPEND(m, len, M_NOWAIT);
 	if (m == NULL || (m->m_len < len && (m = m_pullup(m, len)) == NULL))
 		return (NULL);
 	bcopy(buf, mtod(m, uint8_t *), len);
diff --git a/sys/netgraph7/pppoe/ng_pppoe.c b/sys/netgraph7/pppoe/ng_pppoe.c
index 2b0be39..c92d377 100644
--- a/sys/netgraph7/pppoe/ng_pppoe.c
+++ b/sys/netgraph7/pppoe/ng_pppoe.c
@@ -459,7 +459,7 @@ pppoe_broadcast_padi(node_p node, struct mbuf *m0)
 	LIST_FOREACH(sp, &privp->listeners, sessions) {
 		struct mbuf *m;
 
-		m = m_dup(m0, MB_DONTWAIT);
+		m = m_dup(m0, M_NOWAIT);
 		if (m == NULL)
 			return (ENOMEM);
 		NG_SEND_DATA_ONLY(error, sp->hook, m);
@@ -802,7 +802,7 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasthook)
 			if (neg == NULL)
 				LEAVE(ENOMEM);
 
-			neg->m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+			neg->m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 			if (neg->m == NULL) {
 				kfree(neg, M_NETGRAPH_PPPOE);
 				LEAVE(ENOBUFS);
@@ -1079,7 +1079,7 @@ pppoe_start(sessp sp)
 	ng_callout(&neg->handle, node, hook, PPPOE_INITIAL_TIMEOUT * hz,
 	    pppoe_ticker, NULL, 0);
 	neg->timeout = PPPOE_INITIAL_TIMEOUT * 2;
-	m0 = m_copypacket(neg->m, MB_DONTWAIT);
+	m0 = m_copypacket(neg->m, M_NOWAIT);
 	NG_SEND_DATA_ONLY(error, privp->ethernet_hook, m0);
 }
 
@@ -1162,7 +1162,7 @@ ng_pppoe_rcvdata(hook_p hook, item_p item)
 		 * Bang in a pre-made header, and set the length up
 		 * to be correct. Then send it to the ethernet driver.
 		 */
-		M_PREPEND(m, sizeof(*wh), MB_DONTWAIT);
+		M_PREPEND(m, sizeof(*wh), M_NOWAIT);
 		if (m == NULL)
 			LEAVE(ENOBUFS);
 
@@ -1252,7 +1252,7 @@ ng_pppoe_rcvdata(hook_p hook, item_p item)
 		 */
 		ng_callout(&neg->handle, node, hook, PPPOE_OFFER_TIMEOUT * hz,
 		    pppoe_ticker, NULL, 0);
-		m0 = m_copypacket(sp->neg->m, MB_DONTWAIT);
+		m0 = m_copypacket(sp->neg->m, M_NOWAIT);
 		NG_FWD_NEW_DATA(error, item, privp->ethernet_hook, m0);
 		privp->packets_out++;
 		break;
@@ -1339,7 +1339,7 @@ ng_pppoe_rcvdata_ether(hook_p hook, item_p item)
 			 * Put it into a cluster.
 			 */
 			struct mbuf *n;
-			n = m_dup(m, MB_DONTWAIT);
+			n = m_dup(m, M_NOWAIT);
 			m_freem(m);
 			m = n;
 			if (m) {
@@ -1472,7 +1472,7 @@ ng_pppoe_rcvdata_ether(hook_p hook, item_p item)
 			    PPPOE_INITIAL_TIMEOUT * hz,
 			    pppoe_ticker, NULL, 0);
 			neg->timeout = PPPOE_INITIAL_TIMEOUT * 2;
-			m0 = m_copypacket(neg->m, MB_DONTWAIT);
+			m0 = m_copypacket(neg->m, M_NOWAIT);
 			NG_FWD_NEW_DATA(error, item, privp->ethernet_hook, m0);
 			break;
 		case	PADR_CODE:
@@ -1530,7 +1530,7 @@ ng_pppoe_rcvdata_ether(hook_p hook, item_p item)
 			sp->state = PPPOE_NEWCONNECTED;
 
 			/* Send the PADS without a timeout - we're now connected. */
-			m0 = m_copypacket(sp->neg->m, MB_DONTWAIT);
+			m0 = m_copypacket(sp->neg->m, M_NOWAIT);
 			NG_FWD_NEW_DATA(error, item, privp->ethernet_hook, m0);
 
 			/*
@@ -1736,7 +1736,7 @@ ng_pppoe_disconnect(hook_p hook)
 			struct mbuf *m;
 
 			/* Generate a packet of that type. */
-			MGETHDR(m, MB_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if (m == NULL)
 				log(LOG_NOTICE, "ng_pppoe[%x]: session out of "
 				    "mbufs\n", node->nd_ID);
@@ -1823,7 +1823,7 @@ pppoe_ticker(node_p node, hook_p hook, void *arg1, int arg2)
 	case	PPPOE_SINIT:
 	case	PPPOE_SREQ:
 		/* Timeouts on these produce resends. */
-		m0 = m_copypacket(sp->neg->m, MB_DONTWAIT);
+		m0 = m_copypacket(sp->neg->m, M_NOWAIT);
 		NG_SEND_DATA_ONLY( error, privp->ethernet_hook, m0);
 		ng_callout(&neg->handle, node, hook, neg->timeout * hz,
 		    pppoe_ticker, NULL, 0);
diff --git a/sys/netgraph7/pptpgre/ng_pptpgre.c b/sys/netgraph7/pptpgre/ng_pptpgre.c
index 0bf6f99..7c81f54 100644
--- a/sys/netgraph7/pptpgre/ng_pptpgre.c
+++ b/sys/netgraph7/pptpgre/ng_pptpgre.c
@@ -38,7 +38,6 @@
  * Author: Archie Cobbs <archie@freebsd.org>
  *
  * $FreeBSD: src/sys/netgraph/ng_pptpgre.c,v 1.42 2008/03/26 21:19:03 mav Exp $
- * $DragonFly: src/sys/netgraph7/ng_pptpgre.c,v 1.2 2008/06/26 23:05:35 dillon Exp $
  * $Whistle: ng_pptpgre.c,v 1.7 1999/12/08 00:10:06 archie Exp $
  */
 
@@ -600,7 +599,7 @@ ng_pptpgre_xmit(hpriv_p hpriv, item_p item)
 	/* Prepend GRE header to outgoing frame */
 	grelen = sizeof(*gre) + sizeof(u_int32_t) * (gre->hasSeq + gre->hasAck);
 	if (m == NULL) {
-		MGETHDR(m, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			priv->stats.memoryFailures++;
 			ERROUT(ENOBUFS);
@@ -608,7 +607,7 @@ ng_pptpgre_xmit(hpriv_p hpriv, item_p item)
 		m->m_len = m->m_pkthdr.len = grelen;
 		m->m_pkthdr.rcvif = NULL;
 	} else {
-		M_PREPEND(m, grelen, MB_DONTWAIT);
+		M_PREPEND(m, grelen, M_NOWAIT);
 		if (m == NULL || (m->m_len < grelen
 		    && (m = m_pullup(m, grelen)) == NULL)) {
 			priv->stats.memoryFailures++;
diff --git a/sys/netgraph7/rfc1490/ng_rfc1490.c b/sys/netgraph7/rfc1490/ng_rfc1490.c
index 723ac39..1e4b4d0 100644
--- a/sys/netgraph7/rfc1490/ng_rfc1490.c
+++ b/sys/netgraph7/rfc1490/ng_rfc1490.c
@@ -387,7 +387,7 @@ switch_on_etype:		etype = ntohs(*((const u_int16_t *)ptr));
 			break;
 		}
 	} else if (hook == priv->ppp) {
-		M_PREPEND(m, 2, MB_DONTWAIT);	/* Prepend PPP NLPID */
+		M_PREPEND(m, 2, M_NOWAIT);	/* Prepend PPP NLPID */
 		if (!m)
 			ERROUT(ENOBUFS);
 		mtod(m, u_char *)[0] = HDLC_UI;
@@ -396,7 +396,7 @@ switch_on_etype:		etype = ntohs(*((const u_int16_t *)ptr));
 	} else if (hook == priv->inet) {
 		switch (priv->enc->method) {
 		case NG_RFC1490_ENCAP_IETF_IP:
-			M_PREPEND(m, 2, MB_DONTWAIT);	/* Prepend IP NLPID */
+			M_PREPEND(m, 2, M_NOWAIT);	/* Prepend IP NLPID */
 			if (!m)
 				ERROUT(ENOBUFS);
 			mtod(m, u_char *)[0] = HDLC_UI;
@@ -408,7 +408,7 @@ switch_on_etype:		etype = ntohs(*((const u_int16_t *)ptr));
 			 *  HDLC_UI  PAD  NLIPID  OUI      PID
 			 *  03      00   80      00 00 00  08 00
 			 */
-			M_PREPEND(m, 8, MB_DONTWAIT);
+			M_PREPEND(m, 8, M_NOWAIT);
 			if (!m)
 				ERROUT(ENOBUFS);
 			mtod(m, u_char *)[0] = HDLC_UI;
@@ -419,7 +419,7 @@ switch_on_etype:		etype = ntohs(*((const u_int16_t *)ptr));
 			    = htons(ETHERTYPE_IP);  /* PID */
 			break;
 		case NG_RFC1490_ENCAP_CISCO:
-			M_PREPEND(m, 2, MB_DONTWAIT);	/* Prepend IP ethertype */
+			M_PREPEND(m, 2, M_NOWAIT);	/* Prepend IP ethertype */
 			if (!m)
 				ERROUT(ENOBUFS);
 			*((u_int16_t *)mtod(m, u_int16_t *)) = htons(ETHERTYPE_IP);
@@ -427,7 +427,7 @@ switch_on_etype:		etype = ntohs(*((const u_int16_t *)ptr));
 		}
 		NG_FWD_NEW_DATA(error, item, priv->downlink, m);
 	} else if (hook == priv->ethernet) {
-		M_PREPEND(m, 8, MB_DONTWAIT);	/* Prepend NLPID, OUI, PID */
+		M_PREPEND(m, 8, M_NOWAIT);	/* Prepend NLPID, OUI, PID */
 		if (!m)
 			ERROUT(ENOBUFS);
 		mtod(m, u_char *)[0] = HDLC_UI;
diff --git a/sys/netgraph7/tee/ng_tee.c b/sys/netgraph7/tee/ng_tee.c
index 9dba7d9..b2c0cd5 100644
--- a/sys/netgraph7/tee/ng_tee.c
+++ b/sys/netgraph7/tee/ng_tee.c
@@ -39,7 +39,6 @@
  * Author: Julian Elischer <julian@freebsd.org>
  *
  * $FreeBSD: src/sys/netgraph/ng_tee.c,v 1.35 2008/02/24 10:13:32 mav Exp $
- * $DragonFly: src/sys/netgraph7/ng_tee.c,v 1.2 2008/06/26 23:05:35 dillon Exp $
  * $Whistle: ng_tee.c,v 1.18 1999/11/01 09:24:52 julian Exp $
  */
 
@@ -309,7 +308,7 @@ ng_tee_rcvdata(hook_p hook, item_p item)
 		struct mbuf *m2;
 
 		/* Copy packet (failure will not stop the original)*/
-		m2 = m_dup(m, MB_DONTWAIT);
+		m2 = m_dup(m, M_NOWAIT);
 		if (m2) {
 			/* Deliver duplicate */
 			h = hinfo->dup;
diff --git a/sys/netgraph7/tty/ng_tty.c b/sys/netgraph7/tty/ng_tty.c
index 7da3b71..2b43582 100644
--- a/sys/netgraph7/tty/ng_tty.c
+++ b/sys/netgraph7/tty/ng_tty.c
@@ -376,7 +376,7 @@ ngt_input(int c, struct tty *tp)
 
 	/* Get a new header mbuf if we need one */
 	if (!(m = sc->m)) {
-		MGETHDR(m, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (!m) {
 			if (sc->flags & FLG_DEBUG)
 				log(LOG_ERR,
diff --git a/sys/netgraph7/vjc/ng_vjc.c b/sys/netgraph7/vjc/ng_vjc.c
index a16cc0c..72beafe 100644
--- a/sys/netgraph7/vjc/ng_vjc.c
+++ b/sys/netgraph7/vjc/ng_vjc.c
@@ -473,7 +473,7 @@ ng_vjc_rcvdata(hook_p hook, item_p item)
 		m_adj(m, vjlen);
 
 		/* Copy the reconstructed TCP/IP headers into a new mbuf */
-		MGETHDR(hm, MB_DONTWAIT, MT_DATA);
+		MGETHDR(hm, M_NOWAIT, MT_DATA);
 		if (hm == NULL) {
 			priv->slc.sls_errorin++;
 			NG_FREE_M(m);
@@ -483,7 +483,7 @@ ng_vjc_rcvdata(hook_p hook, item_p item)
 		hm->m_len = 0;
 		hm->m_pkthdr.rcvif = NULL;
 		if (hlen > MHLEN) {		/* unlikely, but can happen */
-			MCLGET(hm, MB_DONTWAIT);
+			MCLGET(hm, M_NOWAIT);
 			if ((hm->m_flags & M_EXT) == 0) {
 				m_freem(hm);
 				priv->slc.sls_errorin++;
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index f5c4367..260cbf3 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -358,7 +358,7 @@ arpreq_alloc(struct ifnet *ifp, const struct in_addr *sip,
 	struct arphdr *ah;
 	u_short ar_hrd;
 
-	if ((m = m_gethdr(MB_DONTWAIT, MT_DATA)) == NULL)
+	if ((m = m_gethdr(M_NOWAIT, MT_DATA)) == NULL)
 		return NULL;
 	m->m_pkthdr.rcvif = NULL;
 
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index d41a41e..1987984 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -110,7 +110,7 @@ igmp_init(void)
 	/*
 	 * Construct a Router Alert option to use in outgoing packets
 	 */
-	MGET(router_alert, MB_DONTWAIT, MT_DATA);
+	MGET(router_alert, M_NOWAIT, MT_DATA);
 	ra = mtod(router_alert, struct ipoption *);
 	ra->ipopt_dst.s_addr = 0;
 	ra->ipopt_list[0] = IPOPT_RA;	/* Router Alert Option */
@@ -485,7 +485,7 @@ igmp_sendpkt(struct in_multi *inm, int type, unsigned long addr)
 	struct ip *ip;
 	struct ip_moptions imo;
 
-	MGETHDR(m, MB_DONTWAIT, MT_HEADER);
+	MGETHDR(m, M_NOWAIT, MT_HEADER);
 	if (m == NULL)
 		return;
 
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index ce27fe5..be331df 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -1,6 +1,5 @@
 /*
  * $FreeBSD: src/sys/netinet/in_gif.c,v 1.5.2.11 2003/01/23 21:06:45 sam Exp $
- * $DragonFly: src/sys/netinet/in_gif.c,v 1.18 2008/10/27 02:56:30 sephe Exp $
  * $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 itojun Exp $
  */
 /*
@@ -174,7 +173,7 @@ in_gif_output(struct ifnet *ifp, int family, struct mbuf *m)
 		ip_ecn_ingress(ECN_NOCARE, &iphdr.ip_tos, &tos);
 
 	/* prepend new IP header */
-	M_PREPEND(m, sizeof(struct ip), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ip), M_NOWAIT);
 	if (m && m->m_len < sizeof(struct ip))
 		m = m_pullup(m, sizeof(struct ip));
 	if (m == NULL) {
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index a9efdf8..f2273bd 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1242,7 +1242,7 @@ carp_input(void *v, struct mbuf *m)
 		if ((sc->sc_if.if_flags & IFF_UP) == 0)
 			continue;
 
-		m0 = m_dup(m, MB_DONTWAIT);
+		m0 = m_dup(m, M_NOWAIT);
 		if (m0 == NULL)
 			continue;
 
@@ -1349,7 +1349,7 @@ carp_send_ad(struct carp_softc *sc)
 	if (sc->sc_ia != NULL) {
 		struct ip *ip;
 
-		MGETHDR(m, MB_DONTWAIT, MT_HEADER);
+		MGETHDR(m, M_NOWAIT, MT_HEADER);
 		if (m == NULL) {
 			IFNET_STAT_INC(cifp, oerrors, 1);
 			carpstats.carps_onomem++;
@@ -1418,7 +1418,7 @@ carp_send_ad(struct carp_softc *sc)
 	if (sc->sc_ia6) {
 		struct ip6_hdr *ip6;
 
-		MGETHDR(m, MB_DONTWAIT, MT_HEADER);
+		MGETHDR(m, M_NOWAIT, MT_HEADER);
 		if (m == NULL) {
 			IFNET_STAT_INC(cifp, oerrors, 1);
 			carpstats.carps_onomem++;
@@ -1664,7 +1664,7 @@ carp_macmatch6(void *v, struct mbuf *m, const struct in6_addr *taddr)
 				struct ifnet *ifp = &sc->sc_if;
 
 				mtag = m_tag_get(PACKET_TAG_CARP,
-				    sizeof(struct ifnet *), MB_DONTWAIT);
+				    sizeof(struct ifnet *), M_NOWAIT);
 				if (mtag == NULL) {
 					/* better a bit than nothing */
 					return (IF_LLADDR(ifp));
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index c7bc30d..d8a75c9 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -336,7 +336,7 @@ div_output(struct socket *so, struct mbuf *m,
 	 * with a 0 tag in mh_data is effectively untagged,
 	 * so we could optimize that case.
 	 */
-	mtag = m_tag_get(PACKET_TAG_IPFW_DIVERT, sizeof(*divinfo), MB_DONTWAIT);
+	mtag = m_tag_get(PACKET_TAG_IPFW_DIVERT, sizeof(*divinfo), M_NOWAIT);
 	if (mtag == NULL) {
 		error = ENOBUFS;
 		goto cantsend;
@@ -553,7 +553,7 @@ ip_divert_out(struct mbuf *m, int tee)
 
 	/* Clone packet if we're doing a 'tee' */
 	if (tee)
-		clone = m_dup(m, MB_DONTWAIT);
+		clone = m_dup(m, M_NOWAIT);
 
 	/*
 	 * XXX
@@ -652,7 +652,7 @@ ip_divert_in(struct mbuf *m, int tee)
 
 	/* Clone packet if we're doing a 'tee' */
 	if (tee)
-		clone = m_dup(m, MB_DONTWAIT);
+		clone = m_dup(m, M_NOWAIT);
 
 	/*
 	 * Restore packet header fields to original
diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c
index 6d1a404..0e6e979 100644
--- a/sys/netinet/ip_encap.c
+++ b/sys/netinet/ip_encap.c
@@ -463,7 +463,7 @@ encap_fillarg(struct mbuf *m, const struct encaptab *ep)
 {
 	struct m_tag *tag;
 
-	tag = m_tag_get(PACKET_TAG_ENCAP, sizeof(void *), MB_DONTWAIT);
+	tag = m_tag_get(PACKET_TAG_ENCAP, sizeof(void *), M_NOWAIT);
 	if (tag != NULL) {
 		*(void **)m_tag_data(tag) = ep->arg;
 		m_tag_prepend(m, tag);
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index 275b518..14e3e88 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -188,7 +188,7 @@ icmp_error(struct mbuf *n, int type, int code, n_long dest, int destmtu)
 	/*
 	 * First, formulate icmp message
 	 */
-	m = m_gethdr(MB_DONTWAIT, MT_HEADER);
+	m = m_gethdr(M_NOWAIT, MT_HEADER);
 	if (m == NULL)
 		goto freeit;
 	icmplen = min(oiplen + 8, oip->ip_len);
@@ -1065,7 +1065,7 @@ match:
 		 */
 		cp = (u_char *) (ip + 1);
 		if ((opts = ip_srcroute(m)) == NULL &&
-		    (opts = m_gethdr(MB_DONTWAIT, MT_HEADER))) {
+		    (opts = m_gethdr(M_NOWAIT, MT_HEADER))) {
 			opts->m_len = sizeof(struct in_addr);
 			mtod(opts, struct in_addr *)->s_addr = 0;
 		}
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index ee74815..99de021 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -380,7 +380,7 @@ ip_init(void)
 		/*
 		 * Preallocate mbuf template for forwarding
 		 */
-		MGETHDR(ipforward_mtemp[cpu], MB_WAIT, MT_DATA);
+		MGETHDR(ipforward_mtemp[cpu], M_WAITOK, MT_DATA);
 
 		/*
 		 * Initialize per-cpu ip fragments queues
@@ -1791,7 +1791,7 @@ save_rte(struct mbuf *m, u_char *option, struct in_addr dst)
 	struct ip_srcrt_opt *opt;
 	unsigned olen;
 
-	mtag = m_tag_get(PACKET_TAG_IPSRCRT, sizeof(*opt), MB_DONTWAIT);
+	mtag = m_tag_get(PACKET_TAG_IPSRCRT, sizeof(*opt), M_NOWAIT);
 	if (mtag == NULL)
 		return;
 	opt = m_tag_data(mtag);
@@ -1834,7 +1834,7 @@ ip_srcroute(struct mbuf *m0)
 
 	if (opt->ip_nhops == 0)
 		return (NULL);
-	m = m_get(MB_DONTWAIT, MT_HEADER);
+	m = m_get(M_NOWAIT, MT_HEADER);
 	if (m == NULL)
 		return (NULL);
 
@@ -1990,7 +1990,7 @@ ip_forward(struct mbuf *m, boolean_t using_srcrt, struct sockaddr_in *next_hop)
 		    m_tag_first(mtemp) == NULL,
 		    ("ip_forward invalid mtemp1"));
 
-		if (!m_dup_pkthdr(mtemp, m, MB_DONTWAIT)) {
+		if (!m_dup_pkthdr(mtemp, m, M_NOWAIT)) {
 			/*
 			 * It's probably ok if the pkthdr dup fails (because
 			 * the deep copy of the tag chain failed), but for now
@@ -2085,7 +2085,7 @@ ip_forward(struct mbuf *m, boolean_t using_srcrt, struct sockaddr_in *next_hop)
 	KASSERT((mtemp->m_flags & M_EXT) == 0 &&
 	    mtemp->m_data == mtemp->m_pktdat,
 	    ("ip_forward invalid mtemp2"));
-	mcopy = m_copym(mtemp, 0, mtemp->m_len, MB_DONTWAIT);
+	mcopy = m_copym(mtemp, 0, mtemp->m_len, M_NOWAIT);
 	if (mcopy == NULL)
 		goto done;
 
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index cac869e..d40ec9e 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -949,7 +949,7 @@ pass:
 			tmp = length = m->m_pkthdr.len;
 
 			while ((length -= mbuf_frag_size) >= 1) {
-				m1 = m_split(m, length, MB_DONTWAIT);
+				m1 = m_split(m, length, M_NOWAIT);
 				if (m1 == NULL)
 					break;
 				m2 = m;
@@ -1140,7 +1140,7 @@ smart_frag_failure:
 		struct mbuf *m;
 		int mhlen = sizeof(struct ip);
 
-		MGETHDR(m, MB_DONTWAIT, MT_HEADER);
+		MGETHDR(m, M_NOWAIT, MT_HEADER);
 		if (m == NULL) {
 			error = ENOBUFS;
 			ipstat.ips_odropped++;
@@ -1260,7 +1260,7 @@ ip_insertoptions(struct mbuf *m, struct mbuf *opt, int *phlen)
 	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, MB_DONTWAIT, MT_HEADER);
+		MGETHDR(n, M_NOWAIT, MT_HEADER);
 		if (n == NULL) {
 			*phlen = 0;
 			return (m);
@@ -1390,7 +1390,8 @@ ip_ctloutput(netmsg_t msg)
 				error = EMSGSIZE;
 				break;
 			}
-			MGET(m, sopt->sopt_td ? MB_WAIT : MB_DONTWAIT, MT_HEADER);
+			MGET(m, sopt->sopt_td ? M_WAITOK : M_NOWAIT,
+			     MT_HEADER);
 			if (m == NULL) {
 				error = ENOBUFS;
 				break;
@@ -2157,7 +2158,7 @@ ip_mloopback(struct ifnet *ifp, struct mbuf *m, struct sockaddr_in *dst,
 	struct ip *ip;
 	struct mbuf *copym;
 
-	copym = m_copypacket(m, MB_DONTWAIT);
+	copym = m_copypacket(m, M_NOWAIT);
 	if (copym != NULL && (copym->m_flags & M_EXT || copym->m_len < hlen))
 		copym = m_pullup(copym, hlen);
 	if (copym != NULL) {
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index a6d964c..3392711 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -175,7 +175,7 @@ rip_input(struct mbuf **mp, int *offp, int proto)
 		    inp->inp_faddr.s_addr != ip->ip_src.s_addr)
 			continue;
 		if (last) {
-			struct mbuf *n = m_copypacket(m, MB_DONTWAIT);
+			struct mbuf *n = m_copypacket(m, M_NOWAIT);
 
 #ifdef IPSEC
 			/* check AH/ESP integrity. */
@@ -285,7 +285,7 @@ rip_output(struct mbuf *m, struct socket *so, ...)
 			m_freem(m);
 			return(EMSGSIZE);
 		}
-		M_PREPEND(m, sizeof(struct ip), MB_WAIT);
+		M_PREPEND(m, sizeof(struct ip), M_WAITOK);
 		if (m == NULL)
 			return(ENOBUFS);
 		ip = mtod(m, struct ip *);
diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c
index 9c98506..ba37f63 100644
--- a/sys/netinet/sctp_asconf.c
+++ b/sys/netinet/sctp_asconf.c
@@ -136,7 +136,7 @@ sctp_asconf_success_response(uint32_t id)
 	struct mbuf *m_reply = NULL;
 	struct sctp_asconf_paramhdr *aph;
 
-	MGET(m_reply, MB_DONTWAIT, MT_DATA);
+	MGET(m_reply, M_NOWAIT, MT_DATA);
 	if (m_reply == NULL) {
 #ifdef SCTP_DEBUG
 		if (sctp_debug_on & SCTP_DEBUG_ASCONF1) {
@@ -164,7 +164,7 @@ sctp_asconf_error_response(uint32_t id, uint16_t cause, uint8_t *error_tlv,
 	struct sctp_error_cause *error;
 	uint8_t *tlv;
 
-	MGET(m_reply, MB_DONTWAIT, MT_DATA);
+	MGET(m_reply, M_NOWAIT, MT_DATA);
 	if (m_reply == NULL) {
 #ifdef SCTP_DEBUG
 		if (sctp_debug_on & SCTP_DEBUG_ASCONF1) {
@@ -645,7 +645,7 @@ sctp_handle_asconf(struct mbuf *m, unsigned int offset, struct sctp_asconf_chunk
 		sctp_m_freem(asoc->last_asconf_ack_sent);
 		asoc->last_asconf_ack_sent = NULL;
 	}
-	MGETHDR(m_ack, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m_ack, M_NOWAIT, MT_DATA);
 	if (m_ack == NULL) {
 #ifdef SCTP_DEBUG
 		if (sctp_debug_on & SCTP_DEBUG_ASCONF1) {
@@ -2246,7 +2246,7 @@ sctp_compose_asconf(struct sctp_tcb *stcb)
 	 * address on the fly
 	 */
 	m_asconf_chk = NULL;
-	MGETHDR(m_asconf_chk, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m_asconf_chk, M_NOWAIT, MT_DATA);
 	if (m_asconf_chk == NULL) {
 		/* no mbuf's */
 #ifdef SCTP_DEBUG
@@ -2256,7 +2256,7 @@ sctp_compose_asconf(struct sctp_tcb *stcb)
 		return (NULL);
 	}
 	m_asconf = NULL;
-	MGETHDR(m_asconf, MB_DONTWAIT, MT_HEADER);
+	MGETHDR(m_asconf, M_NOWAIT, MT_HEADER);
 	if (m_asconf == NULL) {
 		/* no mbuf's */
 #ifdef SCTP_DEBUG
@@ -2266,7 +2266,7 @@ sctp_compose_asconf(struct sctp_tcb *stcb)
 		sctp_m_freem(m_asconf_chk);
 		return (NULL);
 	}
-	MCLGET(m_asconf, MB_DONTWAIT);
+	MCLGET(m_asconf, M_NOWAIT);
 	if ((m_asconf->m_flags & M_EXT) != M_EXT) {
 		/* failed to get cluster buffer */
 #ifdef SCTP_DEBUG
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index bd8dbda..c6443bb 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -202,7 +202,7 @@ sctp_build_ctl_nchunk(struct sctp_tcb *stcb, uint32_t tsn, uint32_t ppid,
 		return (NULL);
 	}
 
-	MGETHDR(ret, MB_DONTWAIT, MT_CONTROL);
+	MGETHDR(ret, M_NOWAIT, MT_CONTROL);
 	if (ret == NULL) {
 		/* No space */
 		return (ret);
@@ -252,7 +252,7 @@ sctp_build_ctl(struct sctp_tcb *stcb, struct sctp_tmit_chunk *chk)
 		/* user does not want the sndrcv ctl */
 		return (NULL);
 	}
-	MGET(ret, MB_DONTWAIT, MT_CONTROL);
+	MGET(ret, M_NOWAIT, MT_CONTROL);
 	if (ret == NULL) {
 		/* No space */
 		return (ret);
@@ -394,7 +394,7 @@ sctp_deliver_data(struct sctp_tcb *stcb, struct sctp_association *asoc,
 #endif
 	/* XXX need to append PKTHDR to the socket buffer first */
 	if ((chk->data->m_flags & M_PKTHDR) == 0) {
-		MGETHDR(m, MB_DONTWAIT, MT_DATA);
+		MGETHDR(m, M_NOWAIT, MT_DATA);
 		if (m == NULL) {
 			/* no room! */
 			if (hold_locks == 0)
@@ -620,7 +620,7 @@ sctp_service_reassembly(struct sctp_tcb *stcb, struct sctp_association *asoc, in
 		}
 
 		if ((chk->data->m_flags & M_PKTHDR) == 0) {
-			MGETHDR(m, MB_DONTWAIT, MT_DATA);
+			MGETHDR(m, M_NOWAIT, MT_DATA);
 			if (m == NULL) {
 				/* no room! */
 				if (hold_locks == 0)
@@ -861,7 +861,7 @@ sctp_queue_data_to_stream(struct sctp_tcb *stcb, struct sctp_association *asoc,
 		 * association destruction
 		 */
 		TAILQ_INSERT_HEAD(&strm->inqueue, chk, sctp_next);
-		MGET(oper, MB_DONTWAIT, MT_DATA);
+		MGET(oper, M_NOWAIT, MT_DATA);
 		if (oper) {
 			struct sctp_paramhdr *ph;
 			u_int32_t *ippp;
@@ -1091,7 +1091,7 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc,
 					kprintf("Gak, Evil plot, its not first, no fragmented delivery in progress\n");
 				}
 #endif
-				MGET(oper, MB_DONTWAIT, MT_DATA);
+				MGET(oper, M_NOWAIT, MT_DATA);
 				if (oper) {
 					struct sctp_paramhdr *ph;
 					u_int32_t *ippp;
@@ -1121,7 +1121,7 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc,
 					kprintf("Gak, Evil plot, it IS a first and fragmented delivery in progress\n");
 				}
 #endif
-				MGET(oper, MB_DONTWAIT, MT_DATA);
+				MGET(oper, M_NOWAIT, MT_DATA);
 				if (oper) {
 					struct sctp_paramhdr *ph;
 					u_int32_t *ippp;
@@ -1151,7 +1151,7 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc,
 						    asoc->str_of_pdapi);
 					}
 #endif
-					MGET(oper, MB_DONTWAIT, MT_DATA);
+					MGET(oper, M_NOWAIT, MT_DATA);
 					if (oper) {
 						struct sctp_paramhdr *ph;
 						u_int32_t *ippp;
@@ -1182,7 +1182,7 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc,
 						    asoc->ssn_of_pdapi);
 					}
 #endif
-					MGET(oper, MB_DONTWAIT, MT_DATA);
+					MGET(oper, M_NOWAIT, MT_DATA);
 					if (oper) {
 						struct sctp_paramhdr *ph;
 						u_int32_t *ippp;
@@ -1280,7 +1280,7 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc,
 						kprintf("Gak, Evil plot, it's a FIRST!\n");
 					}
 #endif
-					MGET(oper, MB_DONTWAIT, MT_DATA);
+					MGET(oper, M_NOWAIT, MT_DATA);
 					if (oper) {
 						struct sctp_paramhdr *ph;
 						u_int32_t *ippp;
@@ -1316,7 +1316,7 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc,
 						    prev->rec.data.stream_number);
 					}
 #endif
-					MGET(oper, MB_DONTWAIT, MT_DATA);
+					MGET(oper, M_NOWAIT, MT_DATA);
 					if (oper) {
 						struct sctp_paramhdr *ph;
 						u_int32_t *ippp;
@@ -1354,7 +1354,7 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc,
 						    prev->rec.data.stream_seq);
 					}
 #endif
-					MGET(oper, MB_DONTWAIT, MT_DATA);
+					MGET(oper, M_NOWAIT, MT_DATA);
 					if (oper) {
 						struct sctp_paramhdr *ph;
 						u_int32_t *ippp;
@@ -1388,7 +1388,7 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc,
 						kprintf("Prev check - Gak, evil plot, its not FIRST and it must be!\n");
 					}
 #endif
-					MGET(oper, MB_DONTWAIT, MT_DATA);
+					MGET(oper, M_NOWAIT, MT_DATA);
 					if (oper) {
 						struct sctp_paramhdr *ph;
 						u_int32_t *ippp;
@@ -1433,7 +1433,7 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc,
 						kprintf("Gak, Evil plot, its not a last!\n");
 					}
 #endif
-					MGET(oper, MB_DONTWAIT, MT_DATA);
+					MGET(oper, M_NOWAIT, MT_DATA);
 					if (oper) {
 						struct sctp_paramhdr *ph;
 						u_int32_t *ippp;
@@ -1470,7 +1470,7 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc,
 						kprintf("Gak, Evil plot, new prev chunk is a LAST\n");
 					}
 #endif
-					MGET(oper, MB_DONTWAIT, MT_DATA);
+					MGET(oper, M_NOWAIT, MT_DATA);
 					if (oper) {
 						struct sctp_paramhdr *ph;
 						u_int32_t *ippp;
@@ -1506,7 +1506,7 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc,
 						    next->rec.data.stream_number);
 					}
 #endif
-					MGET(oper, MB_DONTWAIT, MT_DATA);
+					MGET(oper, M_NOWAIT, MT_DATA);
 					if (oper) {
 						struct sctp_paramhdr *ph;
 						u_int32_t *ippp;
@@ -1544,7 +1544,7 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc,
 						    next->rec.data.stream_seq);
 					}
 #endif
-					MGET(oper, MB_DONTWAIT, MT_DATA);
+					MGET(oper, M_NOWAIT, MT_DATA);
 					if (oper) {
 						struct sctp_paramhdr *ph;
 						u_int32_t *ippp;
@@ -1815,7 +1815,7 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struct sctp_association *asoc,
 		struct sctp_paramhdr *phdr;
 		struct mbuf *mb;
 
-		MGETHDR(mb, MB_DONTWAIT, MT_DATA);
+		MGETHDR(mb, M_NOWAIT, MT_DATA);
 		if (mb != NULL) {
 			/* add some space up front so prepend will work well */
 			mb->m_data += sizeof(struct sctp_chunkhdr);
@@ -1867,7 +1867,7 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struct sctp_association *asoc,
 		 * throw it in the stream so it gets cleaned up in
 		 * association destruction
 		 */
-		MGET(oper, MB_DONTWAIT, MT_DATA);
+		MGET(oper, M_NOWAIT, MT_DATA);
 		if (oper) {
 			struct sctp_paramhdr *ph;
 			u_int32_t *ippp;
@@ -1891,7 +1891,7 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struct sctp_association *asoc,
 	if (last_chunk == 0) {
 		dmbuf = sctp_m_copym(*m,
 		    (offset + sizeof(struct sctp_data_chunk)),
-		    the_len, MB_DONTWAIT);
+		    the_len, M_NOWAIT);
 	} else {
 		/* We can steal the last chunk */
 		dmbuf = *m;
@@ -1939,7 +1939,7 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struct sctp_association *asoc,
 
 		if ((dmbuf->m_flags & M_PKTHDR) == 0) {
 			struct mbuf *tmp;
-			MGETHDR(tmp, MB_DONTWAIT, MT_DATA);
+			MGETHDR(tmp, M_NOWAIT, MT_DATA);
 			if (tmp == NULL) {
 
 				/* no room! */
@@ -2085,7 +2085,7 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struct sctp_association *asoc,
 			if (TAILQ_EMPTY(&asoc->reasmqueue) &&
 			    (estimate_tsn == chk->rec.data.TSN_seq)) {
 				/* Evil/Broke peer */
-				MGET(oper, MB_DONTWAIT, MT_DATA);
+				MGET(oper, M_NOWAIT, MT_DATA);
 				if (oper) {
 					struct sctp_paramhdr *ph;
 					u_int32_t *ippp;
@@ -2108,7 +2108,7 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struct sctp_association *asoc,
 				return (0);
 			} else {
 				if (sctp_does_chk_belong_to_reasm(asoc, chk)) {
-					MGET(oper, MB_DONTWAIT, MT_DATA);
+					MGET(oper, M_NOWAIT, MT_DATA);
 					if (oper) {
 						struct sctp_paramhdr *ph;
 						u_int32_t *ippp;
@@ -2142,7 +2142,7 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struct sctp_association *asoc,
 				 * our peer is broken or evil.
 				 */
 				if (sctp_does_chk_belong_to_reasm(asoc, chk)) {
-					MGET(oper, MB_DONTWAIT, MT_DATA);
+					MGET(oper, M_NOWAIT, MT_DATA);
 					if (oper) {
 						struct sctp_paramhdr *ph;
 						u_int32_t *ippp;
@@ -2566,10 +2566,10 @@ sctp_process_data(struct mbuf **mm, int iphlen, int *offset, int length,
 		/* we only handle mbufs that are singletons.. not chains */
 #ifdef __DragonFly__
 		if ((*mm)->m_flags & M_PKTHDR)
-			MGETHDR(m, MB_DONTWAIT, MT_HEADER);
+			MGETHDR(m, M_NOWAIT, MT_HEADER);
 		else
 #endif
-			MGET(m, MB_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 		if (m) {
 			/* ok lets see if we can copy the data up */
 			caddr_t *from, *to;
@@ -2626,7 +2626,7 @@ sctp_process_data(struct mbuf **mm, int iphlen, int *offset, int length,
 			 * data chunk.
 			 */
 			struct mbuf *op_err;
-			MGET(op_err, MB_DONTWAIT, MT_DATA);
+			MGET(op_err, M_NOWAIT, MT_DATA);
 			if (op_err) {
 				struct sctp_paramhdr *ph;
 				u_int32_t *ippp;
@@ -3627,7 +3627,7 @@ sctp_handle_sack(struct sctp_sack_chunk *ch, struct sctp_tcb *stcb,
 		hopeless_peer:
 			*abort_now = 1;
 			/* XXX */
-			MGET(oper, MB_DONTWAIT, MT_DATA);
+			MGET(oper, M_NOWAIT, MT_DATA);
 			if (oper) {
 				struct sctp_paramhdr *ph;
 				u_int32_t *ippp;
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index 1e476cf..9953105 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -1089,7 +1089,7 @@ sctp_process_cookie_existing(struct mbuf *m, int iphlen, int offset,
 			kprintf("sctp_handle_cookie: got a cookie, while shutting down!\n");
 		}
 #endif
-		MGETHDR(op_err, MB_DONTWAIT, MT_HEADER);
+		MGETHDR(op_err, M_NOWAIT, MT_HEADER);
 		if (op_err == NULL) {
 			/* FOOBAR */
 			return (NULL);
@@ -1806,7 +1806,7 @@ sctp_handle_cookie_echo(struct mbuf *m, int iphlen, int offset,
 		return (NULL);
 	}
 
-	m_sig = m_split(m, sig_offset, MB_DONTWAIT);
+	m_sig = m_split(m, sig_offset, M_NOWAIT);
 	if (m_sig == NULL) {
 		/* out of memory or ?? */
 #ifdef SCTP_DEBUG
@@ -1957,7 +1957,7 @@ sctp_handle_cookie_echo(struct mbuf *m, int iphlen, int offset,
 			kprintf("sctp_handle_cookie: got a STALE cookie!\n");
 		}
 #endif
-		MGETHDR(op_err, MB_DONTWAIT, MT_HEADER);
+		MGETHDR(op_err, M_NOWAIT, MT_HEADER);
 		if (op_err == NULL) {
 			/* FOOBAR */
 			return (NULL);
@@ -3249,7 +3249,7 @@ sctp_process_control(struct mbuf *m, int iphlen, int *offset, int length,
 				struct mbuf *oper;
 				struct sctp_paramhdr *phdr;
 				oper = NULL;
-				MGETHDR(oper, MB_DONTWAIT, MT_HEADER);
+				MGETHDR(oper, M_NOWAIT, MT_HEADER);
 				if (oper) {
 					/* pre-reserve some space */
 					oper->m_data +=
@@ -3516,7 +3516,7 @@ sctp_process_control(struct mbuf *m, int iphlen, int *offset, int length,
 					struct mbuf *oper;
 					struct sctp_paramhdr *phdr;
 					oper = NULL;
-					MGETHDR(oper, MB_DONTWAIT, MT_HEADER);
+					MGETHDR(oper, M_NOWAIT, MT_HEADER);
 					if (oper) {
 						oper->m_len =
 						    oper->m_pkthdr.len =
@@ -3717,7 +3717,7 @@ sctp_process_control(struct mbuf *m, int iphlen, int *offset, int length,
 			if ((ch->chunk_type & 0x40) && (stcb != NULL)) {
 				struct mbuf *mm;
 				struct sctp_paramhdr *phd;
-				MGETHDR(mm, MB_DONTWAIT, MT_HEADER);
+				MGETHDR(mm, M_NOWAIT, MT_HEADER);
 				if (mm) {
 					phd = mtod(mm, struct sctp_paramhdr *);
 					/* We cheat and use param type since we
@@ -3733,7 +3733,7 @@ sctp_process_control(struct mbuf *m, int iphlen, int *offset, int length,
 					mm->m_len = sizeof(*phd);
 					mm->m_next = sctp_m_copym(m, *offset,
 					    SCTP_SIZE32(chk_length),
-					    MB_DONTWAIT);
+					    M_NOWAIT);
 					if (mm->m_next) {
 						mm->m_pkthdr.len =
 						    SCTP_SIZE32(chk_length) +
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 4a3927f..605f545 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -216,7 +216,7 @@ sctp_add_addr_to_mbuf(struct mbuf *m, struct ifaddr *ifa)
 		while (mret->m_next != NULL) {
 			mret = mret->m_next;
 		}
-		MGET(mret->m_next, MB_DONTWAIT, MT_DATA);
+		MGET(mret->m_next, M_NOWAIT, MT_DATA);
 		if (mret->m_next == NULL) {
 			/* We are hosed, can't add more addresses */
 			return (m);
@@ -267,17 +267,17 @@ sctp_add_cookie(struct sctp_inpcb *inp, struct mbuf *init, int init_offset,
 
 	mret = NULL;
 
-	MGET(mret, MB_DONTWAIT, MT_DATA);
+	MGET(mret, M_NOWAIT, MT_DATA);
 	if (mret == NULL) {
 		return (NULL);
 	}
-	copy_init = sctp_m_copym(init, init_offset, M_COPYALL, MB_DONTWAIT);
+	copy_init = sctp_m_copym(init, init_offset, M_COPYALL, M_NOWAIT);
 	if (copy_init == NULL) {
 		sctp_m_freem(mret);
 		return (NULL);
 	}
 	copy_initack = sctp_m_copym(initack, initack_offset, M_COPYALL,
-	    MB_DONTWAIT);
+	    M_NOWAIT);
 	if (copy_initack == NULL) {
 		sctp_m_freem(mret);
 		sctp_m_freem(copy_init);
@@ -319,7 +319,7 @@ sctp_add_cookie(struct sctp_inpcb *inp, struct mbuf *init, int init_offset,
 			break;
 		}
 	}
-	MGET(sig, MB_DONTWAIT, MT_DATA);
+	MGET(sig, M_NOWAIT, MT_DATA);
 	if (sig == NULL) {
 		/* no space */
 		sctp_m_freem(mret);
@@ -2175,7 +2175,7 @@ sctp_lowlevel_chunk_output(struct sctp_inpcb *inp,
 	if (to->sa_family == AF_INET) {
 		struct ip *ip;
 		struct route iproute;
-		M_PREPEND(m, sizeof(struct ip), MB_DONTWAIT);
+		M_PREPEND(m, sizeof(struct ip), M_NOWAIT);
 		if (m == NULL) {
 			/* failed to prepend data, give up */
 			return (ENOMEM);
@@ -2389,7 +2389,7 @@ sctp_lowlevel_chunk_output(struct sctp_inpcb *inp,
 		int error;
 		u_short prev_port=0;
 
-		M_PREPEND(m, sizeof(struct ip6_hdr), MB_DONTWAIT);
+		M_PREPEND(m, sizeof(struct ip6_hdr), M_NOWAIT);
 		if (m == NULL) {
 			/* failed to prepend data, give up */
 			return (ENOMEM);
@@ -2745,13 +2745,13 @@ sctp_send_initiate(struct sctp_inpcb *inp, struct sctp_tcb *stcb)
 		/* we are hosed since I can't start the INIT timer? */
 		return;
 	}
-	MGETHDR(m, MB_DONTWAIT, MT_HEADER);
+	MGETHDR(m, M_NOWAIT, MT_HEADER);
 	if (m == NULL) {
 		/* No memory, INIT timer will re-attempt. */
 		return;
 	}
 	/* make it into a M_EXT */
-	MCLGET(m, MB_DONTWAIT);
+	MCLGET(m, M_NOWAIT);
 	if ((m->m_flags & M_EXT) != M_EXT) {
 		/* Failed to get cluster buffer */
 		sctp_m_freem(m);
@@ -3110,7 +3110,7 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_initpkt,
 			*abort_processing = 1;
 			if (op_err == NULL) {
 				/* Ok need to try to get a mbuf */
-				MGETHDR(op_err, MB_DONTWAIT, MT_DATA);
+				MGETHDR(op_err, M_NOWAIT, MT_DATA);
 				if (op_err) {
 					op_err->m_len = 0;
 					op_err->m_pkthdr.len = 0;
@@ -3165,7 +3165,7 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_initpkt,
 #endif
 				if (op_err == NULL) {
 					/* Ok need to try to get an mbuf */
-					MGETHDR(op_err, MB_DONTWAIT, MT_DATA);
+					MGETHDR(op_err, M_NOWAIT, MT_DATA);
 					if (op_err) {
 						op_err->m_len = 0;
 						op_err->m_pkthdr.len = 0;
@@ -3421,14 +3421,14 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 		sctp_send_abort(init_pkt, iphlen, sh, init_chk->init.initiate_tag, op_err);
 		return;
 	}
-	MGETHDR(m, MB_DONTWAIT, MT_HEADER);
+	MGETHDR(m, M_NOWAIT, MT_HEADER);
 	if (m == NULL) {
 		/* No memory, INIT timer will re-attempt. */
 		if (op_err)
 			sctp_m_freem(op_err);
 		return;
 	}
-	MCLGET(m, MB_DONTWAIT);
+	MCLGET(m, M_NOWAIT);
 	if ((m->m_flags & M_EXT) != M_EXT) {
 		/* Failed to get cluster buffer */
 		if (op_err)
@@ -4288,7 +4288,7 @@ sctp_msg_append(struct sctp_tcb *stcb,
 					dataout += n->m_len;
 				}
 			}
-			M_PREPEND(m, sizeof(struct sctp_paramhdr), MB_DONTWAIT);
+			M_PREPEND(m, sizeof(struct sctp_paramhdr), M_NOWAIT);
 			if (m) {
 				struct sctp_paramhdr *ph;
 				m->m_len = sizeof(struct sctp_paramhdr) + dataout;
@@ -4514,7 +4514,7 @@ sctp_msg_append(struct sctp_tcb *stcb,
 			 * We can wait since this is called from the user
 			 * send side
 			 */
-			n->m_nextpkt = m_split(n, siz, MB_WAIT);
+			n->m_nextpkt = m_split(n, siz, M_WAITOK);
 			if (n->m_nextpkt == NULL) {
 				error = EFAULT;
 				SOCKBUF_LOCK(&so->so_snd);
@@ -4736,12 +4736,12 @@ sctp_copy_mbufchain(struct mbuf *clonechain,
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 	/* Supposedly m_copypacket is an optimization, use it if we can */
 	if (clonechain->m_flags & M_PKTHDR) {
-		appendchain = m_copypacket(clonechain, MB_DONTWAIT);
+		appendchain = m_copypacket(clonechain, M_NOWAIT);
 		sctp_pegs[SCTP_CACHED_SRC]++;
 	} else
 		appendchain = m_copy(clonechain, 0, M_COPYALL);
 #elif defined(__APPLE__)
-	appendchain = sctp_m_copym(clonechain, 0, M_COPYALL, MB_DONTWAIT);
+	appendchain = sctp_m_copym(clonechain, 0, M_COPYALL, M_NOWAIT);
 #else
 	appendchain = m_copy(clonechain, 0, M_COPYALL);
 #endif
@@ -4844,7 +4844,7 @@ sctp_copy_out_all(struct uio *uio, int len)
 	struct mbuf *ret, *at;
 	int left, willcpy, cancpy, error;
 
-	MGETHDR(ret, MB_WAIT, MT_HEADER);
+	MGETHDR(ret, M_WAITOK, MT_HEADER);
 	if (ret == NULL) {
 		/* TSNH */
 		return (NULL);
@@ -4852,7 +4852,7 @@ sctp_copy_out_all(struct uio *uio, int len)
 	left = len;
 	ret->m_len = 0;
 	ret->m_pkthdr.len = len;
-	MCLGET(ret, MB_WAIT);
+	MCLGET(ret, M_WAITOK);
 	if (ret == NULL) {
 		return (NULL);
 	}
@@ -4876,13 +4876,13 @@ sctp_copy_out_all(struct uio *uio, int len)
 		at->m_nextpkt = at->m_next = 0;
 		left -= willcpy;
 		if (left > 0) {
-			MGET(at->m_next, MB_WAIT, MT_DATA);
+			MGET(at->m_next, M_WAITOK, MT_DATA);
 			if (at->m_next == NULL) {
 				goto err_out_now;
 			}
 			at = at->m_next;
 			at->m_len = 0;
-			MCLGET(at, MB_WAIT);
+			MCLGET(at, M_WAITOK);
 			if (at == NULL) {
 				goto err_out_now;
 			}
@@ -5137,7 +5137,7 @@ sctp_move_to_outqueue(struct sctp_tcb *stcb,
 		nchk = TAILQ_NEXT(chk, sctp_next);
 		/* now put in the chunk header */
 		orig = chk->data;
-		M_PREPEND(chk->data, sizeof(struct sctp_data_chunk), MB_DONTWAIT);
+		M_PREPEND(chk->data, sizeof(struct sctp_data_chunk), M_NOWAIT);
 		if (chk->data == NULL) {
 			/* HELP */
 			failed++;
@@ -5700,7 +5700,8 @@ sctp_med_chunk_output(struct sctp_inpcb *inp,
 						 */
 						outchain->m_len = sizeof(struct sctphdr);
 					} else {
-						M_PREPEND(outchain, sizeof(struct sctphdr), MB_DONTWAIT);
+						M_PREPEND(outchain, sizeof(struct sctphdr),
+							  M_NOWAIT);
 						if (outchain == NULL) {
 							/* no memory */
 							error = ENOBUFS;
@@ -5954,7 +5955,7 @@ sctp_med_chunk_output(struct sctp_inpcb *inp,
 			if ((outchain->m_flags & M_PKTHDR) == 0) {
 				struct mbuf *t;
 
-				MGETHDR(t, MB_DONTWAIT, MT_HEADER);
+				MGETHDR(t, M_NOWAIT, MT_HEADER);
 				if (t == NULL) {
 					sctp_m_freem(outchain);
 					return (ENOMEM);
@@ -5978,7 +5979,8 @@ sctp_med_chunk_output(struct sctp_inpcb *inp,
 				MH_ALIGN(outchain, sizeof(struct sctphdr));
 				outchain->m_len = sizeof(struct sctphdr);
 			} else {
-				M_PREPEND(outchain, sizeof(struct sctphdr), MB_DONTWAIT);
+				M_PREPEND(outchain, sizeof(struct sctphdr),
+					  M_NOWAIT);
 				if (outchain == NULL) {
 					/* out of mbufs */
 					error = ENOBUFS;
@@ -6102,7 +6104,7 @@ sctp_queue_op_err(struct sctp_tcb *stcb, struct mbuf *op_err)
 	}
 	sctppcbinfo.ipi_count_chunk++;
 	sctppcbinfo.ipi_gencnt_chunk++;
-	M_PREPEND(op_err, sizeof(struct sctp_chunkhdr), MB_DONTWAIT);
+	M_PREPEND(op_err, sizeof(struct sctp_chunkhdr), M_NOWAIT);
 	if (op_err == NULL) {
 		SCTP_ZONE_FREE(sctppcbinfo.ipi_zone_chunk, chk);
 		sctppcbinfo.ipi_count_chunk--;
@@ -6169,7 +6171,7 @@ sctp_send_cookie_echo(struct mbuf *m,
 			if ((pad = (plen % 4))) {
 				plen += 4 - pad;
 			}
-			cookie = sctp_m_copym(m, at, plen, MB_DONTWAIT);
+			cookie = sctp_m_copym(m, at, plen, M_NOWAIT);
 			if (cookie == NULL) {
 				/* No memory */
 				return (-2);
@@ -6191,7 +6193,7 @@ sctp_send_cookie_echo(struct mbuf *m,
 	/* now we MUST have a PKTHDR on it */
 	if ((cookie->m_flags & M_PKTHDR) != M_PKTHDR) {
 		/* we hope this happens rarely */
-		MGETHDR(mat, MB_DONTWAIT, MT_HEADER);
+		MGETHDR(mat, M_NOWAIT, MT_HEADER);
 		if (mat == NULL) {
 			sctp_m_freem(cookie);
 			return (-4);
@@ -6244,7 +6246,7 @@ sctp_send_heartbeat_ack(struct sctp_tcb *stcb,
 		/* must have a net pointer */
 		return;
 
-	outchain = sctp_m_copym(m, offset, chk_length, MB_DONTWAIT);
+	outchain = sctp_m_copym(m, offset, chk_length, M_NOWAIT);
 	if (outchain == NULL) {
 		/* gak out of memory */
 		return;
@@ -6255,7 +6257,7 @@ sctp_send_heartbeat_ack(struct sctp_tcb *stcb,
 	if ((outchain->m_flags & M_PKTHDR) != M_PKTHDR) {
 		/* should not happen but we are cautious. */
 		struct mbuf *tmp;
-		MGETHDR(tmp, MB_DONTWAIT, MT_HEADER);
+		MGETHDR(tmp, M_NOWAIT, MT_HEADER);
 		if (tmp == NULL) {
 			return;
 		}
@@ -6302,7 +6304,7 @@ sctp_send_cookie_ack(struct sctp_tcb *stcb) {
 	struct sctp_tmit_chunk *chk;
 
 	cookie_ack = NULL;
-	MGETHDR(cookie_ack, MB_DONTWAIT, MT_HEADER);
+	MGETHDR(cookie_ack, M_NOWAIT, MT_HEADER);
 	if (cookie_ack == NULL) {
 		/* no mbuf's */
 		return (-1);
@@ -6351,7 +6353,7 @@ sctp_send_shutdown_ack(struct sctp_tcb *stcb, struct sctp_nets *net)
 	struct sctp_tmit_chunk *chk;
 
 	m_shutdown_ack = NULL;
-	MGETHDR(m_shutdown_ack, MB_DONTWAIT, MT_HEADER);
+	MGETHDR(m_shutdown_ack, M_NOWAIT, MT_HEADER);
 	if (m_shutdown_ack == NULL) {
 		/* no mbuf's */
 		return (-1);
@@ -6396,7 +6398,7 @@ sctp_send_shutdown(struct sctp_tcb *stcb, struct sctp_nets *net)
 	struct sctp_tmit_chunk *chk;
 
 	m_shutdown = NULL;
-	MGETHDR(m_shutdown, MB_DONTWAIT, MT_HEADER);
+	MGETHDR(m_shutdown, M_NOWAIT, MT_HEADER);
 	if (m_shutdown == NULL) {
 		/* no mbuf's */
 		return (-1);
@@ -6498,7 +6500,8 @@ sctp_send_asconf_ack(struct sctp_tcb *stcb, uint32_t retrans)
 	 * use it if we can.
 	 */
 	if (stcb->asoc.last_asconf_ack_sent->m_flags & M_PKTHDR) {
-		m_ack = m_copypacket(stcb->asoc.last_asconf_ack_sent, MB_DONTWAIT);
+		m_ack = m_copypacket(stcb->asoc.last_asconf_ack_sent,
+				     M_NOWAIT);
 		sctp_pegs[SCTP_CACHED_SRC]++;
 	} else
 		m_ack = m_copy(stcb->asoc.last_asconf_ack_sent, 0, M_COPYALL);
@@ -6659,7 +6662,7 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp,
 			 */
 			m->m_len = sizeof(struct sctphdr);
 		} else {
-			M_PREPEND(m, sizeof(struct sctphdr), MB_DONTWAIT);
+			M_PREPEND(m, sizeof(struct sctphdr), M_NOWAIT);
 			if (m == NULL) {
 				return (ENOBUFS);
 			}
@@ -6853,7 +6856,7 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp,
 				 */
 				m->m_len = sizeof(struct sctphdr);
 			} else {
-				M_PREPEND(m, sizeof(struct sctphdr), MB_DONTWAIT);
+				M_PREPEND(m, sizeof(struct sctphdr), M_NOWAIT);
 				if (m == NULL) {
 					return (ENOBUFS);
 				}
@@ -7653,7 +7656,7 @@ send_forward_tsn(struct sctp_tcb *stcb,
 	sctppcbinfo.ipi_gencnt_chunk++;
 	chk->rec.chunk_id = SCTP_FORWARD_CUM_TSN;
 	chk->asoc = asoc;
-	MGETHDR(chk->data, MB_DONTWAIT, MT_DATA);
+	MGETHDR(chk->data, M_NOWAIT, MT_DATA);
 	if (chk->data == NULL) {
 		chk->whoTo->ref_count--;
 		SCTP_ZONE_FREE(sctppcbinfo.ipi_zone_chunk, chk);
@@ -7700,7 +7703,7 @@ send_forward_tsn(struct sctp_tcb *stcb,
 			/* Need a M_EXT, get one and move
 			 * fwdtsn to data area.
 			 */
-			MCLGET(chk->data, MB_DONTWAIT);
+			MCLGET(chk->data, M_NOWAIT);
 		}
 		cnt_of_space = M_TRAILINGSPACE(chk->data);
 
@@ -7876,7 +7879,7 @@ sctp_send_sack(struct sctp_tcb *stcb)
 		a_chk->whoTo->ref_count++;
 
 	/* Ok now lets formulate a MBUF with our sack */
-	MGETHDR(a_chk->data, MB_DONTWAIT, MT_DATA);
+	MGETHDR(a_chk->data, M_NOWAIT, MT_DATA);
 	if ((a_chk->data == NULL) ||
 	    (a_chk->whoTo == NULL)) {
 		/* rats, no mbuf memory */
@@ -7997,7 +8000,7 @@ sctp_send_sack(struct sctp_tcb *stcb)
 
 	if ((space+SCTP_MIN_OVERHEAD) > MHLEN) {
 		/* We need a cluster */
-		MCLGET(a_chk->data, MB_DONTWAIT);
+		MCLGET(a_chk->data, M_NOWAIT);
 		if ((a_chk->data->m_flags & M_EXT) != M_EXT) {
 			/* can't get a cluster
 			 * give up and try later.
@@ -8094,7 +8097,7 @@ sctp_send_abort_tcb(struct sctp_tcb *stcb, struct mbuf *operr)
 	struct sctp_abort_msg *abort_m;
 	int sz;
 	abort_m = NULL;
-	MGETHDR(m_abort, MB_DONTWAIT, MT_HEADER);
+	MGETHDR(m_abort, M_NOWAIT, MT_HEADER);
 	if (m_abort == NULL) {
 		/* no mbuf's */
 		return;
@@ -8138,7 +8141,7 @@ sctp_send_shutdown_complete(struct sctp_tcb *stcb,
 	struct sctp_shutdown_complete_msg *comp_cp;
 
 	m_shutdown_comp = NULL;
-	MGETHDR(m_shutdown_comp, MB_DONTWAIT, MT_HEADER);
+	MGETHDR(m_shutdown_comp, M_NOWAIT, MT_HEADER);
 	if (m_shutdown_comp == NULL) {
 		/* no mbuf's */
 		return (-1);
@@ -8177,7 +8180,7 @@ sctp_send_shutdown_complete2(struct mbuf *m, int iphlen, struct sctphdr *sh)
 	int offset_out;
 	struct sctp_shutdown_complete_msg *comp_cp;
 
-	MGETHDR(mout, MB_DONTWAIT, MT_HEADER);
+	MGETHDR(mout, M_NOWAIT, MT_HEADER);
 	if (mout == NULL) {
 		/* no mbuf's */
 		return (-1);
@@ -8481,7 +8484,7 @@ sctp_send_hb(struct sctp_tcb *stcb, int user_req, struct sctp_nets *u_net)
 	chk->rec.chunk_id = SCTP_HEARTBEAT_REQUEST;
 	chk->asoc = &stcb->asoc;
 	chk->send_size = sizeof(struct sctp_heartbeat_chunk);
-	MGETHDR(chk->data, MB_DONTWAIT, MT_DATA);
+	MGETHDR(chk->data, M_NOWAIT, MT_DATA);
 	if (chk->data == NULL) {
 		SCTP_ZONE_FREE(sctppcbinfo.ipi_zone_chunk, chk);
 		sctppcbinfo.ipi_count_chunk--;
@@ -8611,7 +8614,7 @@ sctp_send_ecn_echo(struct sctp_tcb *stcb, struct sctp_nets *net,
 	chk->rec.chunk_id = SCTP_ECN_ECHO;
 	chk->asoc = &stcb->asoc;
 	chk->send_size = sizeof(struct sctp_ecne_chunk);
-	MGETHDR(chk->data, MB_DONTWAIT, MT_DATA);
+	MGETHDR(chk->data, M_NOWAIT, MT_DATA);
 	if (chk->data == NULL) {
 		SCTP_ZONE_FREE(sctppcbinfo.ipi_zone_chunk, chk);
 		sctppcbinfo.ipi_count_chunk--;
@@ -8685,7 +8688,7 @@ sctp_send_packet_dropped(struct sctp_tcb *stcb, struct sctp_nets *net,
 		chk->send_size = len = m->m_pkthdr.len - iphlen;
 	}
 	chk->asoc = &stcb->asoc;
-	MGETHDR(chk->data, MB_DONTWAIT, MT_DATA);
+	MGETHDR(chk->data, M_NOWAIT, MT_DATA);
 	if (chk->data == NULL) {
 	jump_out:
 		SCTP_ZONE_FREE(sctppcbinfo.ipi_zone_chunk, chk);
@@ -8697,7 +8700,7 @@ sctp_send_packet_dropped(struct sctp_tcb *stcb, struct sctp_nets *net,
 		return;
 	}
 	if ((chk->send_size+sizeof(struct sctp_pktdrop_chunk)+SCTP_MIN_OVERHEAD) > MHLEN) {
-		MCLGET(chk->data, MB_DONTWAIT);
+		MCLGET(chk->data, M_NOWAIT);
 		if ((chk->data->m_flags & M_EXT) == 0) {
 			/* Give up */
 			sctp_m_freem(chk->data);
@@ -8794,7 +8797,7 @@ sctp_send_cwr(struct sctp_tcb *stcb, struct sctp_nets *net, uint32_t high_tsn)
 	chk->rec.chunk_id = SCTP_ECN_CWR;
 	chk->asoc = &stcb->asoc;
 	chk->send_size = sizeof(struct sctp_cwr_chunk);
-	MGETHDR(chk->data, MB_DONTWAIT, MT_DATA);
+	MGETHDR(chk->data, M_NOWAIT, MT_DATA);
 	if (chk->data == NULL) {
 		SCTP_ZONE_FREE(sctppcbinfo.ipi_zone_chunk, chk);
 		sctppcbinfo.ipi_count_chunk--;
@@ -8867,7 +8870,7 @@ sctp_send_str_reset_ack(struct sctp_tcb *stcb,
 	chk->rec.chunk_id = SCTP_STREAM_RESET;
 	chk->asoc = &stcb->asoc;
 	chk->send_size = sizeof(struct sctp_stream_reset_resp) + (number_entries * sizeof(uint16_t));
-	MGETHDR(chk->data, MB_DONTWAIT, MT_DATA);
+	MGETHDR(chk->data, M_NOWAIT, MT_DATA);
 	if (chk->data == NULL) {
 	strresp_jump_out:
 		SCTP_ZONE_FREE(sctppcbinfo.ipi_zone_chunk, chk);
@@ -8881,7 +8884,7 @@ sctp_send_str_reset_ack(struct sctp_tcb *stcb,
 	chk->data->m_data += SCTP_MIN_OVERHEAD;
 	chk->data->m_pkthdr.len = chk->data->m_len = SCTP_SIZE32(chk->send_size);
 	if (M_TRAILINGSPACE(chk->data) < (int)SCTP_SIZE32(chk->send_size)) {
-		MCLGET(chk->data, MB_DONTWAIT);
+		MCLGET(chk->data, M_NOWAIT);
 		if ((chk->data->m_flags & M_EXT) == 0) {
 			/* Give up */
 			sctp_m_freem(chk->data);
@@ -9022,7 +9025,7 @@ sctp_send_str_reset_req(struct sctp_tcb *stcb,
 	chk->rec.chunk_id = SCTP_STREAM_RESET;
 	chk->asoc = &stcb->asoc;
 	chk->send_size = sizeof(struct sctp_stream_reset_req) + (number_entrys * sizeof(uint16_t));
-	MGETHDR(chk->data, MB_DONTWAIT, MT_DATA);
+	MGETHDR(chk->data, M_NOWAIT, MT_DATA);
 	if (chk->data == NULL) {
 	strreq_jump_out:
 		SCTP_ZONE_FREE(sctppcbinfo.ipi_zone_chunk, chk);
@@ -9036,7 +9039,7 @@ sctp_send_str_reset_req(struct sctp_tcb *stcb,
 	chk->data->m_data += SCTP_MIN_OVERHEAD;
 	chk->data->m_pkthdr.len = chk->data->m_len = SCTP_SIZE32(chk->send_size);
 	if (M_TRAILINGSPACE(chk->data) < (int)SCTP_SIZE32(chk->send_size)) {
-		MCLGET(chk->data, MB_DONTWAIT);
+		MCLGET(chk->data, M_NOWAIT);
 		if ((chk->data->m_flags & M_EXT) == 0) {
 			/* Give up */
 			sctp_m_freem(chk->data);
@@ -9126,7 +9129,7 @@ sctp_send_abort(struct mbuf *m, int iphlen, struct sctphdr *sh, uint32_t vtag,
 			sctp_m_freem(err_cause);
 		return;
 	}
-	MGETHDR(mout, MB_DONTWAIT, MT_HEADER);
+	MGETHDR(mout, M_NOWAIT, MT_HEADER);
 	if (mout == NULL) {
 		if (err_cause)
 			sctp_m_freem(err_cause);
@@ -9300,7 +9303,8 @@ sctp_send_operr_to(struct mbuf *m, int iphlen,
 		m_freem(scm);
 		return;
 	}
-	M_PREPEND(scm, (sizeof(struct sctphdr) + sizeof(struct sctp_chunkhdr)), MB_DONTWAIT);
+	M_PREPEND(scm, (sizeof(struct sctphdr) + sizeof(struct sctp_chunkhdr)),
+		  M_NOWAIT);
 	if (scm == NULL) {
 		/* can't send because we can't add a mbuf */
 		return;
@@ -9333,7 +9337,7 @@ sctp_send_operr_to(struct mbuf *m, int iphlen,
 		/* V4 */
 		struct ip *out;
 		struct route ro;
-		M_PREPEND(scm, sizeof(struct ip), MB_DONTWAIT);
+		M_PREPEND(scm, sizeof(struct ip), M_NOWAIT);
 		if (scm == NULL)
 			return;
 		bzero(&ro, sizeof ro);
@@ -9372,7 +9376,7 @@ sctp_send_operr_to(struct mbuf *m, int iphlen,
 #endif
 		struct ip6_hdr *out6, *in6;
 
-		M_PREPEND(scm, sizeof(struct ip6_hdr), MB_DONTWAIT);
+		M_PREPEND(scm, sizeof(struct ip6_hdr), M_NOWAIT);
 		if (scm == NULL)
 			return;
 		bzero(&ro, sizeof ro);
@@ -9429,7 +9433,7 @@ sctp_copy_one(struct mbuf *m, struct uio *uio, int cpsz, int resv_upfront, int *
 	}
 	m->m_len = 0;
 	if ((left+resv_upfront) > (int)MHLEN) {
-		MCLGET(m, MB_WAIT);
+		MCLGET(m, M_WAITOK);
 		if (m == NULL) {
 			*mbcnt = 0;
 			return (ENOMEM);
@@ -9465,7 +9469,7 @@ sctp_copy_one(struct mbuf *m, struct uio *uio, int cpsz, int resv_upfront, int *
 		m->m_nextpkt = 0;
 		left -= willcpy;
 		if (left > 0) {
-			MGET(m->m_next, MB_WAIT, MT_DATA);
+			MGET(m->m_next, M_WAITOK, MT_DATA);
 			if (m->m_next == NULL) {
 				*mbcnt = 0;
 				return (ENOMEM);
@@ -9474,7 +9478,7 @@ sctp_copy_one(struct mbuf *m, struct uio *uio, int cpsz, int resv_upfront, int *
 			m->m_len = 0;
 			*mbcnt += MSIZE;
 			if (left > (int)MHLEN) {
-				MCLGET(m, MB_WAIT);
+				MCLGET(m, M_WAITOK);
 				if (m == NULL) {
 					*mbcnt = 0;
 					return (ENOMEM);
@@ -9664,7 +9668,7 @@ sctp_copy_it_in(struct sctp_inpcb *inp,
 			 * it is done that way in the sosend code so I guess
 			 * it is ok :-0
 			 */
- 			MGETHDR(mm, MB_WAIT, MT_DATA);
+ 			MGETHDR(mm, M_WAITOK, MT_DATA);
 			if (mm) {
 				struct sctp_paramhdr *ph;
 
@@ -9675,7 +9679,7 @@ sctp_copy_it_in(struct sctp_inpcb *inp,
 						tot_demand = MCLBYTES;
 						tot_out = tot_demand - sizeof(struct sctp_paramhdr);
 					}
-					MCLGET(mm, MB_WAIT);
+					MCLGET(mm, M_WAITOK);
 					if ((mm->m_flags & M_EXT) == 0) {
 						/* truncate further */
 						tot_demand = MHLEN;
@@ -9775,7 +9779,7 @@ sctp_copy_it_in(struct sctp_inpcb *inp,
 		sctppcbinfo.ipi_count_chunk++;
 		sctppcbinfo.ipi_gencnt_chunk++;
 		asoc->chunks_on_out_queue++;
-		MGETHDR(mm, MB_WAIT, MT_DATA);
+		MGETHDR(mm, M_WAITOK, MT_DATA);
 		if (mm == NULL) {
 			error = ENOMEM;
 			goto clean_up;
@@ -9866,7 +9870,7 @@ clean_up:
 			sctppcbinfo.ipi_gencnt_chunk++;
 			*chk = template;
 			chk->whoTo->ref_count++;
-			MGETHDR(chk->data, MB_WAIT, MT_DATA);
+			MGETHDR(chk->data, M_WAITOK, MT_DATA);
 			if (chk->data == NULL) {
 				error = ENOMEM;
 				goto temp_clean_up;
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index 59f6484..2cb2f74 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -2221,7 +2221,7 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate)
 				) {
 				/* Left with Data unread */
 				struct mbuf *op_err;
-				MGET(op_err, MB_DONTWAIT, MT_DATA);
+				MGET(op_err, M_NOWAIT, MT_DATA);
 				if (op_err) {
 					/* Fill in the user initiated abort */
 					struct sctp_paramhdr *ph;
@@ -2348,7 +2348,7 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate)
 		SCTP_TCB_LOCK(asoc);
 		if (SCTP_GET_STATE(&asoc->asoc) != SCTP_STATE_COOKIE_WAIT) {
 			struct mbuf *op_err;
-			MGET(op_err, MB_DONTWAIT, MT_DATA);
+			MGET(op_err, M_NOWAIT, MT_DATA);
 			if (op_err) {
 				/* Fill in the user initiated abort */
 				struct sctp_paramhdr *ph;
diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c
index a9f7b0e..f771ddb 100644
--- a/sys/netinet/sctp_timer.c
+++ b/sys/netinet/sctp_timer.c
@@ -208,7 +208,7 @@ sctp_threshold_management(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 	if (stcb->asoc.overall_error_count > threshold) {
 		/* Abort notification sends a ULP notify */
 		struct mbuf *oper;
-		MGET(oper, MB_DONTWAIT, MT_DATA);
+		MGET(oper, M_NOWAIT, MT_DATA);
 		if (oper) {
 			struct sctp_paramhdr *ph;
 			u_int32_t *ippp;
@@ -940,7 +940,7 @@ sctp_cookie_timer(struct sctp_inpcb *inp,
 		if (SCTP_GET_STATE(&stcb->asoc) == SCTP_STATE_COOKIE_ECHOED) {
 			/* FOOBAR! */
 			struct mbuf *oper;
-			MGET(oper, MB_DONTWAIT, MT_DATA);
+			MGET(oper, M_NOWAIT, MT_DATA);
 			if (oper) {
 				struct sctp_paramhdr *ph;
 				u_int32_t *ippp;
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index c0d4c94..9dc8292 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -229,7 +229,7 @@ sctp_split_chunks(struct sctp_association *asoc,
 	/* Copy it all */
 	*new_chk = *chk;
 	/*  split the data */
-	new_chk->data = m_split(chk->data, (chk->send_size>>1), MB_DONTWAIT);
+	new_chk->data = m_split(chk->data, (chk->send_size>>1), M_NOWAIT);
 	if (new_chk->data == NULL) {
 		/* Can't split */
 		chk->flags |= CHUNK_FLAGS_FRAGMENT_OK;
@@ -952,7 +952,7 @@ sctp_disconnect(netmsg_t msg)
 					/* Left with Data unread */
 					struct mbuf *err;
 					err = NULL;
-					MGET(err, MB_DONTWAIT, MT_DATA);
+					MGET(err, M_NOWAIT, MT_DATA);
 					if (err) {
 						/* Fill in the user initiated abort */
 						struct sctp_paramhdr *ph;
@@ -3517,9 +3517,9 @@ sctp_ctloutput(netmsg_t msg)
 	}
 	if (sopt->sopt_valsize) {
 
-		m = m_get(MB_WAIT, MT_DATA);
+		m = m_get(M_WAITOK, MT_DATA);
 		if (sopt->sopt_valsize > MLEN) {
-			MCLGET(m, MB_DONTWAIT);
+			MCLGET(m, M_NOWAIT);
 			if ((m->m_flags & M_EXT) == 0) {
 				sctp_m_freem(m);
 				error = ENOBUFS;
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 46e0cb9..d0bffa9 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -2047,7 +2047,7 @@ sctp_add_pad_tombuf(struct mbuf *m, int padlen)
 	} else {
 		/* Hard way we must grow the mbuf */
 		struct mbuf *tmp;
-		MGET(tmp, MB_DONTWAIT, MT_DATA);
+		MGET(tmp, M_NOWAIT, MT_DATA);
 		if (tmp == NULL) {
 			/* Out of space GAK! we are in big trouble. */
 			return (ENOSPC);
@@ -2121,7 +2121,7 @@ sctp_notify_assoc_change(u_int32_t event, struct sctp_tcb *stcb,
 		/* event not enabled */
 		return;
 	}
-	MGETHDR(m_notify, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m_notify, M_NOWAIT, MT_DATA);
 	if (m_notify == NULL)
 		/* no space left */
 		return;
@@ -2210,12 +2210,12 @@ sctp_notify_peer_addr_change(struct sctp_tcb *stcb, uint32_t state,
 		/* event not enabled */
 		return;
 
-	MGETHDR(m_notify, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m_notify, M_NOWAIT, MT_DATA);
 	if (m_notify == NULL)
 		return;
 	m_notify->m_len = 0;
 
-	MCLGET(m_notify, MB_DONTWAIT);
+	MCLGET(m_notify, M_NOWAIT);
 	if ((m_notify->m_flags & M_EXT) != M_EXT) {
 		sctp_m_freem(m_notify);
 		return;
@@ -2306,7 +2306,7 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, u_int32_t error,
 		return;
 
 	length = sizeof(struct sctp_send_failed) + chk->send_size;
-	MGETHDR(m_notify, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m_notify, M_NOWAIT, MT_DATA);
 	if (m_notify == NULL)
 		/* no space left */
 		return;
@@ -2407,7 +2407,7 @@ sctp_notify_adaption_layer(struct sctp_tcb *stcb,
 		/* event not enabled */
 		return;
 
-	MGETHDR(m_notify, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m_notify, M_NOWAIT, MT_DATA);
 	if (m_notify == NULL)
 		/* no space left */
 		return;
@@ -2486,7 +2486,7 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb,
 		/* event not enabled */
 		return;
 
-	MGETHDR(m_notify, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m_notify, M_NOWAIT, MT_DATA);
 	if (m_notify == NULL)
 		/* no space left */
 		return;
@@ -2575,7 +2575,7 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb)
 		/* event not enabled */
 		return;
 
-	MGETHDR(m_notify, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m_notify, M_NOWAIT, MT_DATA);
 	if (m_notify == NULL)
 		/* no space left */
 		return;
@@ -2654,14 +2654,14 @@ sctp_notify_stream_reset(struct sctp_tcb *stcb,
 		/* event not enabled */
 		return;
 
-	MGETHDR(m_notify, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m_notify, M_NOWAIT, MT_DATA);
 	if (m_notify == NULL)
 		/* no space left */
 		return;
 	m_notify->m_len = 0;
 	len = sizeof(struct sctp_stream_reset_event) + (number_entries * sizeof(uint16_t));
 	if (len > M_TRAILINGSPACE(m_notify)) {
-		MCLGET(m_notify, MB_WAIT);
+		MCLGET(m_notify, M_WAITOK);
 	}
 	if (m_notify == NULL)
 		/* no clusters */
@@ -3268,7 +3268,7 @@ sctp_sbappendaddr_nocheck(struct signalsockbuf *ssb, struct sockaddr *asa, struc
 		if (len > MHLEN)
 			return (0);
  try_again:
-		MGETHDR(m, MB_DONTWAIT, MT_SONAME);
+		MGETHDR(m, M_NOWAIT, MT_SONAME);
 		if (m == NULL)
 			return (0);
 		m->m_len = 0;
@@ -3339,7 +3339,7 @@ sctp_generate_invmanparam(int err)
 	/* Return a MBUF with a invalid mandatory parameter */
 	struct mbuf *m;
 
-	MGET(m, MB_DONTWAIT, MT_DATA);
+	MGET(m, M_NOWAIT, MT_DATA);
 	if (m) {
 		struct sctp_paramhdr *ph;
 		m->m_len = sizeof(struct sctp_paramhdr);
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 5825959..dab0362 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -908,9 +908,9 @@ send:
 		m->m_data -= hdrlen;
 #else
 #ifndef INET6
-		m = m_gethdr(MB_DONTWAIT, MT_HEADER);
+		m = m_gethdr(M_NOWAIT, MT_HEADER);
 #else
-		m = m_getl(hdrlen + max_linkhdr, MB_DONTWAIT, MT_HEADER,
+		m = m_getl(hdrlen + max_linkhdr, M_NOWAIT, MT_HEADER,
 			   M_PKTHDR, NULL);
 #endif
 		if (m == NULL) {
@@ -951,7 +951,7 @@ send:
 		else
 			tcpstat.tcps_sndwinup++;
 
-		MGETHDR(m, MB_DONTWAIT, MT_HEADER);
+		MGETHDR(m, M_NOWAIT, MT_HEADER);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto after_th;
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 4c5c960..07463b2 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -587,7 +587,7 @@ tcp_respond(struct tcpcb *tp, void *ipgen, struct tcphdr *th, struct mbuf *m,
 		}
 	}
 	if (m == NULL) {
-		m = m_gethdr(MB_DONTWAIT, MT_HEADER);
+		m = m_gethdr(M_NOWAIT, MT_HEADER);
 		if (m == NULL)
 			return;
 		tlen = 0;
@@ -1853,7 +1853,7 @@ ipsec_hdrsiz_tcp(struct tcpcb *tp)
 
 	if ((tp == NULL) || ((inp = tp->t_inpcb) == NULL))
 		return (0);
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (!m)
 		return (0);
 
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 574c292..8e6612f 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -1177,7 +1177,7 @@ syncache_respond(struct syncache *sc, struct mbuf *m)
 	if (m)
 		m_freem(m);
 
-	m = m_gethdr(MB_DONTWAIT, MT_HEADER);
+	m = m_gethdr(M_NOWAIT, MT_HEADER);
 	if (m == NULL)
 		return (ENOBUFS);
 	m->m_data += max_linkhdr;
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 9c56b54..bb11fb0 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -355,7 +355,7 @@ udp_mcast_input(struct udp_mcast_arg *arg)
 			;
 		else
 #endif /*FAST_IPSEC*/
-		if ((n = m_copypacket(m, MB_DONTWAIT)) != NULL)
+		if ((n = m_copypacket(m, M_NOWAIT)) != NULL)
 			udp_append(last, ip, n,
 			    arg->iphlen + sizeof(struct udphdr),
 			    arg->udp_in);
@@ -985,7 +985,7 @@ udp_send(netmsg_t msg)
 	 * Calculate data length and get a mbuf
 	 * for UDP and IP headers.
 	 */
-	M_PREPEND(m, sizeof(struct udpiphdr), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(struct udpiphdr), M_NOWAIT);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto release;
@@ -1105,7 +1105,7 @@ udp_send(netmsg_t msg)
 			 * XXX optimize this?
 			 */
 			m_opt = m_copym(inp->inp_options, 0, M_COPYALL,
-			    MB_WAIT);
+			    M_WAITOK);
 		}
 		if ((pru_flags & PRUS_NOREPLY) == 0) {
 			/*
diff --git a/sys/netinet6/ah_core.c b/sys/netinet6/ah_core.c
index 2121ef3..6c96227 100644
--- a/sys/netinet6/ah_core.c
+++ b/sys/netinet6/ah_core.c
@@ -1171,7 +1171,7 @@ again:
 				error = EMSGSIZE;
 				goto fail;
 			}
-			n = m_getb(hlen, MB_DONTWAIT, MT_DATA, 0);
+			n = m_getb(hlen, M_NOWAIT, MT_DATA, 0);
 			if (n == NULL) {
 				error = ENOBUFS;
 				goto fail;
@@ -1279,7 +1279,7 @@ again:
 				error = EMSGSIZE;
 				goto fail;
 			}
-			n = m_getb(totlen, MB_DONTWAIT, MT_DATA, 0);
+			n = m_getb(totlen, M_NOWAIT, MT_DATA, 0);
 			if (n == NULL) {
 				error = ENOBUFS;
 				goto fail;
@@ -1419,7 +1419,7 @@ again:
 				error = EMSGSIZE;
 				goto fail;
 			}
-			n = m_getb(newoff - off, MB_DONTWAIT, MT_DATA, 0);
+			n = m_getb(newoff - off, M_NOWAIT, MT_DATA, 0);
 			if (n == NULL) {
 				error = ENOBUFS;
 				goto fail;
@@ -1447,7 +1447,7 @@ again:
 			error = EMSGSIZE;
 			goto fail;
 		}
-		n = m_getb(newoff - off, MB_DONTWAIT, MT_DATA, 0);
+		n = m_getb(newoff - off, M_NOWAIT, MT_DATA, 0);
 		if (n == NULL) {
 			error = ENOBUFS;
 			goto fail;
diff --git a/sys/netinet6/ah_input.c b/sys/netinet6/ah_input.c
index f66129f..c4ab73b 100644
--- a/sys/netinet6/ah_input.c
+++ b/sys/netinet6/ah_input.c
@@ -492,7 +492,7 @@ ah4_input(struct mbuf **mp, int *offp, int proto)
 			 */
 			struct mbuf *n;
 
-			n = m_split(m, off, MB_DONTWAIT);
+			n = m_split(m, off, M_NOWAIT);
 			if (n == NULL) {
 				/* m is retained by m_split */
 				goto fail;
@@ -903,7 +903,7 @@ ah6_input(struct mbuf **mp, int *offp, int proto)
 			 */
 			struct mbuf *n;
 
-			n = m_split(m, off, MB_DONTWAIT);
+			n = m_split(m, off, M_NOWAIT);
 			if (n == NULL) {
 				/* m is retained by m_split */
 				goto fail;
diff --git a/sys/netinet6/ah_output.c b/sys/netinet6/ah_output.c
index 64205d0..f7b4cd0 100644
--- a/sys/netinet6/ah_output.c
+++ b/sys/netinet6/ah_output.c
@@ -1,5 +1,4 @@
 /*	$FreeBSD: src/sys/netinet6/ah_output.c,v 1.1.2.5 2003/05/06 06:46:58 suz Exp $	*/
-/*	$DragonFly: src/sys/netinet6/ah_output.c,v 1.9 2006/10/24 06:18:42 hsu Exp $	*/
 /*	$KAME: ah_output.c,v 1.31 2001/07/26 06:53:15 jinmei Exp $	*/
 
 /*
@@ -209,7 +208,7 @@ ah4_output(struct mbuf *m, struct ipsecrequest *isr)
 		panic("ah4_output: assumption failed (first mbuf length)");
 	if (M_LEADINGSPACE(m->m_next) < ahlen) {
 		struct mbuf *n;
-		MGET(n, MB_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (!n) {
 			ipseclog((LOG_DEBUG, "ENOBUFS in ah4_output %d\n",
 			    __LINE__));
@@ -386,7 +385,7 @@ ah6_output(struct mbuf *m, u_char *nexthdrp, struct mbuf *md,
 		return EINVAL;
 	}
 
-	mah = m_getb(ahlen, MB_DONTWAIT, MT_DATA, 0);
+	mah = m_getb(ahlen, M_NOWAIT, MT_DATA, 0);
 	if (mah == NULL) {
 		m_freem(m);
 		return ENOBUFS;
diff --git a/sys/netinet6/esp_core.c b/sys/netinet6/esp_core.c
index 4fd712b..ee127ce 100644
--- a/sys/netinet6/esp_core.c
+++ b/sys/netinet6/esp_core.c
@@ -703,7 +703,7 @@ esp_cbc_decrypt(struct mbuf *m, size_t off, struct secasvar *sav,
 			if (d)
 				dp = d;
 			i = m->m_pkthdr.len - (soff + sn);
-			d = m_getb(i, MB_DONTWAIT, MT_DATA, 0);
+			d = m_getb(i, M_NOWAIT, MT_DATA, 0);
 			if (!d) {
 				m_freem(m);
 				if (d0)
@@ -901,7 +901,7 @@ esp_cbc_encrypt(struct mbuf *m, size_t off, size_t plen, struct secasvar *sav,
 			if (d)
 				dp = d;
 			i = m->m_pkthdr.len - (soff + sn);
-			d = m_getb(i, MB_DONTWAIT, MT_DATA, 0);
+			d = m_getb(i, M_NOWAIT, MT_DATA, 0);
 			if (!d) {
 				m_freem(m);
 				if (d0)
diff --git a/sys/netinet6/esp_input.c b/sys/netinet6/esp_input.c
index aa5566f..94bdf7f 100644
--- a/sys/netinet6/esp_input.c
+++ b/sys/netinet6/esp_input.c
@@ -789,7 +789,7 @@ noreplaycheck:
 			 */
 			struct mbuf *n;
 
-			n = m_split(m, off, MB_DONTWAIT);
+			n = m_split(m, off, M_NOWAIT);
 			if (n == NULL) {
 				/* m is retained by m_split */
 				goto bad;
@@ -811,7 +811,7 @@ noreplaycheck:
 			struct mbuf *n = NULL;
 			int maxlen;
 
-			n = m_getb(m->m_pkthdr.len, MB_DONTWAIT, MT_HEADER,
+			n = m_getb(m->m_pkthdr.len, M_NOWAIT, MT_HEADER,
 				   M_PKTHDR);
 			if (!n) {
 				kprintf("esp6_input: mbuf allocation failed\n");
diff --git a/sys/netinet6/esp_output.c b/sys/netinet6/esp_output.c
index d456348..9c47313 100644
--- a/sys/netinet6/esp_output.c
+++ b/sys/netinet6/esp_output.c
@@ -324,7 +324,7 @@ esp_output(struct mbuf *m, u_char *nexthdrp, struct mbuf *md,
 	 * after:  IP ... ESP IV payload
 	 */
 	if (M_LEADINGSPACE(md) < esphlen || (md->m_flags & M_EXT)) {
-		MGET(n, MB_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			error = ENOBUFS;
@@ -479,7 +479,7 @@ esp_output(struct mbuf *m, u_char *nexthdrp, struct mbuf *md,
 	} else {
 		struct mbuf *nn;
 
-		MGET(nn, MB_DONTWAIT, MT_DATA);
+		MGET(nn, M_NOWAIT, MT_DATA);
 		if (!nn) {
 			ipseclog((LOG_DEBUG, "esp%d_output: can't alloc mbuf",
 			    afnumber));
@@ -608,7 +608,7 @@ esp_output(struct mbuf *m, u_char *nexthdrp, struct mbuf *md,
 	} else {
 		struct mbuf *nn;
 
-		MGET(nn, MB_DONTWAIT, MT_DATA);
+		MGET(nn, M_NOWAIT, MT_DATA);
 		if (!nn) {
 			ipseclog((LOG_DEBUG, "can't alloc mbuf in esp%d_output",
 			    afnumber));
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index c731277..226a4d9 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1,5 +1,4 @@
 /*	$FreeBSD: src/sys/netinet6/frag6.c,v 1.2.2.6 2002/04/28 05:40:26 suz Exp $	*/
-/*	$DragonFly: src/sys/netinet6/frag6.c,v 1.12 2008/01/05 14:02:40 swildner Exp $	*/
 /*	$KAME: frag6.c,v 1.33 2002/01/07 11:34:48 kjc Exp $	*/
 
 /*
@@ -438,7 +437,7 @@ insert:
 		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, MB_DONTWAIT)) == NULL) {
+		if ((t = m_split(m, offset, M_NOWAIT)) == NULL) {
 			frag6_remque(q6);
 			kfree(q6, M_FTABLE);
 			frag6_nfragpackets--;
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index ee68e27..29fee70 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -343,7 +343,7 @@ icmp6_error(struct mbuf *m, int type, int code, int param)
 		m_adj(m, ICMPV6_PLD_MAXLEN - m->m_pkthdr.len);
 
 	preplen = sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr);
-	M_PREPEND(m, preplen, MB_DONTWAIT);
+	M_PREPEND(m, preplen, M_NOWAIT);
 	if (m && m->m_len < preplen)
 		m = m_pullup(m, preplen);
 	if (m == NULL) {
@@ -557,7 +557,7 @@ icmp6_input(struct mbuf **mp, int *offp, int proto)
 				m_freem(n0);
 				break;
 			}
-			n = m_getb(maxlen, MB_DONTWAIT, n0->m_type, M_PKTHDR);
+			n = m_getb(maxlen, M_NOWAIT, n0->m_type, M_PKTHDR);
 			if (n == NULL) {
 				/* Give up remote */
 				m_freem(n0);
@@ -611,7 +611,7 @@ icmp6_input(struct mbuf **mp, int *offp, int proto)
 			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, MB_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
 			/* give up local */
 			mld6_input(m, off);
 			m = NULL;
@@ -672,12 +672,12 @@ icmp6_input(struct mbuf **mp, int *offp, int proto)
 				/* Give up remote */
 				break;
 			}
-			n = m_getb(maxlen, MB_DONTWAIT, m->m_type, M_PKTHDR);
+			n = m_getb(maxlen, M_NOWAIT, m->m_type, M_PKTHDR);
 			if (n == NULL) {
 				/* Give up remote */
 				break;
 			}
-			if (!m_dup_pkthdr(n, m, MB_DONTWAIT)) {
+			if (!m_dup_pkthdr(n, m, M_NOWAIT)) {
 				/*
 				 * Previous code did a blind M_COPY_PKTHDR
 				 * and said "just for rcvif".  If true, then
@@ -728,7 +728,7 @@ icmp6_input(struct mbuf **mp, int *offp, int proto)
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_router_solicit))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
 			/* give up local */
 			nd6_rs_input(m, off, icmp6len);
 			m = NULL;
@@ -744,7 +744,7 @@ icmp6_input(struct mbuf **mp, int *offp, int proto)
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_router_advert))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
 			/* give up local */
 			nd6_ra_input(m, off, icmp6len);
 			m = NULL;
@@ -760,7 +760,7 @@ icmp6_input(struct mbuf **mp, int *offp, int proto)
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_neighbor_solicit))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
 			/* give up local */
 			nd6_ns_input(m, off, icmp6len);
 			m = NULL;
@@ -776,7 +776,7 @@ icmp6_input(struct mbuf **mp, int *offp, int proto)
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_neighbor_advert))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
 			/* give up local */
 			nd6_na_input(m, off, icmp6len);
 			m = NULL;
@@ -792,7 +792,7 @@ icmp6_input(struct mbuf **mp, int *offp, int proto)
 			goto badcode;
 		if (icmp6len < sizeof(struct nd_redirect))
 			goto badlen;
-		if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) {
+		if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) {
 			/* give up local */
 			icmp6_redirect_input(m, off);
 			m = NULL;
@@ -1328,7 +1328,7 @@ ni6_input(struct mbuf *m, int off)
 		 */
 		goto bad;
 	}
-	n = m_getb(replylen, MB_DONTWAIT, m->m_type, M_PKTHDR);
+	n = m_getb(replylen, M_NOWAIT, m->m_type, M_PKTHDR);
 	if (n == NULL) {
 		m_freem(m);
 		return (NULL);
@@ -1426,7 +1426,7 @@ ni6_nametodns(const char *name, int namelen,
 		len = MCLBYTES;
 
 	/* because MAXHOSTNAMELEN is usually 256, we use cluster mbuf */
-	m = m_getb(len, MB_DONTWAIT, MT_DATA, 0);
+	m = m_getb(len, M_NOWAIT, MT_DATA, 0);
 	if (!m)
 		goto fail;
 
@@ -2381,7 +2381,7 @@ icmp6_redirect_output(struct mbuf *m0, struct rtentry *rt)
 #if IPV6_MMTU >= MCLBYTES
 # error assumption failed about IPV6_MMTU and MCLBYTES
 #endif
-	m = m_getb(IPV6_MMTU, MB_DONTWAIT, MT_HEADER, M_PKTHDR);
+	m = m_getb(IPV6_MMTU, M_NOWAIT, MT_HEADER, M_PKTHDR);
 	if (!m)
 		goto fail;
 	m->m_len = 0;
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index d027686..635d0ac 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -154,7 +154,7 @@ in6_gif_output(struct ifnet *ifp, int family, struct mbuf *m)
 	}
 	
 	/* prepend new IP header */
-	M_PREPEND(m, sizeof(struct ip6_hdr), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ip6_hdr), M_NOWAIT);
 	if (m && m->m_len < sizeof(struct ip6_hdr))
 		m = m_pullup(m, sizeof(struct ip6_hdr));
 	if (m == NULL) {
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 940043a..1ac2fe9 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -288,7 +288,7 @@ ip6_input(netmsg_t msg)
 	if (m && m->m_next != NULL && m->m_pkthdr.len < MCLBYTES) {
 		struct mbuf *n;
 
-		n = m_getb(m->m_pkthdr.len, MB_DONTWAIT, MT_HEADER, M_PKTHDR);
+		n = m_getb(m->m_pkthdr.len, M_NOWAIT, MT_HEADER, M_PKTHDR);
 		if (n == NULL)
 			goto bad;
 		M_MOVE_PKTHDR(n, m);
@@ -1478,7 +1478,7 @@ ip6_pullexthdr(struct mbuf *m, size_t off, int nxt)
 	else
 		elen = (ip6e.ip6e_len + 1) << 3;
 
-	n = m_getb(elen, MB_DONTWAIT, MT_DATA, 0);
+	n = m_getb(elen, M_NOWAIT, MT_DATA, 0);
 	if (n == NULL)
 		return NULL;
 	n->m_len = 0;
@@ -1651,7 +1651,7 @@ ip6_addaux(struct mbuf *m)
 	if (!tag) {
 		tag = m_tag_get(PACKET_TAG_IPV6_INPUT,
 				sizeof (struct ip6aux),
-				MB_DONTWAIT);
+				M_NOWAIT);
 		if (tag)
 			m_tag_prepend(m, tag);
 	}
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index cb762d0..714a341 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1,5 +1,4 @@
 /*	$FreeBSD: src/sys/netinet6/ip6_mroute.c,v 1.2.2.9 2003/01/23 21:06:47 sam Exp $	*/
-/*	$DragonFly: src/sys/netinet6/ip6_mroute.c,v 1.18 2008/06/21 12:30:19 aggelos Exp $	*/
 /*	$KAME: ip6_mroute.c,v 1.58 2001/12/18 02:36:31 itojun Exp $	*/
 
 /*
@@ -1492,7 +1491,7 @@ register_send(struct ip6_hdr *ip6, struct mif6 *mif, struct mbuf *m)
 	++pim6stat.pim6s_snd_registers;
 
 	/* Make a copy of the packet to send to the user level process */
-	MGETHDR(mm, MB_DONTWAIT, MT_HEADER);
+	MGETHDR(mm, M_NOWAIT, MT_HEADER);
 	if (mm == NULL)
 		return ENOBUFS;
 	mm->m_pkthdr.rcvif = NULL;
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index dd5854e..ba108d3 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1019,7 +1019,7 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt, struct route_in6 *ro,
 		 */
 		m0 = m;
 		for (off = hlen; off < tlen; off += len) {
-			MGETHDR(m, MB_DONTWAIT, MT_HEADER);
+			MGETHDR(m, M_NOWAIT, MT_HEADER);
 			if (!m) {
 				error = ENOBUFS;
 				ip6stat.ip6s_odropped++;
@@ -1136,7 +1136,7 @@ copyexthdr(void *h, struct mbuf **mp)
 	if (hlen > MCLBYTES)
 		return ENOBUFS;	/* XXX */
 
-	m = m_getb(hlen, MB_DONTWAIT, MT_DATA, 0);
+	m = m_getb(hlen, M_NOWAIT, MT_DATA, 0);
 	if (!m)
 		return ENOBUFS;
 	m->m_len = hlen;
@@ -1166,7 +1166,7 @@ ip6_insert_jumboopt(struct ip6_exthdrs *exthdrs, u_int32_t plen)
 	 * Otherwise, use it to store the options.
 	 */
 	if (exthdrs->ip6e_hbh == NULL) {
-		MGET(mopt, MB_DONTWAIT, MT_DATA);
+		MGET(mopt, M_NOWAIT, MT_DATA);
 		if (mopt == NULL)
 			return (ENOBUFS);
 		mopt->m_len = JUMBOOPTLEN;
@@ -1198,7 +1198,7 @@ ip6_insert_jumboopt(struct ip6_exthdrs *exthdrs, u_int32_t plen)
 			 * As a consequence, we must always prepare a cluster
 			 * at this point.
 			 */
-			n = m_getcl(MB_DONTWAIT, MT_DATA, 0);
+			n = m_getcl(M_NOWAIT, MT_DATA, 0);
 			if (!n)
 				return (ENOBUFS);
 			n->m_len = oldoptlen + JUMBOOPTLEN;
@@ -1245,7 +1245,7 @@ ip6_insertfraghdr(struct mbuf *m0, struct mbuf *m, int hlen,
 
 	if (hlen > sizeof(struct ip6_hdr)) {
 		n = m_copym(m0, sizeof(struct ip6_hdr),
-			    hlen - sizeof(struct ip6_hdr), MB_DONTWAIT);
+			    hlen - sizeof(struct ip6_hdr), M_NOWAIT);
 		if (n == NULL)
 			return (ENOBUFS);
 		m->m_next = n;
@@ -1267,7 +1267,7 @@ ip6_insertfraghdr(struct mbuf *m0, struct mbuf *m, int hlen,
 		/* allocate a new mbuf for the fragment header */
 		struct mbuf *mfrg;
 
-		MGET(mfrg, MB_DONTWAIT, MT_DATA);
+		MGET(mfrg, M_NOWAIT, MT_DATA);
 		if (mfrg == NULL)
 			return (ENOBUFS);
 		mfrg->m_len = sizeof(struct ip6_frag);
@@ -1715,7 +1715,9 @@ do { \
 					break;
 				}
 				/* XXX */
-				MGET(m, sopt->sopt_td ? MB_WAIT : MB_DONTWAIT, MT_HEADER);
+				MGET(m,
+				     sopt->sopt_td ? M_WAITOK : M_NOWAIT,
+				     MT_HEADER);
 				if (m == NULL) {
 					error = ENOBUFS;
 					break;
@@ -1823,7 +1825,7 @@ do { \
 				if (in6p->in6p_options) {
 					struct mbuf *m;
 					m = m_copym(in6p->in6p_options,
-					    0, M_COPYALL, MB_WAIT);
+					    0, M_COPYALL, M_WAITOK);
 					error = soopt_from_mbuf(sopt, m);
 					if (error == 0)
 						m_freem(m);
@@ -2766,7 +2768,7 @@ ip6_getmoptions(int optname, struct ip6_moptions *im6o, struct mbuf **mp)
 {
 	u_int *hlim, *loop, *ifindex;
 
-	*mp = m_get(MB_WAIT, MT_HEADER);		/* XXX */
+	*mp = m_get(M_WAITOK, MT_HEADER);		/* XXX */
 
 	switch (optname) {
 
@@ -3331,7 +3333,7 @@ ip6_splithdr(struct mbuf *m)
 	if (m->m_len <= sizeof(struct ip6_hdr))		/* no payload */
 		return (m);
 
-	MGETHDR(mh, MB_DONTWAIT, MT_HEADER);
+	MGETHDR(mh, M_NOWAIT, MT_HEADER);
 	if (mh == NULL)
 		return (NULL);
 	mh->m_len = sizeof(struct ip6_hdr);
diff --git a/sys/netinet6/ipcomp_core.c b/sys/netinet6/ipcomp_core.c
index 3f7040f..d4a481c 100644
--- a/sys/netinet6/ipcomp_core.c
+++ b/sys/netinet6/ipcomp_core.c
@@ -1,5 +1,4 @@
 /*	$FreeBSD: src/sys/netinet6/ipcomp_core.c,v 1.1.2.5 2003/01/11 19:10:59 ume Exp $	*/
-/*	$DragonFly: src/sys/netinet6/ipcomp_core.c,v 1.7 2006/09/29 03:37:04 hsu Exp $	*/
 /*	$KAME: ipcomp_core.c,v 1.25 2001/07/26 06:53:17 jinmei Exp $	*/
 
 /*
@@ -138,7 +137,7 @@ do { \
 	}							\
 								\
 	/* get a fresh reply buffer */				\
-	n = m_getcl(MB_DONTWAIT, MT_DATA, 0);			\
+	n = m_getcl(M_NOWAIT, MT_DATA, 0);			\
 	if (!n) {						\
 		error = ENOBUFS;				\
 		goto fail;					\
diff --git a/sys/netinet6/ipcomp_output.c b/sys/netinet6/ipcomp_output.c
index 832996f..07de3a5 100644
--- a/sys/netinet6/ipcomp_output.c
+++ b/sys/netinet6/ipcomp_output.c
@@ -167,12 +167,12 @@ ipcomp_output(struct mbuf *m, u_char *nexthdrp, struct mbuf *md,
 	 * 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, MB_DONTWAIT);
+	mcopy = m_copym(m, 0, M_COPYALL, M_NOWAIT);
 	if (mcopy == NULL) {
 		error = ENOBUFS;
 		return 0;
 	}
-	md0 = m_copym(md, 0, M_COPYALL, MB_DONTWAIT);
+	md0 = m_copym(md, 0, M_COPYALL, M_NOWAIT);
 	if (md0 == NULL) {
 		m_freem(mcopy);
 		error = ENOBUFS;
@@ -264,7 +264,7 @@ ipcomp_output(struct mbuf *m, u_char *nexthdrp, struct mbuf *md,
 	 * after:  IP ... ipcomp payload
 	 */
 	if (M_LEADINGSPACE(md) < complen) {
-		MGET(n, MB_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			error = ENOBUFS;
diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c
index c3f30a2..3d29297 100644
--- a/sys/netinet6/ipsec.c
+++ b/sys/netinet6/ipsec.c
@@ -2009,7 +2009,7 @@ ipsec4_encapsulate(struct mbuf *m, struct secasvar *sav)
 	 */
 	if (M_LEADINGSPACE(m->m_next) < hlen) {
 		struct mbuf *n;
-		MGET(n, MB_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			return ENOBUFS;
@@ -2106,7 +2106,7 @@ ipsec6_encapsulate(struct mbuf *m, struct secasvar *sav)
 		panic("ipsec6_encapsulate: assumption failed (first mbuf length)");
 	if (M_LEADINGSPACE(m->m_next) < sizeof(struct ip6_hdr)) {
 		struct mbuf *n;
-		MGET(n, MB_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			return ENOBUFS;
@@ -3102,7 +3102,7 @@ ipsec4_splithdr(struct mbuf *m)
 	hlen = ip->ip_hl << 2;
 #endif
 	if (m->m_len > hlen) {
-		MGETHDR(mh, MB_DONTWAIT, MT_HEADER);
+		MGETHDR(mh, M_NOWAIT, MT_HEADER);
 		if (!mh) {
 			m_freem(m);
 			return NULL;
@@ -3137,7 +3137,7 @@ ipsec6_splithdr(struct mbuf *m)
 	ip6 = mtod(m, struct ip6_hdr *);
 	hlen = sizeof(struct ip6_hdr);
 	if (m->m_len > hlen) {
-		MGETHDR(mh, MB_DONTWAIT, MT_HEADER);
+		MGETHDR(mh, M_NOWAIT, MT_HEADER);
 		if (!mh) {
 			m_freem(m);
 			return NULL;
@@ -3348,16 +3348,16 @@ ipsec_copypkt(struct mbuf *m)
 				struct mbuf *mm;
 
 				if (n->m_flags & M_PKTHDR) {
-					MGETHDR(mnew, MB_DONTWAIT, MT_HEADER);
+					MGETHDR(mnew, M_NOWAIT, MT_HEADER);
 					if (mnew == NULL)
 						goto fail;
-					if (!m_dup_pkthdr(mnew, n, MB_DONTWAIT)) {
+					if (!m_dup_pkthdr(mnew, n, M_NOWAIT)) {
 						m_free(mnew);
 						goto fail;
 					}
 				}
 				else {
-					MGET(mnew, MB_DONTWAIT, MT_DATA);
+					MGET(mnew, M_NOWAIT, MT_DATA);
 					if (mnew == NULL)
 						goto fail;
 				}
@@ -3381,7 +3381,7 @@ ipsec_copypkt(struct mbuf *m)
 					if (remain <= (mm->m_flags & M_PKTHDR ? MHLEN : MLEN))
 						len = remain;
 					else { /* allocate a cluster */
-						MCLGET(mm, MB_DONTWAIT);
+						MCLGET(mm, M_NOWAIT);
 						if (!(mm->m_flags & M_EXT)) {
 							m_free(mm);
 							goto fail;
@@ -3401,7 +3401,7 @@ ipsec_copypkt(struct mbuf *m)
 						break;
 
 					/* need another mbuf */
-					MGETHDR(mn, MB_DONTWAIT, MT_HEADER);
+					MGETHDR(mn, M_NOWAIT, MT_HEADER);
 					if (mn == NULL)
 						goto fail;
 					mn->m_pkthdr.rcvif = NULL;
@@ -3444,7 +3444,7 @@ ipsec_addhist(struct mbuf *m, int proto, u_int32_t spi)
 	struct ipsec_history *p;
 
 	tag = m_tag_get(PACKET_TAG_IPSEC_HISTORY,
-			sizeof (struct ipsec_history), MB_DONTWAIT);
+			sizeof (struct ipsec_history), M_NOWAIT);
 	if (tag == NULL)
 		return ENOBUFS;
 	p = (struct ipsec_history *)m_tag_data(tag);
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index 2346c19..2944ad7 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -1,5 +1,4 @@
 /*	$FreeBSD: src/sys/netinet6/mld6.c,v 1.4.2.4 2003/01/23 21:06:47 sam Exp $	*/
-/*	$DragonFly: src/sys/netinet6/mld6.c,v 1.6 2005/06/03 19:56:08 eirikn Exp $	*/
 /*	$KAME: mld6.c,v 1.27 2001/04/04 05:17:30 itojun Exp $	*/
 
 /*
@@ -423,10 +422,10 @@ mld6_sendpkt(struct in6_multi *in6m, int type, const struct in6_addr *dst)
 	 * We allocate 2 mbufs and make chain in advance because
 	 * it is more convenient when inserting the hop-by-hop option later.
 	 */
-	MGETHDR(mh, MB_DONTWAIT, MT_HEADER);
+	MGETHDR(mh, M_NOWAIT, MT_HEADER);
 	if (mh == NULL)
 		return;
-	MGET(md, MB_DONTWAIT, MT_DATA);
+	MGET(md, M_NOWAIT, MT_DATA);
 	if (md == NULL) {
 		m_free(mh);
 		return;
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index f5cd676..666ceac 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -440,7 +440,7 @@ nd6_ns_output(struct ifnet *ifp, const struct in6_addr *daddr6,
 		return;
 	}
 
-	m = m_getb(max_linkhdr + maxlen, MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getb(max_linkhdr + maxlen, M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return;
 
@@ -920,7 +920,7 @@ nd6_na_output(struct ifnet *ifp, const struct in6_addr *daddr6,
 		return;
 	}
 
-	m = m_getb(max_linkhdr + maxlen, MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getb(max_linkhdr + maxlen, M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL)
 		return;
 
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 68f5a7a..738fb9d 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -377,7 +377,7 @@ rip6_output(struct mbuf *m, struct socket *so, ...)
 		code = icmp6->icmp6_code;
 	}
 
-	M_PREPEND(m, sizeof(*ip6), MB_WAIT);
+	M_PREPEND(m, sizeof(*ip6), M_WAITOK);
 	ip6 = mtod(m, struct ip6_hdr *);
 
 	/*
diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c
index 1d98430..40b76e1 100644
--- a/sys/netinet6/udp6_output.c
+++ b/sys/netinet6/udp6_output.c
@@ -215,7 +215,7 @@ udp6_output(struct in6pcb *in6p, struct mbuf *m, struct sockaddr *addr6,
 	 * Calculate data length and get a mbuf
 	 * for UDP and IP6 headers.
 	 */
-	M_PREPEND(m, hlen + sizeof(struct udphdr), MB_DONTWAIT);
+	M_PREPEND(m, hlen + sizeof(struct udphdr), M_NOWAIT);
 	if (m == NULL) {
 		error = ENOBUFS;
 		goto release;
diff --git a/sys/netproto/802_11/wlan/ieee80211_dragonfly.c b/sys/netproto/802_11/wlan/ieee80211_dragonfly.c
index 12e05a3..a40376f 100644
--- a/sys/netproto/802_11/wlan/ieee80211_dragonfly.c
+++ b/sys/netproto/802_11/wlan/ieee80211_dragonfly.c
@@ -496,7 +496,7 @@ ieee80211_getmgtframe(uint8_t **frm, int headroom, int pktlen)
 	len = roundup2(headroom + pktlen, 4);
 	KASSERT(len <= MCLBYTES, ("802.11 mgt frame too large: %u", len));
 	if (len < MINCLSIZE) {
-		m = m_gethdr(MB_DONTWAIT, MT_DATA);
+		m = m_gethdr(M_NOWAIT, MT_DATA);
 		/*
 		 * Align the data in case additional headers are added.
 		 * This should only happen when a WEP header is added
@@ -506,7 +506,7 @@ ieee80211_getmgtframe(uint8_t **frm, int headroom, int pktlen)
 		if (m != NULL)
 			MH_ALIGN(m, len);
 	} else {
-		m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (m != NULL)
 			MC_ALIGN(m, len);
 	}
@@ -530,10 +530,10 @@ ieee80211_realign(struct ieee80211vap *vap, struct mbuf *m, size_t align)
 	pktlen = m->m_pkthdr.len;
 	space = pktlen + align;
 	if (space < MINCLSIZE)
-		n = m_gethdr(MB_DONTWAIT, MT_DATA);
+		n = m_gethdr(M_NOWAIT, MT_DATA);
 #ifdef notyet
 	else {
-		n = m_getjcl(MB_DONTWAIT, MT_DATA, M_PKTHDR,
+		n = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR,
 		    space <= MCLBYTES ?     MCLBYTES :
 #if MJUMPAGESIZE != MCLBYTES
 		    space <= MJUMPAGESIZE ? MJUMPAGESIZE :
diff --git a/sys/netproto/802_11/wlan/ieee80211_hostap.c b/sys/netproto/802_11/wlan/ieee80211_hostap.c
index fdd1667..4e76727 100644
--- a/sys/netproto/802_11/wlan/ieee80211_hostap.c
+++ b/sys/netproto/802_11/wlan/ieee80211_hostap.c
@@ -376,7 +376,7 @@ hostap_deliver_data(struct ieee80211vap *vap,
 		struct mbuf *mcopy = NULL;
 
 		if (m->m_flags & M_MCAST) {
-			mcopy = m_dup(m, MB_DONTWAIT);
+			mcopy = m_dup(m, M_NOWAIT);
 			if (mcopy == NULL)
 				IFNET_STAT_INC(ifp, oerrors, 1);
 			else
@@ -1578,7 +1578,7 @@ ieee80211_deliver_l2uf(struct ieee80211_node *ni)
 	struct l2_update_frame *l2uf;
 	struct ether_header *eh;
 	
-	m = m_gethdr(MB_DONTWAIT, MT_DATA);
+	m = m_gethdr(M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni,
 		    "%s", "no mbuf for l2uf frame");
diff --git a/sys/netproto/802_11/wlan/ieee80211_ht.c b/sys/netproto/802_11/wlan/ieee80211_ht.c
index 3e19c8b..521a68b 100644
--- a/sys/netproto/802_11/wlan/ieee80211_ht.c
+++ b/sys/netproto/802_11/wlan/ieee80211_ht.c
@@ -318,7 +318,7 @@ ieee80211_decap_amsdu(struct ieee80211_node *ni, struct mbuf *m)
 		}
 		if (m->m_pkthdr.len == framelen)
 			break;
-		n = m_split(m, framelen, MB_DONTWAIT);
+		n = m_split(m, framelen, M_NOWAIT);
 		if (n == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 			    ni->ni_macaddr, "a-msdu",
diff --git a/sys/netproto/802_11/wlan/ieee80211_hwmp.c b/sys/netproto/802_11/wlan/ieee80211_hwmp.c
index e9fa4fc..193a1d6 100644
--- a/sys/netproto/802_11/wlan/ieee80211_hwmp.c
+++ b/sys/netproto/802_11/wlan/ieee80211_hwmp.c
@@ -449,7 +449,7 @@ hwmp_send_action(struct ieee80211_node *ni,
 	}
 
 	m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *);
-	M_PREPEND(m, sizeof(struct ieee80211_frame), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ieee80211_frame), M_NOWAIT);
 	if (m == NULL) {
 		ieee80211_free_node(ni);
 		vap->iv_stats.is_tx_nobuf++;
diff --git a/sys/netproto/802_11/wlan/ieee80211_input.c b/sys/netproto/802_11/wlan/ieee80211_input.c
index 9c6abcd..4f8b175 100644
--- a/sys/netproto/802_11/wlan/ieee80211_input.c
+++ b/sys/netproto/802_11/wlan/ieee80211_input.c
@@ -84,7 +84,7 @@ ieee80211_input_all(struct ieee80211com *ic, struct mbuf *m, int rssi, int nf)
 			 * Packet contents are changed by ieee80211_decap
 			 * so do a deep copy of the packet.
 			 */
-			mcopy = m_dup(m, MB_DONTWAIT);
+			mcopy = m_dup(m, M_NOWAIT);
 			if (mcopy == NULL) {
 				/* XXX stat+msg */
 				continue;
diff --git a/sys/netproto/802_11/wlan/ieee80211_mesh.c b/sys/netproto/802_11/wlan/ieee80211_mesh.c
index b976434..10168a3 100644
--- a/sys/netproto/802_11/wlan/ieee80211_mesh.c
+++ b/sys/netproto/802_11/wlan/ieee80211_mesh.c
@@ -838,7 +838,7 @@ mesh_forward(struct ieee80211vap *vap, struct mbuf *m,
 		vap->iv_stats.is_mesh_fwd_disabled++;
 		return;
 	}
-	mcopy = m_dup(m, MB_DONTWAIT);
+	mcopy = m_dup(m, M_NOWAIT);
 	if (mcopy == NULL) {
 		IEEE80211_NOTE_FRAME(vap, IEEE80211_MSG_MESH, wh,
 		    "%s", "frame not fwd'd, cannot dup");
diff --git a/sys/netproto/802_11/wlan/ieee80211_output.c b/sys/netproto/802_11/wlan/ieee80211_output.c
index 82c268e..fd24349 100644
--- a/sys/netproto/802_11/wlan/ieee80211_output.c
+++ b/sys/netproto/802_11/wlan/ieee80211_output.c
@@ -632,7 +632,7 @@ ieee80211_mgmt_output(struct ieee80211_node *ni, struct mbuf *m, int type,
 		return EIO;		/* XXX */
 	}
 
-	M_PREPEND(m, sizeof(struct ieee80211_frame), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ieee80211_frame), M_NOWAIT);
 	if (m == NULL) {
 		ieee80211_free_node(ni);
 		return ENOMEM;
@@ -718,7 +718,7 @@ ieee80211_send_nulldata(struct ieee80211_node *ni)
 	}
 	KASSERT(M_LEADINGSPACE(m) >= hdrlen,
 	    ("leading space %zd", M_LEADINGSPACE(m)));
-	M_PREPEND(m, hdrlen, MB_DONTWAIT);
+	M_PREPEND(m, hdrlen, M_NOWAIT);
 	if (m == NULL) {
 		/* NB: cannot happen */
 		ieee80211_free_node(ni);
@@ -910,7 +910,7 @@ ieee80211_mbuf_adjust(struct ieee80211vap *vap, int hdrsize,
 		 * XXX handle SWMIC specially
 		 */
 		if (key->wk_flags & (IEEE80211_KEY_SWENCRYPT|IEEE80211_KEY_SWENMIC)) {
-			mnew = m_dup(m, MB_DONTWAIT);
+			mnew = m_dup(m, M_NOWAIT);
 			if (m == NULL) {
 				IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT,
 				    "%s: cannot get writable mbuf\n", __func__);
@@ -931,7 +931,7 @@ ieee80211_mbuf_adjust(struct ieee80211vap *vap, int hdrsize,
 	 */
 	/* XXX check trailing space and copy instead? */
 	if (M_LEADINGSPACE(m) < needed_space - TO_BE_RECLAIMED) {
-		struct mbuf *n = m_gethdr(MB_DONTWAIT, m->m_type);
+		struct mbuf *n = m_gethdr(M_NOWAIT, m->m_type);
 		if (n == NULL) {
 			IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT,
 			    "%s: cannot expand storage\n", __func__);
@@ -1172,7 +1172,7 @@ ieee80211_encap(struct ieee80211vap *vap, struct ieee80211_node *ni,
 	}
 	datalen = m->m_pkthdr.len;		/* NB: w/o 802.11 header */
 
-	M_PREPEND(m, hdrspace + meshhdrsize, MB_DONTWAIT);
+	M_PREPEND(m, hdrspace + meshhdrsize, M_NOWAIT);
 	if (m == NULL) {
 		vap->iv_stats.is_tx_nobuf++;
 		goto bad;
@@ -1397,9 +1397,9 @@ ieee80211_fragment(struct ieee80211vap *vap, struct mbuf *m0,
 		KASSERT(fragsize < MCLBYTES,
 			("fragment size %u too big!", fragsize));
 		if (fragsize > MHLEN)
-			m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR);
+			m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		else
-			m = m_gethdr(MB_DONTWAIT, MT_DATA);
+			m = m_gethdr(M_NOWAIT, MT_DATA);
 		if (m == NULL)
 			goto bad;
 		/* leave room to prepend any cipher header */
@@ -1799,7 +1799,7 @@ ieee80211_send_probereq(struct ieee80211_node *ni,
 
 	KASSERT(M_LEADINGSPACE(m) >= sizeof(struct ieee80211_frame),
 	    ("leading space %zd", M_LEADINGSPACE(m)));
-	M_PREPEND(m, sizeof(struct ieee80211_frame), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ieee80211_frame), M_NOWAIT);
 	if (m == NULL) {
 		/* NB: cannot happen */
 		ieee80211_free_node(ni);
@@ -2423,7 +2423,7 @@ ieee80211_send_proberesp(struct ieee80211vap *vap,
 		return ENOMEM;
 	}
 
-	M_PREPEND(m, sizeof(struct ieee80211_frame), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ieee80211_frame), M_NOWAIT);
 	KASSERT(m != NULL, ("no room for header"));
 
 	ieee80211_send_setup(bss, m,
@@ -2456,7 +2456,7 @@ ieee80211_alloc_rts(struct ieee80211com *ic,
 	struct mbuf *m;
 
 	/* XXX honor ic_headroom */
-	m = m_gethdr(MB_DONTWAIT, MT_DATA);
+	m = m_gethdr(M_NOWAIT, MT_DATA);
 	if (m != NULL) {
 		rts = mtod(m, struct ieee80211_frame_rts *);
 		rts->i_fc[0] = IEEE80211_FC0_VERSION_0 |
@@ -2482,7 +2482,7 @@ ieee80211_alloc_cts(struct ieee80211com *ic,
 	struct mbuf *m;
 
 	/* XXX honor ic_headroom */
-	m = m_gethdr(MB_DONTWAIT, MT_DATA);
+	m = m_gethdr(M_NOWAIT, MT_DATA);
 	if (m != NULL) {
 		cts = mtod(m, struct ieee80211_frame_cts *);
 		cts->i_fc[0] = IEEE80211_FC0_VERSION_0 |
@@ -2783,7 +2783,7 @@ ieee80211_beacon_alloc(struct ieee80211_node *ni,
 	}
 	ieee80211_beacon_construct(m, frm, bo, ni);
 
-	M_PREPEND(m, sizeof(struct ieee80211_frame), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ieee80211_frame), M_NOWAIT);
 	KASSERT(m != NULL, ("no space for 802.11 header?"));
 	wh = mtod(m, struct ieee80211_frame *);
 	wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_MGT |
diff --git a/sys/netproto/802_11/wlan/ieee80211_superg.c b/sys/netproto/802_11/wlan/ieee80211_superg.c
index f32a332..dcf2aa2 100644
--- a/sys/netproto/802_11/wlan/ieee80211_superg.c
+++ b/sys/netproto/802_11/wlan/ieee80211_superg.c
@@ -299,7 +299,7 @@ ieee80211_ff_decap(struct ieee80211_node *ni, struct mbuf *m)
 		vap->iv_stats.is_ff_tooshort++;
 		return NULL;
 	}
-	n = m_split(m, framelen, MB_DONTWAIT);
+	n = m_split(m, framelen, M_NOWAIT);
 	if (n == NULL) {
 		IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 		    ni->ni_macaddr, "fast-frame",
@@ -352,7 +352,7 @@ ff_encap1(struct ieee80211vap *vap, struct mbuf *m,
 	llc->llc_snap.ether_type = eh->ether_type;
 	payload = m->m_pkthdr.len;		/* NB: w/o Ethernet header */
 
-	M_PREPEND(m, sizeof(struct ether_header), MB_DONTWAIT);
+	M_PREPEND(m, sizeof(struct ether_header), M_NOWAIT);
 	if (m == NULL) {		/* XXX cannot happen */
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_SUPERG,
 			"%s: no space for ether_header\n", __func__);
@@ -460,7 +460,7 @@ ieee80211_ff_encap(struct ieee80211vap *vap, struct mbuf *m1, int hdrspace,
 	 */
 	m->m_next = m2;			/* NB: last mbuf from above */
 	m1->m_pkthdr.len += m2->m_pkthdr.len;
-	M_PREPEND(m1, sizeof(uint32_t)+2, MB_DONTWAIT);
+	M_PREPEND(m1, sizeof(uint32_t)+2, M_NOWAIT);
 	if (m1 == NULL) {		/* XXX cannot happen */
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_SUPERG,
 		    "%s: no space for tunnel header\n", __func__);
@@ -469,7 +469,7 @@ ieee80211_ff_encap(struct ieee80211vap *vap, struct mbuf *m1, int hdrspace,
 	}
 	memset(mtod(m1, void *), 0, sizeof(uint32_t)+2);
 
-	M_PREPEND(m1, sizeof(struct llc), MB_DONTWAIT);
+	M_PREPEND(m1, sizeof(struct llc), M_NOWAIT);
 	if (m1 == NULL) {		/* XXX cannot happen */
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_SUPERG,
 		    "%s: no space for llc header\n", __func__);
diff --git a/sys/netproto/802_11/wlan/ieee80211_wds.c b/sys/netproto/802_11/wlan/ieee80211_wds.c
index d552e13..250b591 100644
--- a/sys/netproto/802_11/wlan/ieee80211_wds.c
+++ b/sys/netproto/802_11/wlan/ieee80211_wds.c
@@ -256,7 +256,7 @@ ieee80211_dwds_mcast(struct ieee80211vap *vap0, struct mbuf *m)
 		/*
 		 * Duplicate the frame and send it.
 		 */
-		mcopy = m_copypacket(m, MB_DONTWAIT);
+		mcopy = m_copypacket(m, M_NOWAIT);
 		if (mcopy == NULL) {
 			IFNET_STAT_INC(ifp, oerrors, 1);
 			/* XXX stat + msg */
diff --git a/sys/netproto/802_11/wlan_ccmp/ieee80211_crypto_ccmp.c b/sys/netproto/802_11/wlan_ccmp/ieee80211_crypto_ccmp.c
index 43e58d3..cf19fd4 100644
--- a/sys/netproto/802_11/wlan_ccmp/ieee80211_crypto_ccmp.c
+++ b/sys/netproto/802_11/wlan_ccmp/ieee80211_crypto_ccmp.c
@@ -150,7 +150,7 @@ ccmp_encap(struct ieee80211_key *k, struct mbuf *m, uint8_t keyid)
 	/*
 	 * Copy down 802.11 header and add the IV, KeyID, and ExtIV.
 	 */
-	M_PREPEND(m, ccmp.ic_header, MB_DONTWAIT);
+	M_PREPEND(m, ccmp.ic_header, M_NOWAIT);
 	if (m == NULL)
 		return 0;
 	ivp = mtod(m, uint8_t *);
diff --git a/sys/netproto/802_11/wlan_tkip/ieee80211_crypto_tkip.c b/sys/netproto/802_11/wlan_tkip/ieee80211_crypto_tkip.c
index ff2eba4..8b79762 100644
--- a/sys/netproto/802_11/wlan_tkip/ieee80211_crypto_tkip.c
+++ b/sys/netproto/802_11/wlan_tkip/ieee80211_crypto_tkip.c
@@ -178,7 +178,7 @@ tkip_encap(struct ieee80211_key *k, struct mbuf *m, uint8_t keyid)
 	/*
 	 * Copy down 802.11 header and add the IV, KeyID, and ExtIV.
 	 */
-	M_PREPEND(m, tkip.ic_header, MB_DONTWAIT);
+	M_PREPEND(m, tkip.ic_header, M_NOWAIT);
 	if (m == NULL)
 		return 0;
 	ivp = mtod(m, uint8_t *);
diff --git a/sys/netproto/802_11/wlan_wep/ieee80211_crypto_wep.c b/sys/netproto/802_11/wlan_wep/ieee80211_crypto_wep.c
index 78067f7..5549b32 100644
--- a/sys/netproto/802_11/wlan_wep/ieee80211_crypto_wep.c
+++ b/sys/netproto/802_11/wlan_wep/ieee80211_crypto_wep.c
@@ -134,7 +134,7 @@ wep_encap(struct ieee80211_key *k, struct mbuf *m, uint8_t keyid)
 	/*
 	 * Copy down 802.11 header and add the IV + KeyID.
 	 */
-	M_PREPEND(m, wep.ic_header, MB_DONTWAIT);
+	M_PREPEND(m, wep.ic_header, M_NOWAIT);
 	if (m == NULL)
 		return 0;
 	ivp = mtod(m, uint8_t *);
diff --git a/sys/netproto/ipsec/ipsec_input.c b/sys/netproto/ipsec/ipsec_input.c
index 5878b8c..615ac45 100644
--- a/sys/netproto/ipsec/ipsec_input.c
+++ b/sys/netproto/ipsec/ipsec_input.c
@@ -1,5 +1,4 @@
 /*	$FreeBSD: src/sys/netipsec/ipsec_input.c,v 1.2.4.2 2003/03/28 20:32:53 sam Exp $	*/
-/*	$DragonFly: src/sys/netproto/ipsec/ipsec_input.c,v 1.13 2008/05/27 01:10:44 dillon Exp $	*/
 /*	$OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -389,7 +388,7 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav,
 	 */
 	if (mt == NULL && sproto != IPPROTO_IPCOMP) {
 		mtag = m_tag_get(PACKET_TAG_IPSEC_IN_DONE,
-				 sizeof(struct tdb_ident), MB_DONTWAIT);
+				 sizeof(struct tdb_ident), M_NOWAIT);
 		if (mtag == NULL) {
 			DPRINTF(("ipsec4_common_input_cb: failed to get tag\n"));
 			IPSEC_ISTAT(sproto, espstat.esps_hdrops,
@@ -713,7 +712,7 @@ ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, int proto
 	 */
 	if (mt == NULL && sproto != IPPROTO_IPCOMP) {
 		mtag = m_tag_get(PACKET_TAG_IPSEC_IN_DONE,
-				 sizeof(struct tdb_ident), MB_DONTWAIT);
+				 sizeof(struct tdb_ident), M_NOWAIT);
 		if (mtag == NULL) {
 			DPRINTF(("ipsec_common_input_cb: failed to "
 			    "get tag\n"));
diff --git a/sys/netproto/ipsec/ipsec_mbuf.c b/sys/netproto/ipsec/ipsec_mbuf.c
index 4c75d70..501bd97 100644
--- a/sys/netproto/ipsec/ipsec_mbuf.c
+++ b/sys/netproto/ipsec/ipsec_mbuf.c
@@ -132,20 +132,20 @@ m_clone(struct mbuf *m0)
 			 * because M_MOVE_PKTHDR will smash the data
 			 * pointer and drop the M_EXT marker.
 			 */
-			MGETHDR(n, MB_DONTWAIT, m->m_type);
+			MGETHDR(n, M_NOWAIT, m->m_type);
 			if (n == NULL) {
 				m_freem(m0);
 				return (NULL);
 			}
 			M_MOVE_PKTHDR(n, m);
-			MCLGET(n, MB_DONTWAIT);
+			MCLGET(n, M_NOWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				m_freem(m0);
 				return (NULL);
 			}
 		} else {
-			n = m_getcl(MB_DONTWAIT, m->m_type, m->m_flags);
+			n = m_getcl(M_NOWAIT, m->m_type, m->m_flags);
 			if (n == NULL) {
 				m_freem(m0);
 				return (NULL);
@@ -177,7 +177,7 @@ m_clone(struct mbuf *m0)
 				break;
 			off += cc;
 
-			n = m_getcl(MB_DONTWAIT, m->m_type, m->m_flags);
+			n = m_getcl(M_NOWAIT, m->m_type, m->m_flags);
 			if (n == NULL) {
 				m_freem(mfirst);
 				m_freem(m0);
@@ -237,7 +237,7 @@ m_makespace(struct mbuf *m0, int skip, int hlen, int *off)
 		 *
 		 * NB: this ignores mbuf types.
 		 */
-		MGET(n, MB_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (n == NULL)
 			return (NULL);
 		n->m_next = m->m_next;		/* splice new mbuf */
@@ -265,7 +265,7 @@ m_makespace(struct mbuf *m0, int skip, int hlen, int *off)
 			if (remain + hlen > M_TRAILINGSPACE(n)) {
 				struct mbuf *n2;
 
-				MGET(n2, MB_DONTWAIT, MT_DATA);
+				MGET(n2, M_NOWAIT, MT_DATA);
 				/* NB: new mbuf is on chain, let caller free */
 				if (n2 == NULL)
 					return (NULL);
@@ -355,7 +355,7 @@ KASSERT(m0->m_next != NULL, ("m_pad: m0 null, len %u m_len %u", len, m0->m_len))
 
 	if (pad > M_TRAILINGSPACE(m0)) {
 		/* Add an mbuf to the chain. */
-		MGET(m1, MB_DONTWAIT, MT_DATA);
+		MGET(m1, M_NOWAIT, MT_DATA);
 		if (m1 == NULL) {
 			m_freem(m0);
 			DPRINTF(("m_pad: unable to get extra mbuf\n"));
diff --git a/sys/netproto/ipsec/ipsec_output.c b/sys/netproto/ipsec/ipsec_output.c
index d31f1b9..68d1c3e 100644
--- a/sys/netproto/ipsec/ipsec_output.c
+++ b/sys/netproto/ipsec/ipsec_output.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netipsec/ipsec_output.c,v 1.3.2.2 2003/03/28 20:32:53 sam Exp $
- * $DragonFly: src/sys/netproto/ipsec/ipsec_output.c,v 1.12 2008/05/27 01:10:44 dillon Exp $
  */
 
 /*
@@ -131,7 +130,7 @@ ipsec_process_done(struct mbuf *m, struct ipsecrequest *isr)
 	 * packet.
 	 */
 	mtag = m_tag_get(PACKET_TAG_IPSEC_OUT_DONE,
-			 sizeof(struct tdb_ident), MB_DONTWAIT);
+			 sizeof(struct tdb_ident), M_NOWAIT);
 	if (mtag == NULL) {
 		DPRINTF(("ipsec_process_done: could not get packet tag\n"));
 		error = ENOMEM;
@@ -487,7 +486,7 @@ ipsec6_splithdr(struct mbuf *m)
 	ip6 = mtod(m, struct ip6_hdr *);
 	hlen = sizeof(struct ip6_hdr);
 	if (m->m_len > hlen) {
-		MGETHDR(mh, MB_DONTWAIT, MT_HEADER);
+		MGETHDR(mh, M_NOWAIT, MT_HEADER);
 		if (!mh) {
 			m_freem(m);
 			return NULL;
@@ -598,7 +597,7 @@ ipsec6_encapsulate(struct mbuf *m, struct secasvar *sav)
 	plen = m->m_pkthdr.len;
 	if (M_LEADINGSPACE(m->m_next) < sizeof(struct ip6_hdr)) {
 		struct mbuf *n;
-		MGET(n, MB_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (!n) {
 			m_freem(m);
 			return ENOBUFS;
diff --git a/sys/netproto/ipsec/key.c b/sys/netproto/ipsec/key.c
index a7135ae..814f9be 100644
--- a/sys/netproto/ipsec/key.c
+++ b/sys/netproto/ipsec/key.c
@@ -1603,7 +1603,7 @@ key_gather_mbuf(struct mbuf *m, const struct sadb_msghdr *mhp,
 			if (len > MHLEN)
 				panic("assumption failed");
 #endif
-			MGETHDR(n, MB_DONTWAIT, MT_DATA);
+			MGETHDR(n, M_NOWAIT, MT_DATA);
 			if (!n)
 				goto fail;
 			n->m_len = len;
@@ -1622,7 +1622,7 @@ key_gather_mbuf(struct mbuf *m, const struct sadb_msghdr *mhp,
 			    mtod(n, caddr_t));
 		} else {
 			n = m_copym(m, mhp->extoff[idx], mhp->extlen[idx],
-			    MB_DONTWAIT);
+			    M_NOWAIT);
 		}
 		if (n == NULL)
 			goto fail;
@@ -2041,7 +2041,7 @@ key_spddelete2(struct socket *so, struct mbuf *m,
 
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
-	n = m_getb(len, MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	n = m_getb(len, M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (!n)
 		return key_senderror(so, m, ENOBUFS);
 	n->m_len = len;
@@ -2055,7 +2055,7 @@ key_spddelete2(struct socket *so, struct mbuf *m,
 #endif
 
 	n->m_next = m_copym(m, mhp->extoff[SADB_X_EXT_POLICY],
-	    mhp->extlen[SADB_X_EXT_POLICY], MB_DONTWAIT);
+	    mhp->extlen[SADB_X_EXT_POLICY], M_NOWAIT);
 	if (!n->m_next) {
 		m_freem(n);
 		return key_senderror(so, m, ENOBUFS);
@@ -3228,7 +3228,7 @@ key_setdumpsa(struct secasvar *sav, u_int8_t type, u_int8_t satype,
 		if ((!m && !p) || (m && p))
 			goto fail;
 		if (p && tres) {
-			M_PREPEND(tres, l, MB_DONTWAIT);
+			M_PREPEND(tres, l, M_NOWAIT);
 			if (!tres)
 				goto fail;
 			bcopy(p, mtod(tres, caddr_t), l);
@@ -3279,7 +3279,7 @@ key_setsadbmsg(u_int8_t type, u_int16_t tlen, u_int8_t satype, u_int32_t seq,
 	len = PFKEY_ALIGN8(sizeof(struct sadb_msg));
 	if (len > MCLBYTES)
 		return NULL;
-	m = m_getb(len, MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	m = m_getb(len, M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (!m)
 		return NULL;
 	m->m_pkthdr.len = m->m_len = len;
@@ -4313,7 +4313,7 @@ key_getspi(struct socket *so, struct mbuf *m, const struct sadb_msghdr *mhp)
 	    PFKEY_ALIGN8(sizeof(struct sadb_sa));
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
-	n = m_getb(len, MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	n = m_getb(len, M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (!n)
 		return key_senderror(so, m, ENOBUFS);
 	n->m_len = len;
@@ -5161,7 +5161,7 @@ key_getcomb_esp(void)
 			KASSERT(l <= MLEN,
 				("key_getcomb_esp: l=%u > MLEN=%lu",
 				l, (u_long) MLEN));
-			MGET(m, MB_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
@@ -5261,14 +5261,14 @@ key_getcomb_ah(void)
 			KASSERT(l <= MLEN,
 				("key_getcomb_ah: l=%u > MLEN=%lu",
 				l, (u_long) MLEN));
-			MGET(m, MB_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, MB_DONTWAIT);
+			M_PREPEND(m, l, M_NOWAIT);
 		if (!m)
 			return NULL;
 
@@ -5306,14 +5306,14 @@ key_getcomb_ipcomp(void)
 			KASSERT(l <= MLEN,
 				("key_getcomb_ipcomp: l=%u > MLEN=%lu",
 				l, (u_long) MLEN));
-			MGET(m, MB_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, MB_DONTWAIT);
+			M_PREPEND(m, l, M_NOWAIT);
 		if (!m)
 			return NULL;
 
@@ -5355,7 +5355,7 @@ key_getprop(const struct secasindex *saidx)
 
 	if (!m)
 		return NULL;
-	M_PREPEND(m, l, MB_DONTWAIT);
+	M_PREPEND(m, l, M_NOWAIT);
 	if (!m)
 		return NULL;
 
@@ -5843,7 +5843,7 @@ key_register(struct socket *so, struct mbuf *m,
 
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
-	n = m_getb(len, MB_DONTWAIT, MT_DATA, M_PKTHDR);
+	n = m_getb(len, M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (!n)
 		return key_senderror(so, m, ENOBUFS);
 	n->m_pkthdr.len = n->m_len = len;
@@ -6369,7 +6369,7 @@ key_parse(struct mbuf *m, struct socket *so)
 	if (m->m_next) {
 		struct mbuf *n;
 
-		n = m_getb(m->m_pkthdr.len, MB_DONTWAIT, MT_DATA, M_PKTHDR);
+		n = m_getb(m->m_pkthdr.len, M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (!n) {
 			m_freem(m);
 			return ENOBUFS;
@@ -6940,7 +6940,7 @@ key_alloc_mbuf(int l)
 
 	len = l;
 	while (len > 0) {
-		n = m_getb(len, MB_DONTWAIT, MT_DATA, 0);
+		n = m_getb(len, M_NOWAIT, MT_DATA, 0);
 		if (!n) {
 			m_freem(m);
 			return NULL;
diff --git a/sys/netproto/ipsec/keysock.c b/sys/netproto/ipsec/keysock.c
index 0808643..60c508c 100644
--- a/sys/netproto/ipsec/keysock.c
+++ b/sys/netproto/ipsec/keysock.c
@@ -141,7 +141,7 @@ key_sendup0(struct rawcb *rp, struct mbuf *m, int promisc)
 	if (promisc) {
 		struct sadb_msg *pmsg;
 
-		M_PREPEND(m, sizeof(struct sadb_msg), MB_DONTWAIT);
+		M_PREPEND(m, sizeof(struct sadb_msg), M_NOWAIT);
 		if (m && m->m_len < sizeof(struct sadb_msg))
 			m = m_pullup(m, sizeof(struct sadb_msg));
 		if (!m) {
@@ -213,7 +213,7 @@ key_sendup(struct socket *so, struct sadb_msg *msg, u_int len, int target)
 	while (tlen > 0) {
 		int nsize;
 
-		n = m_getl(tlen, MB_DONTWAIT, MT_DATA,
+		n = m_getl(tlen, M_NOWAIT, MT_DATA,
 			   (tlen == len) ? M_PKTHDR : 0, &nsize);
 		if (n == NULL) {
 			m_freem(m);
diff --git a/sys/netproto/ipsec/xform_ipip.c b/sys/netproto/ipsec/xform_ipip.c
index c8d9209..9a5d23c 100644
--- a/sys/netproto/ipsec/xform_ipip.c
+++ b/sys/netproto/ipsec/xform_ipip.c
@@ -427,7 +427,7 @@ ipip_output(
 			goto bad;
 		}
 
-		M_PREPEND(m, sizeof(struct ip), MB_DONTWAIT);
+		M_PREPEND(m, sizeof(struct ip), M_NOWAIT);
 		if (m == NULL) {
 			DPRINTF(("ipip_output: M_PREPEND failed\n"));
 			ipipstat.ipips_hdrops++;
@@ -511,7 +511,7 @@ ipip_output(
 		if (IN6_IS_SCOPE_LINKLOCAL(&ip6->ip6_dst))
 			ip6->ip6_dst.s6_addr16[1] = 0;
 
-		M_PREPEND(m, sizeof(struct ip6_hdr), MB_DONTWAIT);
+		M_PREPEND(m, sizeof(struct ip6_hdr), M_NOWAIT);
 		if (m == NULL) {
 			DPRINTF(("ipip_output: M_PREPEND failed\n"));
 			ipipstat.ipips_hdrops++;
diff --git a/sys/netproto/key/key.c b/sys/netproto/key/key.c
index fc9068d..c273dcc 100644
--- a/sys/netproto/key/key.c
+++ b/sys/netproto/key/key.c
@@ -1647,7 +1647,7 @@ key_gather_mbuf(struct mbuf *m, const struct sadb_msghdr *mhp,
 			if (len > MHLEN)
 				panic("assumption failed");
 #endif
-			MGETHDR(n, MB_DONTWAIT, MT_DATA);
+			MGETHDR(n, M_NOWAIT, MT_DATA);
 			if (!n)
 				goto fail;
 			n->m_len = len;
@@ -1666,7 +1666,7 @@ key_gather_mbuf(struct mbuf *m, const struct sadb_msghdr *mhp,
 			    mtod(n, caddr_t));
 		} else {
 			n = m_copym(m, mhp->extoff[idx], mhp->extlen[idx],
-			    MB_DONTWAIT);
+			    M_NOWAIT);
 		}
 		if (n == NULL)
 			goto fail;
@@ -2095,9 +2095,9 @@ key_spddelete2(struct socket *so, struct mbuf *m,
 
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
-	MGETHDR(n, MB_DONTWAIT, MT_DATA);
+	MGETHDR(n, M_NOWAIT, MT_DATA);
 	if (n && len > MHLEN) {
-		MCLGET(n, MB_DONTWAIT);
+		MCLGET(n, M_NOWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -2119,7 +2119,7 @@ key_spddelete2(struct socket *so, struct mbuf *m,
 #endif
 
 	n->m_next = m_copym(m, mhp->extoff[SADB_X_EXT_POLICY],
-	    mhp->extlen[SADB_X_EXT_POLICY], MB_DONTWAIT);
+	    mhp->extlen[SADB_X_EXT_POLICY], M_NOWAIT);
 	if (!n->m_next) {
 		m_freem(n);
 		return key_senderror(so, m, ENOBUFS);
@@ -3449,7 +3449,7 @@ key_setdumpsa(struct secasvar *sav, u_int8_t type, u_int8_t satype,
 		if ((!m && !p) || (m && p))
 			goto fail;
 		if (p && tres) {
-			M_PREPEND(tres, l, MB_DONTWAIT);
+			M_PREPEND(tres, l, M_NOWAIT);
 			if (!tres)
 				goto fail;
 			bcopy(p, mtod(tres, caddr_t), l);
@@ -3504,9 +3504,9 @@ key_setsadbmsg(u_int8_t type, u_int16_t tlen, u_int8_t satype,
 	len = PFKEY_ALIGN8(sizeof(struct sadb_msg));
 	if (len > MCLBYTES)
 		return NULL;
-	MGETHDR(m, MB_DONTWAIT, MT_DATA);
+	MGETHDR(m, M_NOWAIT, MT_DATA);
 	if (m && len > MHLEN) {
-		MCLGET(m, MB_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 		if ((m->m_flags & M_EXT) == 0) {
 			m_freem(m);
 			m = NULL;
@@ -4618,9 +4618,9 @@ key_getspi(struct socket *so, struct mbuf *m,
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
 
-	MGETHDR(n, MB_DONTWAIT, MT_DATA);
+	MGETHDR(n, M_NOWAIT, MT_DATA);
 	if (len > MHLEN) {
-		MCLGET(n, MB_DONTWAIT);
+		MCLGET(n, M_NOWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -5489,7 +5489,7 @@ key_getcomb_esp(void)
 			if (l > MLEN)
 				panic("assumption failed in key_getcomb_esp");
 #endif
-			MGET(m, MB_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
@@ -5573,14 +5573,14 @@ key_getcomb_ah(void)
 			if (l > MLEN)
 				panic("assumption failed in key_getcomb_ah");
 #endif
-			MGET(m, MB_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, MB_DONTWAIT);
+			M_PREPEND(m, l, M_NOWAIT);
 		if (!m)
 			return NULL;
 
@@ -5619,14 +5619,14 @@ key_getcomb_ipcomp(void)
 			if (l > MLEN)
 				panic("assumption failed in key_getcomb_ipcomp");
 #endif
-			MGET(m, MB_DONTWAIT, MT_DATA);
+			MGET(m, M_NOWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
 			}
 		} else
-			M_PREPEND(m, l, MB_DONTWAIT);
+			M_PREPEND(m, l, M_NOWAIT);
 		if (!m)
 			return NULL;
 
@@ -5671,7 +5671,7 @@ key_getprop(const struct secasindex *saidx)
 
 	if (!m)
 		return NULL;
-	M_PREPEND(m, l, MB_DONTWAIT);
+	M_PREPEND(m, l, M_NOWAIT);
 	if (!m)
 		return NULL;
 
@@ -6177,9 +6177,9 @@ key_register(struct socket *so, struct mbuf *m,
 	if (len > MCLBYTES)
 		return key_senderror(so, m, ENOBUFS);
 
-	MGETHDR(n, MB_DONTWAIT, MT_DATA);
+	MGETHDR(n, M_NOWAIT, MT_DATA);
 	if (len > MHLEN) {
-		MCLGET(n, MB_DONTWAIT);
+		MCLGET(n, M_NOWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			m_freem(n);
 			n = NULL;
@@ -6731,9 +6731,9 @@ key_parse(struct mbuf *m, struct socket *so)
 	if (m->m_next) {
 		struct mbuf *n;
 
-		MGETHDR(n, MB_DONTWAIT, MT_DATA);
+		MGETHDR(n, M_NOWAIT, MT_DATA);
 		if (n && m->m_pkthdr.len > MHLEN) {
-			MCLGET(n, MB_DONTWAIT);
+			MCLGET(n, M_NOWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				n = NULL;
@@ -7335,9 +7335,9 @@ key_alloc_mbuf(int l)
 
 	len = l;
 	while (len > 0) {
-		MGET(n, MB_DONTWAIT, MT_DATA);
+		MGET(n, M_NOWAIT, MT_DATA);
 		if (n && len > MLEN)
-			MCLGET(n, MB_DONTWAIT);
+			MCLGET(n, M_NOWAIT);
 		if (!n) {
 			m_freem(m);
 			return NULL;
diff --git a/sys/netproto/key/keysock.c b/sys/netproto/key/keysock.c
index 03065f1..b37fe11 100644
--- a/sys/netproto/key/keysock.c
+++ b/sys/netproto/key/keysock.c
@@ -138,7 +138,7 @@ key_sendup0(struct rawcb *rp, struct mbuf *m, int promisc)
 	if (promisc) {
 		struct sadb_msg *pmsg;
 
-		M_PREPEND(m, sizeof(struct sadb_msg), MB_DONTWAIT);
+		M_PREPEND(m, sizeof(struct sadb_msg), M_NOWAIT);
 		if (m && m->m_len < sizeof(struct sadb_msg))
 			m = m_pullup(m, sizeof(struct sadb_msg));
 		if (!m) {
@@ -213,10 +213,10 @@ key_sendup(struct socket *so, struct sadb_msg *msg, u_int len,
 	m = mprev = NULL;
 	while (tlen > 0) {
 		if (tlen == len) {
-			MGETHDR(n, MB_DONTWAIT, MT_DATA);
+			MGETHDR(n, M_NOWAIT, MT_DATA);
 			n->m_len = MHLEN;
 		} else {
-			MGET(n, MB_DONTWAIT, MT_DATA);
+			MGET(n, M_NOWAIT, MT_DATA);
 			n->m_len = MLEN;
 		}
 		if (!n) {
@@ -224,7 +224,7 @@ key_sendup(struct socket *so, struct sadb_msg *msg, u_int len,
 			return ENOBUFS;
 		}
 		if (tlen >= MCLBYTES) {	/*XXX better threshold? */
-			MCLGET(n, MB_DONTWAIT);
+			MCLGET(n, M_NOWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				m_freem(m);
diff --git a/sys/netproto/mpls/mpls_output.c b/sys/netproto/mpls/mpls_output.c
index 06946e3..a1d3785 100644
--- a/sys/netproto/mpls/mpls_output.c
+++ b/sys/netproto/mpls/mpls_output.c
@@ -27,8 +27,6 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $DragonFly: src/sys/netproto/mpls/mpls_output.c,v 1.2 2008/08/05 15:11:32 nant Exp $
  */
 
 #include <sys/param.h>
@@ -155,7 +153,7 @@ mpls_push(struct mbuf **m, mpls_label_t label, mpls_s_t s, mpls_exp_t exp, mpls_
 	struct mpls *mpls;
 	u_int32_t buf = 0;	/* Silence warning */
 
-	M_PREPEND(*m, sizeof(struct mpls), MB_DONTWAIT);
+	M_PREPEND(*m, sizeof(struct mpls), M_NOWAIT);
 	if (*m == NULL)
 		return (ENOBUFS);
 
diff --git a/sys/netproto/smb/smb_iod.c b/sys/netproto/smb/smb_iod.c
index 6282be4..136048e 100644
--- a/sys/netproto/smb/smb_iod.c
+++ b/sys/netproto/smb/smb_iod.c
@@ -272,7 +272,7 @@ smb_iod_sendrq(struct smbiod *iod, struct smb_rq *rqp)
 	}
 	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, MB_WAIT);
+	m = m_copym(rqp->sr_rq.mb_top, 0, M_COPYALL, M_WAITOK);
 	error = rqp->sr_lerror = m ? SMB_TRAN_SEND(vcp, m, td) : ENOBUFS;
 	if (error == 0) {
 		getnanotime(&rqp->sr_timesent);
diff --git a/sys/netproto/smb/smb_rq.c b/sys/netproto/smb/smb_rq.c
index 2b15329..6dc9ada 100644
--- a/sys/netproto/smb/smb_rq.c
+++ b/sys/netproto/smb/smb_rq.c
@@ -410,7 +410,7 @@ smb_t2_placedata(struct mbuf *mtop, u_int16_t offset, u_int16_t count,
 	struct mbuf *m, *m0;
 	int len;
 
-	m0 = m_split(mtop, offset, MB_WAIT);
+	m0 = m_split(mtop, offset, M_WAITOK);
 	if (m0 == NULL)
 		return EBADRPC;
 	for(len = 0, m = m0; m->m_next; m = m->m_next)
diff --git a/sys/netproto/smb/smb_trantcp.c b/sys/netproto/smb/smb_trantcp.c
index 05b0ca0..27e18d1 100644
--- a/sys/netproto/smb/smb_trantcp.c
+++ b/sys/netproto/smb/smb_trantcp.c
@@ -518,7 +518,7 @@ smb_nbst_send(struct smb_vc *vcp, struct mbuf *m0, struct thread *td)
 		error = ENOTCONN;
 		goto abort;
 	}
-	M_PREPEND(m0, 4, MB_TRYWAIT);
+	M_PREPEND(m0, 4, M_WAITOK);
 	if (m0 == NULL)
 		return ENOBUFS;
 	nb_sethdr(m0, NB_SSN_MESSAGE, m_fixhdr(m0) - 4);
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index e8fb839..b6f8c0e 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -34,7 +34,6 @@
  *
  *	@(#)mbuf.h	8.5 (Berkeley) 2/19/95
  * $FreeBSD: src/sys/sys/mbuf.h,v 1.44.2.17 2003/04/15 06:15:02 silby Exp $
- * $DragonFly: src/sys/sys/mbuf.h,v 1.54 2008/10/19 08:39:55 sephe Exp $
  */
 
 #ifndef _SYS_MBUF_H_
@@ -349,17 +348,9 @@ struct mbstat {
 };
 
 /*
- * Flags specifying how an allocation should be made.
+ * objcache(9) ocflags sanitizing
  */
-
-#define	MB_DONTWAIT	0x4
-#define	MB_TRYWAIT	0x8
-#define	MB_WAIT		MB_TRYWAIT
-
-/*
- * Mbuf to Malloc Flag Conversion.
- */
-#define	MBTOM(how)	((how) & MB_TRYWAIT ? M_WAITOK : M_NOWAIT)
+#define	MB_OCFLAG(how)	((how) & M_WAITOK ? M_WAITOK : M_NOWAIT)
 
 /*
  * These are identifying numbers passed to the m_mballoc_wait function,
@@ -461,7 +452,7 @@ struct mbstat {
 /*
  * Arrange to prepend space of size plen to mbuf m.
  * If a new mbuf must be allocated, how specifies whether to wait.
- * If how is MB_DONTWAIT and allocation fails, the original mbuf chain
+ * If how is M_NOWAIT and allocation fails, the original mbuf chain
  * is freed and m is set to NULL.
  */
 #define	M_PREPEND(m, plen, how) do {					\
@@ -484,7 +475,7 @@ struct mbstat {
 #define	M_COPYALL	1000000000
 
 /* Compatibility with 4.3 */
-#define	m_copy(m, o, l)	m_copym((m), (o), (l), MB_DONTWAIT)
+#define	m_copy(m, o, l)	m_copym((m), (o), (l), M_NOWAIT)
 
 #ifdef _KERNEL
 extern	u_int		 m_clalloc_wid;	/* mbuf cluster wait count */
diff --git a/sys/vfs/nfs/krpc_subr.c b/sys/vfs/nfs/krpc_subr.c
index 9f8bd66..f3b7031 100644
--- a/sys/vfs/nfs/krpc_subr.c
+++ b/sys/vfs/nfs/krpc_subr.c
@@ -149,7 +149,7 @@ krpc_portmap(struct sockaddr_in *sin,	/* server address */
 		return 0;
 	}
 
-	m = m_get(MB_WAIT, MT_DATA);
+	m = m_get(M_WAITOK, MT_DATA);
 	if (m == NULL)
 		return ENOBUFS;
 	sdata = mtod(m, struct sdata *);
@@ -274,7 +274,7 @@ krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func,
 	/*
 	 * Prepend RPC message header.
 	 */
-	mhead = m_gethdr(MB_WAIT, MT_DATA);
+	mhead = m_gethdr(M_WAITOK, MT_DATA);
 	mhead->m_next = *data;
 	call = mtod(mhead, struct rpc_call *);
 	mhead->m_len = sizeof(*call);
@@ -316,7 +316,7 @@ krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func,
 	timo = 0;
 	for (;;) {
 		/* Send RPC request (or re-send). */
-		m = m_copym(mhead, 0, M_COPYALL, MB_WAIT);
+		m = m_copym(mhead, 0, M_COPYALL, M_WAITOK);
 		if (m == NULL) {
 			error = ENOBUFS;
 			goto out;
@@ -471,7 +471,7 @@ xdr_string_encode(char *str, int len)
 	if (mlen > MCLBYTES)		/* If too big, we just can't do it. */
 		return (NULL);
 
-	m = m_getl(mlen, MB_WAIT, MT_DATA, 0, NULL);
+	m = m_getl(mlen, M_WAITOK, MT_DATA, 0, NULL);
 	xs = mtod(m, struct xdr_string *);
 	m->m_len = mlen;
 	xs->len = txdr_unsigned(len);
diff --git a/sys/vfs/nfs/nfs_mountrpc.c b/sys/vfs/nfs/nfs_mountrpc.c
index 0b5017a..7ab17c4 100644
--- a/sys/vfs/nfs/nfs_mountrpc.c
+++ b/sys/vfs/nfs/nfs_mountrpc.c
@@ -232,7 +232,7 @@ md_lookup_swap(struct sockaddr_in *mdsin,	/* mountd server address */
 		u_int32_t v3[21];
 	} fattribs;
 	
-	m = m_get(MB_WAIT,MT_DATA);
+	m = m_get(M_WAITOK,MT_DATA);
 	if (m == NULL)
 	  	return ENOBUFS;
 	
diff --git a/sys/vfs/nfs/nfs_serv.c b/sys/vfs/nfs/nfs_serv.c
index 25605f4..667ec6d 100644
--- a/sys/vfs/nfs/nfs_serv.c
+++ b/sys/vfs/nfs/nfs_serv.c
@@ -712,7 +712,7 @@ nfsrv_readlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 	len = 0;
 	i = 0;
 	while (len < NFS_MAXPATHLEN) {
-		mp1 = m_getcl(MB_WAIT, MT_DATA, 0);
+		mp1 = m_getcl(M_WAITOK, MT_DATA, 0);
 		mp1->m_len = MCLBYTES;
 		if (len == 0)
 			mp3 = mp2 = mp1;
@@ -913,7 +913,7 @@ nfsrv_read(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 				i++;
 			}
 			if (left > 0) {
-				m = m_getcl(MB_WAIT, MT_DATA, 0);
+				m = m_getcl(M_WAITOK, MT_DATA, 0);
 				m->m_len = 0;
 				m2->m_next = m;
 				m2 = m;
diff --git a/sys/vfs/nfs/nfs_socket.c b/sys/vfs/nfs/nfs_socket.c
index 8c81b5d..1883d9d 100644
--- a/sys/vfs/nfs/nfs_socket.c
+++ b/sys/vfs/nfs/nfs_socket.c
@@ -591,7 +591,7 @@ tryagain:
 			goto tryagain;
 		}
 		while (rep && (rep->r_flags & R_NEEDSXMIT)) {
-			m = m_copym(rep->r_mreq, 0, M_COPYALL, MB_WAIT);
+			m = m_copym(rep->r_mreq, 0, M_COPYALL, M_WAITOK);
 			nfsstats.rpcretries++;
 			error = nfs_send(so, rep->r_nmp->nm_nam, m, rep);
 			if (error) {
@@ -1237,7 +1237,7 @@ nfs_request_auth(struct nfsreq *rep)
 	 * For stream protocols, insert a Sun RPC Record Mark.
 	 */
 	if (nmp->nm_sotype == SOCK_STREAM) {
-		M_PREPEND(m, NFSX_UNSIGNED, MB_WAIT);
+		M_PREPEND(m, NFSX_UNSIGNED, M_WAITOK);
 		if (m == NULL) {
 			kfree(rep, M_NFSREQ);
 			return (ENOBUFS);
@@ -1328,7 +1328,7 @@ nfs_request_try(struct nfsreq *rep)
 		if (nmp->nm_soflags & PR_CONNREQUIRED)
 			error = nfs_sndlock(nmp, rep);
 		if (error == 0 && (rep->r_flags & R_NEEDSXMIT)) {
-			m2 = m_copym(rep->r_mreq, 0, M_COPYALL, MB_WAIT);
+			m2 = m_copym(rep->r_mreq, 0, M_COPYALL, M_WAITOK);
 			error = nfs_send(nmp->nm_so, nmp->nm_nam, m2, rep);
 			rep->r_flags &= ~R_NEEDSXMIT;
 			if ((rep->r_flags & R_SENT) == 0) {
@@ -1597,7 +1597,7 @@ nfs_rephead(int siz, struct nfsrv_descript *nd, struct nfssvc_sock *slp,
 	struct nfsm_info info;
 
 	siz += RPC_REPLYSIZ;
-	info.mb = m_getl(max_hdr + siz, MB_WAIT, MT_DATA, M_PKTHDR, NULL);
+	info.mb = m_getl(max_hdr + siz, M_WAITOK, MT_DATA, M_PKTHDR, NULL);
 	info.mreq = info.mb;
 	info.mreq->m_pkthdr.len = 0;
 	/*
@@ -1901,7 +1901,7 @@ nfs_timer_req(struct nfsreq *req)
 	 */
 	if (ssb_space(&so->so_snd) >= req->r_mreq->m_pkthdr.len &&
 	    (req->r_flags & (R_SENT | R_NEEDSXMIT)) &&
-	   (m = m_copym(req->r_mreq, 0, M_COPYALL, MB_DONTWAIT))){
+	   (m = m_copym(req->r_mreq, 0, M_COPYALL, M_NOWAIT))){
 		if ((nmp->nm_flag & NFSMNT_NOCONN) == 0)
 		    error = so_pru_send(so, 0, m, NULL, NULL, td);
 		else
@@ -2238,7 +2238,7 @@ nfs_rcvunlock(struct nfsmount *nmp)
  * not occur with NFS/UDP and is supposed to only occassionally occur
  * with TCP.  Use vfs.nfs.realign_count and realign_test to check this.
  *
- * NOTE!  MB_DONTWAIT cannot be used here.  The mbufs must be acquired
+ * NOTE!  M_NOWAIT cannot be used here.  The mbufs must be acquired
  *	  because the rpc request OR reply cannot be thrown away.  TCP NFS
  *	  mounts do not retry their RPCs unless the TCP connection itself
  *	  is dropped so throwing away a RPC will basically cause the NFS
@@ -2265,7 +2265,7 @@ nfs_realign(struct mbuf **pm, int hsiz)
 	 */
 	if (m) {
 		++nfs_realign_count;
-		n = m_dup_data(m, MB_WAIT);
+		n = m_dup_data(m, M_WAITOK);
 		m_freem(*pm);
 		*pm = n;
 	}
@@ -2531,7 +2531,7 @@ nfs_msg(struct thread *td, char *server, char *msg)
 
 /*
  * Socket upcall routine for nfsd sockets.  This runs in the protocol
- * thread and passes waitflag == MB_DONTWAIT.
+ * thread and passes waitflag == M_NOWAIT.
  */
 void
 nfsrv_rcv_upcall(struct socket *so, void *arg, int waitflag)
@@ -2554,7 +2554,7 @@ nfsrv_rcv_upcall(struct socket *so, void *arg, int waitflag)
 
 /*
  * Process new data on a receive socket.  Essentially do as much as we can
- * non-blocking, else punt and it will be called with MB_WAIT from an nfsd.
+ * non-blocking, else punt and it will be called with M_WAITOK from an nfsd.
  *
  * slp->ns_token is held on call
  */
@@ -2584,7 +2584,7 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag)
 	 *
 	 * Note that the same service socket can be dispatched to several
 	 * nfs servers simultaniously.  The tcp protocol callback calls us
-	 * with MB_DONTWAIT.  nfsd calls us with MB_WAIT (typically).
+	 * with M_NOWAIT.  nfsd calls us with M_WAITOK (typically).
 	 */
 	if (NFSRV_RECLIMIT(slp))
 		return;
@@ -2651,7 +2651,7 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag)
 						 NULL, &flags);
 			if (sio.sb_mb) {
 				struct nfsrv_rec *rec;
-				int mf = (waitflag & MB_DONTWAIT) ?
+				int mf = (waitflag & M_NOWAIT) ?
 					    M_NOWAIT : M_WAITOK;
 				rec = kmalloc(sizeof(struct nfsrv_rec),
 					     M_NFSRVDESC, mf);
@@ -2691,7 +2691,7 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag)
 	 */
 done:
 	/* XXX this code is currently not executed (nfsrv_rcv_upcall) */
-	if (waitflag == MB_DONTWAIT && (slp->ns_flag & SLP_ACTION_MASK)) {
+	if (waitflag == M_NOWAIT && (slp->ns_flag & SLP_ACTION_MASK)) {
 		lwkt_gettoken(&nfs_token);
 		nfsrv_wakenfsd(slp, nparallel_wakeup);
 		lwkt_reltoken(&nfs_token);
@@ -2809,7 +2809,7 @@ nfsrv_getstream(struct nfssvc_sock *slp, int waitflag, int *countp)
 	    *mpp = recm;
 	    if (slp->ns_flag & SLP_LASTFRAG) {
 		struct nfsrv_rec *rec;
-		int mf = (waitflag & MB_DONTWAIT) ? M_NOWAIT : M_WAITOK;
+		int mf = (waitflag & M_NOWAIT) ? M_NOWAIT : M_WAITOK;
 		rec = kmalloc(sizeof(struct nfsrv_rec), M_NFSRVDESC, mf);
 		if (!rec) {
 		    m_freem(slp->ns_frag);
diff --git a/sys/vfs/nfs/nfs_srvcache.c b/sys/vfs/nfs/nfs_srvcache.c
index 7214d52..3cdb711 100644
--- a/sys/vfs/nfs/nfs_srvcache.c
+++ b/sys/vfs/nfs/nfs_srvcache.c
@@ -210,7 +210,7 @@ loop:
 			} else if (rp->rc_flag & RC_REPMBUF) {
 				nfsstats.srvcache_nonidemdonehits++;
 				*repp = m_copym(rp->rc_reply, 0, M_COPYALL,
-						MB_WAIT);
+						M_WAITOK);
 				ret = RC_REPLY;
 			} else {
 				nfsstats.srvcache_idemdonehits++;
@@ -337,7 +337,7 @@ loop:
 						rp->rc_flag &= ~RC_REPMBUF;
 					}
 					rp->rc_reply = m_copym(repmbuf, 0,
-							M_COPYALL, MB_WAIT);
+							M_COPYALL, M_WAITOK);
 					rp->rc_flag |= RC_REPMBUF;
 				}
 			}
diff --git a/sys/vfs/nfs/nfs_syscalls.c b/sys/vfs/nfs/nfs_syscalls.c
index 2864ce6..459b3b9 100644
--- a/sys/vfs/nfs/nfs_syscalls.c
+++ b/sys/vfs/nfs/nfs_syscalls.c
@@ -527,7 +527,7 @@ nfssvc_nfsd(struct nfsd_srvargs *nsd, caddr_t argp, struct thread *td)
 						}
 						nfsrv_rcv(slp->ns_so,
 							  (caddr_t)slp,
-							  MB_WAIT);
+							  M_WAITOK);
 						nfs_slpunlock(slp);
 						break;
 					}
@@ -564,7 +564,7 @@ nfssvc_nfsd(struct nfsd_srvargs *nsd, caddr_t argp, struct thread *td)
 				if (NFSRV_RECLIMIT(slp) == 0 &&
 				    (slp->ns_flag & SLP_NEEDQ)) {
 					nfsrv_rcv(slp->ns_so, (caddr_t)slp,
-						  MB_WAIT);
+						  M_WAITOK);
 				}
 				nfs_slpunlock(slp);
 			}
@@ -712,7 +712,7 @@ nfssvc_nfsd(struct nfsd_srvargs *nsd, caddr_t argp, struct thread *td)
 			 * Record Mark.
 			 */
 			if (sotype == SOCK_STREAM) {
-				M_PREPEND(m, NFSX_UNSIGNED, MB_WAIT);
+				M_PREPEND(m, NFSX_UNSIGNED, M_WAITOK);
 				if (m == NULL) {
 					error = ENOBUFS;
 					slplocked = 0;
diff --git a/sys/vfs/nfs/nfsm_subs.c b/sys/vfs/nfs/nfsm_subs.c
index 2240b5b..92213c3 100644
--- a/sys/vfs/nfs/nfsm_subs.c
+++ b/sys/vfs/nfs/nfsm_subs.c
@@ -113,7 +113,7 @@ static u_int32_t nfs_xid = 0;
 void
 nfsm_reqhead(nfsm_info_t info, struct vnode *vp, u_long procid, int hsiz)
 {
-	info->mb = m_getl(hsiz, MB_WAIT, MT_DATA, 0, NULL);
+	info->mb = m_getl(hsiz, M_WAITOK, MT_DATA, 0, NULL);
 	info->mb->m_len = 0;
 	info->mreq = info->mb;
 	info->bpos = mtod(info->mb, caddr_t);
@@ -140,7 +140,7 @@ nfsm_rpchead(struct ucred *cr, int nmflag, int procid, int auth_type,
 
 	authsiz = nfsm_rndup(auth_len);
 	dsiz = authsiz + 10 * NFSX_UNSIGNED;
-	info.mb = m_getl(dsiz, MB_WAIT, MT_DATA, M_PKTHDR, NULL);
+	info.mb = m_getl(dsiz, M_WAITOK, MT_DATA, M_PKTHDR, NULL);
 	if (dsiz < MINCLSIZE) {
 		if (dsiz < MHLEN)
 			MH_ALIGN(info.mb, dsiz);
@@ -198,7 +198,8 @@ nfsm_rpchead(struct ucred *cr, int nmflag, int procid, int auth_type,
 		siz = auth_len;
 		while (siz > 0) {
 			if (M_TRAILINGSPACE(info.mb) == 0) {
-				mb2 = m_getl(siz, MB_WAIT, MT_DATA, 0, NULL);
+				mb2 = m_getl(siz, M_WAITOK, MT_DATA, 0,
+					     NULL);
 				mb2->m_len = 0;
 				info.mb->m_next = mb2;
 				info.mb = mb2;
@@ -229,7 +230,7 @@ nfsm_rpchead(struct ucred *cr, int nmflag, int procid, int auth_type,
 		siz = verf_len;
 		while (siz > 0) {
 			if (M_TRAILINGSPACE(info.mb) == 0) {
-				mb2 = m_getl(siz, MB_WAIT, MT_DATA,
+				mb2 = m_getl(siz, M_WAITOK, MT_DATA,
 						  0, NULL);
 				mb2->m_len = 0;
 				info.mb->m_next = mb2;
@@ -266,7 +267,7 @@ nfsm_build(nfsm_info_t info, int bytes)
 	void *ptr;
 
 	if (bytes > M_TRAILINGSPACE(info->mb)) {
-		MGET(mb2, MB_WAIT, MT_DATA);
+		MGET(mb2, M_WAITOK, MT_DATA);
 		if (bytes > MLEN)
 			panic("build > MLEN");
 		info->mb->m_next = mb2;
@@ -973,7 +974,7 @@ _nfsm_clget(nfsm_info_t info, struct mbuf **mp1, struct mbuf **mp2,
 	if (*bp >= *be) {
 		if (*mp1 == info->mb)
 			(*mp1)->m_len += *bp - info->bpos;
-		*mp1 = m_getcl(MB_WAIT, MT_DATA, 0);
+		*mp1 = m_getcl(M_WAITOK, MT_DATA, 0);
 		(*mp1)->m_len = MCLBYTES;
 		(*mp2)->m_next = *mp1;
 		*mp2 = *mp1;
@@ -1199,9 +1200,9 @@ nfsm_uiotombuf(struct uio *uiop, struct mbuf **mq, int siz, caddr_t *bpos)
 			mlen = M_TRAILINGSPACE(mp);
 			if (mlen == 0) {
 				if (getcluster)
-					mp = m_getcl(MB_WAIT, MT_DATA, 0);
+					mp = m_getcl(M_WAITOK, MT_DATA, 0);
 				else
-					mp = m_get(MB_WAIT, MT_DATA);
+					mp = m_get(M_WAITOK, MT_DATA);
 				mp->m_len = 0;
 				mp2->m_next = mp;
 				mp2 = mp;
@@ -1231,7 +1232,7 @@ nfsm_uiotombuf(struct uio *uiop, struct mbuf **mq, int siz, caddr_t *bpos)
 	}
 	if (rem > 0) {
 		if (rem > M_TRAILINGSPACE(mp)) {
-			MGET(mp, MB_WAIT, MT_DATA);
+			MGET(mp, M_WAITOK, MT_DATA);
 			mp->m_len = 0;
 			mp2->m_next = mp;
 		}
@@ -1273,9 +1274,9 @@ nfsm_biotombuf(struct bio *bio, struct mbuf **mq, int off,
 		mlen = M_TRAILINGSPACE(mp);
 		if (mlen == 0) {
 			if (getcluster)
-				mp = m_getcl(MB_WAIT, MT_DATA, 0);
+				mp = m_getcl(M_WAITOK, MT_DATA, 0);
 			else
-				mp = m_get(MB_WAIT, MT_DATA);
+				mp = m_get(M_WAITOK, MT_DATA);
 			mp->m_len = 0;
 			mp2->m_next = mp;
 			mp2 = mp;
@@ -1289,7 +1290,7 @@ nfsm_biotombuf(struct bio *bio, struct mbuf **mq, int off,
 	}
 	if (rem > 0) {
 		if (rem > M_TRAILINGSPACE(mp)) {
-			MGET(mp, MB_WAIT, MT_DATA);
+			MGET(mp, M_WAITOK, MT_DATA);
 			mp->m_len = 0;
 			mp2->m_next = mp;
 		}
@@ -1334,7 +1335,7 @@ nfsm_disct(struct mbuf **mdp, caddr_t *dposp, int siz, int left, caddr_t *cp2)
 	} else if (siz > MHLEN) {
 		panic("nfs S too big");
 	} else {
-		MGET(mp2, MB_WAIT, MT_DATA);
+		MGET(mp2, M_WAITOK, MT_DATA);
 		mp2->m_next = mp->m_next;
 		mp->m_next = mp2;
 		mp->m_len -= left;
@@ -1421,7 +1422,7 @@ nfsm_strtmbuf(struct mbuf **mb, char **bpos, const char *cp, long siz)
 	while (siz > 0) {
 		int msize;
 
-		m1 = m_getl(siz, MB_WAIT, MT_DATA, 0, &msize);
+		m1 = m_getl(siz, M_WAITOK, MT_DATA, 0, &msize);
 		m1->m_len = msize;
 		m2->m_next = m1;
 		m2 = m1;
diff --git a/tools/tools/netrate/pktgen/pktgen.c b/tools/tools/netrate/pktgen/pktgen.c
index d9897c9..d15129f 100644
--- a/tools/tools/netrate/pktgen/pktgen.c
+++ b/tools/tools/netrate/pktgen/pktgen.c
@@ -30,8 +30,6 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
- * $DragonFly: src/tools/tools/netrate/pktgen/pktgen.c,v 1.4 2008/04/02 14:18:55 sephe Exp $
  */
 
 #define _IP_VHL
@@ -442,7 +440,7 @@ pktgen_start_ifsq_handler(netmsg_t nmsg)
 	 */
 	next = &head;
 	for (i = 0; i < alloc_cnt; ++i) {
-		MGETHDR(m, MB_WAIT, MT_DATA);
+		MGETHDR(m, M_WAITOK, MT_DATA);
 		*next = m;
 		next = &m->m_nextpkt;
 	}
@@ -587,7 +585,7 @@ pktgen_buf_send(netmsg_t msg)
 	lwkt_replymsg(&pb->pb_nmsg.lmsg, 0);
 	crit_exit();
 
-	MGETHDR(m, MB_WAIT, MT_DATA);
+	MGETHDR(m, M_WAITOK, MT_DATA);
 	pktgen_mbuf(pb, m);
 	ifq_dispatch(pb->pb_ifp, m, NULL);
 }
@@ -624,7 +622,7 @@ pktgen_buf_free(void *arg)
 		return;
 	}
 
-	MGETHDR(m, MB_WAIT, MT_DATA);
+	MGETHDR(m, M_WAITOK, MT_DATA);
 	pktgen_mbuf(pb, m);
 	ifsq_enqueue(pb->pb_ifsq, m, NULL);
 }
-- 
1.9.3

