From 74f1caca3c87ec8cf73b235e9135f44a284d02d3 Mon Sep 17 00:00:00 2001 From: Eirik Nygaard Date: Wed, 2 Jun 2004 14:43:04 +0000 Subject: [PATCH] Change mbug allocation flags from M_ to MB_ to avoid confusion with malloc flags. Requested by: Jeffrey Hsu --- sys/bus/firewire/fwohci.c | 4 +- sys/contrib/dev/oltr/if_oltr.c | 10 ++--- sys/contrib/ipfilter/netinet/fil.c | 10 ++++- sys/contrib/ipfilter/netinet/ip_fil.c | 23 +++++++++- sys/dev/atm/en/midway.c | 16 +++---- sys/dev/crypto/hifn/hifn7751.c | 14 +++--- sys/dev/crypto/ubsec/ubsec.c | 14 +++--- sys/dev/misc/musycc/musycc.c | 12 +++--- sys/dev/netif/ar/if_ar.c | 6 +-- sys/dev/netif/aue/if_aue.c | 6 +-- sys/dev/netif/awi/awi.c | 22 +++++----- sys/dev/netif/awi/awi_wep.c | 12 +++--- sys/dev/netif/axe/if_axe.c | 4 +- sys/dev/netif/bfe/if_bfe.c | 4 +- sys/dev/netif/bge/if_bge.c | 8 ++-- sys/dev/netif/cm/smc90cx6.c | 6 +-- sys/dev/netif/cs/if_cs.c | 6 +-- sys/dev/netif/cue/if_cue.c | 6 +-- sys/dev/netif/cx/if_cx.c | 10 ++--- sys/dev/netif/dc/if_dc.c | 10 ++--- sys/dev/netif/de/if_de.c | 18 ++++---- sys/dev/netif/ed/if_ed.c | 6 +-- sys/dev/netif/el/if_el.c | 8 ++-- sys/dev/netif/em/if_em.c | 4 +- sys/dev/netif/ep/if_ep.c | 10 ++--- sys/dev/netif/ex/if_ex.c | 8 ++-- sys/dev/netif/fe/if_fe.c | 6 +-- sys/dev/netif/fwe/if_fwe.c | 10 +++-- sys/dev/netif/fxp/if_fxp.c | 8 ++-- sys/dev/netif/gx/if_gx.c | 6 +-- sys/dev/netif/ie/if_ie.c | 8 ++-- sys/dev/netif/kue/if_kue.c | 6 +-- sys/dev/netif/le/if_le.c | 8 ++-- sys/dev/netif/lge/if_lge.c | 4 +- sys/dev/netif/lnc/if_lnc.c | 16 +++---- sys/dev/netif/mn/if_mn.c | 16 +++---- sys/dev/netif/my/if_my.c | 10 ++--- sys/dev/netif/nge/if_nge.c | 4 +- sys/dev/netif/pcn/if_pcn.c | 6 +-- sys/dev/netif/pdq_layer/pdqvar.h | 6 +-- sys/dev/netif/ray/if_ray.c | 6 +-- sys/dev/netif/rdp/if_rdp.c | 6 +-- sys/dev/netif/rl/if_rl.c | 6 +-- sys/dev/netif/sbni/if_sbni.c | 6 +-- sys/dev/netif/sbsh/if_sbsh.c | 10 ++--- sys/dev/netif/sf/if_sf.c | 10 ++--- sys/dev/netif/sis/if_sis.c | 4 +- sys/dev/netif/sk/if_sk.c | 4 +- sys/dev/netif/sn/if_sn.c | 6 +-- sys/dev/netif/snc/dp83932.c | 8 ++-- sys/dev/netif/sr/if_sr.c | 6 +-- sys/dev/netif/ste/if_ste.c | 10 ++--- sys/dev/netif/ti/if_ti.c | 10 ++--- sys/dev/netif/tl/if_tl.c | 10 ++--- sys/dev/netif/tx/if_tx.c | 4 +- sys/dev/netif/tx/if_txvar.h | 6 +-- sys/dev/netif/txp/if_txp.c | 14 +++--- sys/dev/netif/vr/if_vr.c | 10 ++--- sys/dev/netif/vx/if_vx.c | 10 ++--- sys/dev/netif/wb/if_wb.c | 8 ++-- sys/dev/netif/wi/if_wi.c | 10 ++--- sys/dev/netif/wi/wi_hostap.c | 4 +- sys/dev/netif/wl/if_wl.c | 8 ++-- sys/dev/netif/wx/if_wx.c | 12 +++--- sys/dev/netif/xe/if_xe.c | 6 +-- sys/dev/netif/xl/if_xl.c | 8 ++-- sys/emulation/43bsd/43bsd_socket.c | 6 +-- sys/emulation/linux/linux_socket.c | 4 +- sys/emulation/svr4/svr4_stream.c | 4 +- sys/kern/uipc_mbuf.c | 52 +++++++++++------------ sys/kern/uipc_mbuf2.c | 10 ++--- sys/kern/uipc_socket.c | 22 +++++----- sys/kern/uipc_socket2.c | 10 ++--- sys/kern/uipc_syscalls.c | 8 ++-- sys/kern/uipc_usrreq.c | 4 +- sys/net/bpf.c | 6 +-- sys/net/bridge/bridge.c | 10 ++--- sys/net/bsd_comp.c | 18 ++++---- sys/net/ef/if_ef.c | 6 +-- sys/net/gre/if_gre.c | 6 +-- sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c | 4 +- sys/net/i4b/layer2/i4b_mbuf.c | 10 ++--- sys/net/if_arcsubr.c | 12 +++--- sys/net/if_atmsubr.c | 4 +- sys/net/if_ethersubr.c | 14 +++--- sys/net/if_fddisubr.c | 8 ++-- sys/net/if_iso88025subr.c | 6 +-- sys/net/if_loop.c | 4 +- sys/net/ip6fw/ip6_fw.c | 10 ++--- sys/net/ip_mroute/ip_mroute.c | 18 ++++---- sys/net/ipfw/ip_fw2.c | 4 +- sys/net/oldbridge/bridge.c | 10 ++--- sys/net/ppp/if_ppp.c | 10 ++--- sys/net/ppp_layer/ppp_deflate.c | 18 ++++---- sys/net/ppp_layer/ppp_tty.c | 10 ++--- sys/net/raw_cb.c | 4 +- sys/net/route.c | 4 +- sys/net/rtsock.c | 6 +-- sys/net/sl/if_sl.c | 8 ++-- sys/net/sppp/if_spppsubr.c | 12 +++--- sys/net/stf/if_stf.c | 4 +- sys/net/tap/if_tap.c | 6 +-- sys/net/tun/if_tun.c | 10 ++--- sys/net/vlan/if_vlan.c | 4 +- sys/netgraph/UI/ng_UI.c | 4 +- sys/netgraph/cisco/ng_cisco.c | 6 +-- sys/netgraph/ether/ng_ether.c | 4 +- sys/netgraph/frame_relay/ng_frame_relay.c | 4 +- sys/netgraph/l2tp/ng_l2tp.c | 16 +++---- sys/netgraph/lmi/ng_lmi.c | 4 +- sys/netgraph/ppp/ng_ppp.c | 6 +-- sys/netgraph/pppoe/ng_pppoe.c | 18 ++++---- sys/netgraph/pptpgre/ng_pptpgre.c | 6 +-- sys/netgraph/rfc1490/ng_rfc1490.c | 6 +-- sys/netgraph/tty/ng_tty.c | 4 +- sys/netgraph/vjc/ng_vjc.c | 6 +-- sys/netinet/if_ether.c | 4 +- sys/netinet/igmp.c | 6 +-- sys/netinet/in_gif.c | 4 +- sys/netinet/ip_encap.c | 4 +- sys/netinet/ip_icmp.c | 6 +-- sys/netinet/ip_input.c | 12 +++--- sys/netinet/ip_output.c | 12 +++--- sys/netinet/raw_ip.c | 6 +-- sys/netinet/tcp_output.c | 8 ++-- sys/netinet/tcp_subr.c | 8 ++-- sys/netinet/tcp_syncache.c | 4 +- sys/netinet/udp_usrreq.c | 4 +- sys/netinet6/ah_core.c | 18 ++++---- sys/netinet6/ah_input.c | 6 +-- sys/netinet6/ah_output.c | 8 ++-- sys/netinet6/esp_core.c | 10 ++--- sys/netinet6/esp_input.c | 8 ++-- sys/netinet6/esp_output.c | 8 ++-- sys/netinet6/frag6.c | 4 +- sys/netinet6/icmp6.c | 38 ++++++++--------- sys/netinet6/in6_gif.c | 4 +- sys/netinet6/ip6_input.c | 12 +++--- sys/netinet6/ip6_mroute.c | 4 +- sys/netinet6/ip6_output.c | 26 ++++++------ sys/netinet6/ipcomp_core.c | 6 +-- sys/netinet6/ipcomp_output.c | 8 ++-- sys/netinet6/ipsec.c | 20 ++++----- sys/netinet6/mld6.c | 6 +-- sys/netinet6/nd6_nbr.c | 10 ++--- sys/netinet6/raw_ip6.c | 4 +- sys/netinet6/udp6_output.c | 4 +- sys/netproto/atalk/aarp.c | 12 +++--- sys/netproto/atalk/ddp_output.c | 6 +-- sys/netproto/atm/port.h | 6 +-- sys/netproto/ipsec/ipsec_mbuf.c | 16 +++---- sys/netproto/ipsec/ipsec_output.c | 6 +-- sys/netproto/ipsec/key.c | 46 ++++++++++---------- sys/netproto/ipsec/keysock.c | 10 ++--- sys/netproto/ipsec/xform_ipip.c | 6 +-- sys/netproto/ipx/ipx_input.c | 4 +- sys/netproto/ipx/ipx_ip.c | 8 ++-- sys/netproto/ipx/ipx_outputfl.c | 4 +- sys/netproto/ipx/ipx_usrreq.c | 6 +-- sys/netproto/ipx/spx_usrreq.c | 14 +++--- sys/netproto/key/key.c | 46 ++++++++++---------- sys/netproto/key/keysock.c | 10 ++--- sys/netproto/ncp/ncp_rq.c | 18 ++++---- sys/netproto/ncp/ncp_sock.c | 4 +- sys/netproto/ns/idp_usrreq.c | 8 ++-- sys/netproto/ns/ns_error.c | 4 +- sys/netproto/ns/ns_input.c | 4 +- sys/netproto/ns/ns_ip.c | 8 ++-- sys/netproto/ns/ns_pcb.c | 4 +- sys/netproto/ns/spp_usrreq.c | 20 ++++----- sys/netproto/smb/smb_iod.c | 4 +- sys/netproto/smb/smb_rq.c | 4 +- sys/netproto/smb/smb_trantcp.c | 4 +- sys/sys/mbuf.h | 14 +++--- sys/vfs/nfs/bootp_subr.c | 4 +- sys/vfs/nfs/krpc_subr.c | 12 +++--- sys/vfs/nfs/nfs_nqlease.c | 6 +-- sys/vfs/nfs/nfs_serv.c | 10 ++--- sys/vfs/nfs/nfs_socket.c | 30 ++++++------- sys/vfs/nfs/nfs_srvcache.c | 6 +-- sys/vfs/nfs/nfs_subs.c | 30 ++++++------- sys/vfs/nfs/nfs_syscalls.c | 6 +-- sys/vfs/nfs/nfsm_subs.h | 8 ++-- 183 files changed, 871 insertions(+), 842 deletions(-) diff --git a/sys/bus/firewire/fwohci.c b/sys/bus/firewire/fwohci.c index d69fe7ef35..3086d25580 100644 --- a/sys/bus/firewire/fwohci.c +++ b/sys/bus/firewire/fwohci.c @@ -33,7 +33,7 @@ * * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.72 2004/01/22 14:41:17 simokawa Exp $ * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.1.2.19 2003/05/01 06:24:37 simokawa Exp $ - * $DragonFly: src/sys/bus/firewire/fwohci.c,v 1.7 2004/04/07 05:54:27 dillon Exp $ + * $DragonFly: src/sys/bus/firewire/fwohci.c,v 1.8 2004/06/02 14:42:48 eirikn Exp $ */ #define ATRQ_CH 0 @@ -944,7 +944,7 @@ again: if (firewire_debug) device_printf(sc->fc.dev, "EFBIG.\n"); - m0 = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + m0 = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR); if (m0 != NULL) { m_copydata(xfer->mbuf, 0, xfer->mbuf->m_pkthdr.len, diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c index 99f98db62e..f450a7b43f 100644 --- a/sys/contrib/dev/oltr/if_oltr.c +++ b/sys/contrib/dev/oltr/if_oltr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.11.2.5 2001/10/20 04:15:21 mdodd Exp $ - * $DragonFly: src/sys/contrib/dev/oltr/Attic/if_oltr.c,v 1.11 2004/04/01 07:27:16 joerg Exp $ + * $DragonFly: src/sys/contrib/dev/oltr/Attic/if_oltr.c,v 1.12 2004/06/02 14:42:48 eirikn Exp $ */ #include @@ -1395,14 +1395,14 @@ DriverReceiveFrameCompleted(void *DriverHandle, int ByteCount, int FragmentCount if (sc->state > OL_CLOSED) { if (ReceiveStatus == TRLLD_RCV_OK) { - MGETHDR(m0, M_DONTWAIT, MT_DATA); + MGETHDR(m0, MB_DONTWAIT, MT_DATA); mbuf_size = MHLEN - 2; if (!m0) { ifp->if_ierrors++; goto dropped; } if (ByteCount + 2 > MHLEN) { - MCLGET(m0, M_DONTWAIT); + MCLGET(m0, MB_DONTWAIT); mbuf_size = MCLBYTES - 2; if (!(m0->m_flags & M_EXT)) { m_freem(m0); @@ -1437,7 +1437,7 @@ DriverReceiveFrameCompleted(void *DriverHandle, int ByteCount, int FragmentCount frag_offset = 0; } if ((mbuf_offset == mbuf_size) && (frame_len > 0)) { - MGET(m1, M_DONTWAIT, MT_DATA); + MGET(m1, MB_DONTWAIT, MT_DATA); mbuf_size = MHLEN; if (!m1) { ifp->if_ierrors++; @@ -1445,7 +1445,7 @@ DriverReceiveFrameCompleted(void *DriverHandle, int ByteCount, int FragmentCount goto dropped; } if (frame_len > MHLEN) { - MCLGET(m1, M_DONTWAIT); + MCLGET(m1, MB_DONTWAIT); mbuf_size = MCLBYTES; if (!(m1->m_flags & M_EXT)) { m_freem(m0); diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c index ada34cfb3b..db340914e9 100644 --- a/sys/contrib/ipfilter/netinet/fil.c +++ b/sys/contrib/ipfilter/netinet/fil.c @@ -5,7 +5,7 @@ * * @(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed * $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.23.2.6 2003/03/01 03:55:54 darrenr Exp $ - * $DragonFly: src/sys/contrib/ipfilter/netinet/fil.c,v 1.7 2004/02/14 21:12:38 dillon Exp $ + * $DragonFly: src/sys/contrib/ipfilter/netinet/fil.c,v 1.8 2004/06/02 14:42:48 eirikn Exp $ */ #if defined(__sgi) && (IRIX > 602) # include @@ -1595,7 +1595,11 @@ m_copyback(m0, off, len, cp) off -= mlen; totlen += mlen; if (m->m_next == 0) { +#ifdef __DragonFly__ + n = m_getclr(MB_DONTWAIT, m->m_type); +#else n = m_getclr(M_DONTWAIT, m->m_type); +#endif if (n == 0) goto out; n->m_len = min(MLEN, len + off); @@ -1614,7 +1618,11 @@ m_copyback(m0, off, len, cp) if (len == 0) break; if (m->m_next == 0) { +#ifdef __DragonFly__ + n = m_get(MB_DONTWAIT, m->m_type); +#else n = m_get(M_DONTWAIT, m->m_type); +#endif if (n == 0) break; n->m_len = min(MLEN, len); diff --git a/sys/contrib/ipfilter/netinet/ip_fil.c b/sys/contrib/ipfilter/netinet/ip_fil.c index aafe41ceac..c3f9f24909 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil.c +++ b/sys/contrib/ipfilter/netinet/ip_fil.c @@ -6,7 +6,7 @@ * @(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed * @(#)$Id: ip_fil.c,v 2.42.2.60 2002/08/28 12:40:39 darrenr Exp $ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.25.2.6 2003/03/01 03:55:54 darrenr Exp $ - * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.10 2004/02/14 21:12:38 dillon Exp $ + * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.11 2004/06/02 14:42:48 eirikn Exp $ */ #ifndef SOLARIS #define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4))) @@ -1241,6 +1241,8 @@ fr_info_t *fin; return -1; /* feedback loop */ # if (BSD < 199306) || defined(__sgi) m = m_get(M_DONTWAIT, MT_HEADER); +# elif defined(__DragonFly__) + m = m_get(MB_DONTWAIT, MT_HEADER); # else m = m_gethdr(M_DONTWAIT, MT_HEADER); # endif @@ -1419,6 +1421,9 @@ int dst; # if (BSD < 199306) || defined(__sgi) avail = MLEN; m = m_get(M_DONTWAIT, MT_HEADER); +# elif defined(__DragonFly__) + avail = MHLEN; + m = m_gethdr(MB_DONTWAIT, MT_HEADER); # else avail = MHLEN; m = m_gethdr(M_DONTWAIT, MT_HEADER); @@ -1445,11 +1450,19 @@ int dst; if (type == ICMP6_DST_UNREACH) code = icmptoicmp6unreach[code]; +#ifdef __DragonFly__ + MGETHDR(m, MB_DONTWAIT, MT_HEADER); +#else MGETHDR(m, M_DONTWAIT, MT_HEADER); +#endif if (!m) return ENOBUFS; +#ifdef __DragonFly__ + MCLGET(m, MB_DONTWAIT); +#else MCLGET(m, M_DONTWAIT); +#endif if ((m->m_flags & M_EXT) == 0) { m_freem(m); return ENOBUFS; @@ -1645,7 +1658,11 @@ frdest_t *fdp; * problem. */ if (M_WRITABLE(m) == 0) { +#ifdef __DragonFly__ + if ((m0 = m_dup(m, MB_DONTWAIT)) != NULL) { +#else if ((m0 = m_dup(m, M_DONTWAIT)) != NULL) { +#endif m_freem(*mpp); *mpp = m0; m = m0; @@ -1827,7 +1844,9 @@ frdest_t *fdp; m0 = m; mhlen = sizeof (struct ip); for (off = hlen + len; off < ip->ip_len; off += len) { -# ifdef MGETHDR +# ifdef __DragonFly__ + MGETHDR(m, MB_DONTWAIT, MT_HEADER); +# elif defined(MGETHDR) MGETHDR(m, M_DONTWAIT, MT_HEADER); # else MGET(m, M_DONTWAIT, MT_HEADER); diff --git a/sys/dev/atm/en/midway.c b/sys/dev/atm/en/midway.c index 141d239d35..e4c396efaa 100644 --- a/sys/dev/atm/en/midway.c +++ b/sys/dev/atm/en/midway.c @@ -33,7 +33,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/en/midway.c,v 1.19.2.1 2003/01/23 21:06:42 sam Exp $ - * $DragonFly: src/sys/dev/atm/en/midway.c,v 1.9 2004/04/01 07:27:16 joerg Exp $ + * $DragonFly: src/sys/dev/atm/en/midway.c,v 1.10 2004/06/02 14:42:48 eirikn Exp $ */ /* @@ -597,7 +597,7 @@ u_int totlen, *drqneed; struct mbuf *top, **mp; *drqneed = 0; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) return(NULL); m->m_pkthdr.rcvif = &sc->enif; @@ -609,7 +609,7 @@ u_int totlen, *drqneed; /* if (top != NULL) then we've already got 1 mbuf on the chain */ while (totlen > 0) { if (top) { - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (!m) { m_freem(top); return(NULL); /* out of mbufs */ @@ -617,7 +617,7 @@ u_int totlen, *drqneed; m->m_len = MLEN; } if (totlen >= MINCLSIZE) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_free(m); m_freem(top); @@ -1767,12 +1767,12 @@ struct mbuf **mm, *prev; m->m_data = (caddr_t)d; } else { /* can't write to an M_EXT mbuf since it may be shared */ - MGET(new, M_DONTWAIT, MT_DATA); + MGET(new, MB_DONTWAIT, MT_DATA); if (!new) { EN_COUNT(sc->mfixfail); return(0); } - MCLGET(new, M_DONTWAIT); + MCLGET(new, MB_DONTWAIT); if ((new->m_flags & M_EXT) == 0) { m_free(new); EN_COUNT(sc->mfixfail); @@ -1834,14 +1834,14 @@ STATIC int en_makeexclusive(sc, mm, prev) if (mclrefcnt[mtocl(m->m_ext.ext_buf)] > 1) { /* make a real copy of the M_EXT mbuf since it is shared */ - MGET(new, M_DONTWAIT, MT_DATA); + MGET(new, MB_DONTWAIT, MT_DATA); if (!new) { EN_COUNT(sc->mfixfail); return(0); } if (m->m_flags & M_PKTHDR) M_MOVE_PKTHDR(new, m); - MCLGET(new, M_DONTWAIT); + MCLGET(new, MB_DONTWAIT); if ((new->m_flags & M_EXT) == 0) { m_free(new); EN_COUNT(sc->mfixfail); diff --git a/sys/dev/crypto/hifn/hifn7751.c b/sys/dev/crypto/hifn/hifn7751.c index 1f6afc0993..5b6aadad1b 100644 --- a/sys/dev/crypto/hifn/hifn7751.c +++ b/sys/dev/crypto/hifn/hifn7751.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.5.2.5 2003/06/04 17:56:59 sam Exp $ */ -/* $DragonFly: src/sys/dev/crypto/hifn/hifn7751.c,v 1.6 2004/05/13 19:44:31 dillon Exp $ */ +/* $DragonFly: src/sys/dev/crypto/hifn/hifn7751.c,v 1.7 2004/06/02 14:42:48 eirikn Exp $ */ /* $OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $ */ /* @@ -1699,14 +1699,14 @@ hifn_crypto( totlen = cmd->src_mapsize; if (cmd->src_m->m_flags & M_PKTHDR) { len = MHLEN; - MGETHDR(m0, M_DONTWAIT, MT_DATA); - if (m0 && !m_dup_pkthdr(m0, cmd->src_m, M_DONTWAIT)) { + MGETHDR(m0, MB_DONTWAIT, MT_DATA); + if (m0 && !m_dup_pkthdr(m0, cmd->src_m, MB_DONTWAIT)) { m_free(m0); m0 = NULL; } } else { len = MLEN; - MGET(m0, M_DONTWAIT, MT_DATA); + MGET(m0, MB_DONTWAIT, MT_DATA); } if (m0 == NULL) { hifnstats.hst_nomem_mbuf++; @@ -1714,7 +1714,7 @@ hifn_crypto( goto err_srcmap; } if (totlen >= MINCLSIZE) { - MCLGET(m0, M_DONTWAIT); + MCLGET(m0, MB_DONTWAIT); if ((m0->m_flags & M_EXT) == 0) { hifnstats.hst_nomem_mcl++; err = dma->cmdu ? ERESTART : ENOMEM; @@ -1728,7 +1728,7 @@ hifn_crypto( mlast = m0; while (totlen > 0) { - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { hifnstats.hst_nomem_mbuf++; err = dma->cmdu ? ERESTART : ENOMEM; @@ -1737,7 +1737,7 @@ hifn_crypto( } len = MLEN; if (totlen >= MINCLSIZE) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { hifnstats.hst_nomem_mcl++; err = dma->cmdu ? ERESTART : ENOMEM; diff --git a/sys/dev/crypto/ubsec/ubsec.c b/sys/dev/crypto/ubsec/ubsec.c index 5c76cf6ff2..e86b367a94 100644 --- a/sys/dev/crypto/ubsec/ubsec.c +++ b/sys/dev/crypto/ubsec/ubsec.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.12 2003/06/04 17:56:59 sam Exp $ */ -/* $DragonFly: src/sys/dev/crypto/ubsec/ubsec.c,v 1.5 2004/05/13 19:44:31 dillon Exp $ */ +/* $DragonFly: src/sys/dev/crypto/ubsec/ubsec.c,v 1.6 2004/06/02 14:42:49 eirikn Exp $ */ /* $OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $ */ /* @@ -1330,14 +1330,14 @@ ubsec_process(void *arg, struct cryptop *crp, int hint) totlen = q->q_src_mapsize; if (q->q_src_m->m_flags & M_PKTHDR) { len = MHLEN; - MGETHDR(m, M_DONTWAIT, MT_DATA); - if (m && !m_dup_pkthdr(m, q->q_src_m, M_DONTWAIT)) { + MGETHDR(m, MB_DONTWAIT, MT_DATA); + if (m && !m_dup_pkthdr(m, q->q_src_m, MB_DONTWAIT)) { m_free(m); m = NULL; } } else { len = MLEN; - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); } if (m == NULL) { ubsecstats.hst_nombuf++; @@ -1345,7 +1345,7 @@ ubsec_process(void *arg, struct cryptop *crp, int hint) goto errout; } if (totlen >= MINCLSIZE) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_free(m); ubsecstats.hst_nomcl++; @@ -1360,7 +1360,7 @@ ubsec_process(void *arg, struct cryptop *crp, int hint) while (totlen > 0) { if (top) { - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { m_freem(top); ubsecstats.hst_nombuf++; @@ -1370,7 +1370,7 @@ ubsec_process(void *arg, struct cryptop *crp, int hint) len = MLEN; } if (top && totlen >= MINCLSIZE) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { *mp = m; m_freem(top); diff --git a/sys/dev/misc/musycc/musycc.c b/sys/dev/misc/musycc/musycc.c index af6db8ec5a..793005a19d 100644 --- a/sys/dev/misc/musycc/musycc.c +++ b/sys/dev/misc/musycc/musycc.c @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/sys/dev/musycc/musycc.c,v 1.17.2.3 2001/03/13 22:05:36 phk Exp $ - * $DragonFly: src/sys/dev/misc/musycc/musycc.c,v 1.4 2003/08/07 21:16:57 dillon Exp $ + * $DragonFly: src/sys/dev/misc/musycc/musycc.c,v 1.5 2004/06/02 14:42:49 eirikn Exp $ * * * @@ -696,9 +696,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, M_DONTWAIT, MT_DATA); + MGETHDR(m2, MB_DONTWAIT, MT_DATA); if (m2 != NULL) { - MCLGET(m2, M_DONTWAIT); + MCLGET(m2, MB_DONTWAIT); if((m2->m_flags & M_EXT) != 0) { /* Substitute the mbuf+cluster. */ md->m = m2; @@ -1281,13 +1281,13 @@ musycc_connect(hook_p hook) sc->mdt[ch][i].m = NULL; sc->mdt[ch][i].data = 0; - MGETHDR(m, M_WAIT, MT_DATA); + MGETHDR(m, MB_WAIT, MT_DATA); if (m == NULL) goto errfree; - MCLGET(m, M_WAIT); + MCLGET(m, MB_WAIT); if ((m->m_flags & M_EXT) == 0) { /* We've waited mbuf_wait and still got nothing. - We're calling with M_TRYWAIT anyway - a little + We're calling with MB_TRYWAIT anyway - a little defensive programming costs us very little - if anything at all in the case of error. */ m_free(m); diff --git a/sys/dev/netif/ar/if_ar.c b/sys/dev/netif/ar/if_ar.c index cdc56788ec..c4b4639f3b 100644 --- a/sys/dev/netif/ar/if_ar.c +++ b/sys/dev/netif/ar/if_ar.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ar/if_ar.c,v 1.52.2.1 2002/06/17 15:10:57 jhay Exp $ - * $DragonFly: src/sys/dev/netif/ar/if_ar.c,v 1.8 2004/04/07 05:45:24 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ar/if_ar.c,v 1.9 2004/06/02 14:42:49 eirikn Exp $ */ /* @@ -1677,7 +1677,7 @@ ar_get_packets(struct ar_softc *sc) while(ar_packet_avail(sc, &len, &rxstat)) { TRC(printf("apa: len %d, rxstat %x\n", len, rxstat)); if(((rxstat & SCA_DESC_ERRORS) == 0) && (len < MCLBYTES)) { - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if(m == NULL) { /* eat packet if get mbuf fail!! */ ar_eat_packet(sc, 1); @@ -1692,7 +1692,7 @@ ar_get_packets(struct ar_softc *sc) #endif /* NETGRAPH */ m->m_pkthdr.len = m->m_len = len; if(len > MHLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if((m->m_flags & M_EXT) == 0) { m_freem(m); ar_eat_packet(sc, 1); diff --git a/sys/dev/netif/aue/if_aue.c b/sys/dev/netif/aue/if_aue.c index a503bc03fb..c289f55213 100644 --- a/sys/dev/netif/aue/if_aue.c +++ b/sys/dev/netif/aue/if_aue.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.78 2003/12/17 14:23:07 sanpei Exp $ - * $DragonFly: src/sys/dev/netif/aue/if_aue.c,v 1.10 2004/04/07 05:45:25 dillon Exp $ + * $DragonFly: src/sys/dev/netif/aue/if_aue.c,v 1.11 2004/06/02 14:42:49 eirikn Exp $ * * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.19.2.18 2003/06/14 15:56:48 trhodes Exp $ */ @@ -828,14 +828,14 @@ aue_newbuf(struct aue_softc *sc, struct aue_chain *c, struct mbuf *m) struct mbuf *m_new = NULL; if (m == NULL) { - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) { printf("aue%d: no memory for rx list " "-- packet dropped!\n", sc->aue_unit); return (ENOBUFS); } - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { printf("aue%d: no memory for rx list " "-- packet dropped!\n", sc->aue_unit); diff --git a/sys/dev/netif/awi/awi.c b/sys/dev/netif/awi/awi.c index 2e677aece0..198a3c59d2 100644 --- a/sys/dev/netif/awi/awi.c +++ b/sys/dev/netif/awi/awi.c @@ -1,6 +1,6 @@ /* $NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $ */ /* $FreeBSD: src/sys/dev/awi/awi.c,v 1.10.2.2 2003/01/23 21:06:42 sam Exp $ */ -/* $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.12 2004/04/07 05:45:26 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.13 2004/06/02 14:42:49 eirikn Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -1073,7 +1073,7 @@ awi_fix_txhdr(sc, m0) llc->llc_snap.org_code[2] = 0; llc->llc_snap.ether_type = eh.ether_type; } - M_PREPEND(m0, sizeof(struct ieee80211_frame), M_DONTWAIT); + M_PREPEND(m0, sizeof(struct ieee80211_frame), MB_DONTWAIT); if (m0 == NULL) return NULL; wh = mtod(m0, struct ieee80211_frame *); @@ -1151,7 +1151,7 @@ awi_fix_rxhdr(sc, m0) off = 0; while (m0->m_pkthdr.len > off) { if (n0 == NULL) { - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, MB_DONTWAIT, MT_DATA); if (n == NULL) { m_freem(m0); return NULL; @@ -1159,7 +1159,7 @@ awi_fix_rxhdr(sc, m0) M_MOVE_PKTHDR(n, m0); n->m_len = MHLEN; } else { - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (n == NULL) { m_freem(m0); m_freem(n0); @@ -1168,7 +1168,7 @@ awi_fix_rxhdr(sc, m0) n->m_len = MLEN; } if (m0->m_pkthdr.len - off >= MINCLSIZE) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if (n->m_flags & M_EXT) n->m_len = n->m_ext.ext_size; } @@ -1388,14 +1388,14 @@ awi_devget(sc, off, len) while (len > 0) { if (top == NULL) { - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) return NULL; m->m_pkthdr.rcvif = sc->sc_ifp; m->m_pkthdr.len = len; m->m_len = MHLEN; } else { - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { m_freem(top); return NULL; @@ -1403,7 +1403,7 @@ awi_devget(sc, off, len) m->m_len = MLEN; } if (len >= MINCLSIZE) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if (m->m_flags & M_EXT) m->m_len = m->m_ext.ext_size; } @@ -2072,7 +2072,7 @@ awi_send_deauth(sc) struct ieee80211_frame *wh; u_int8_t *deauth; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) return; if (ifp->if_flags & IFF_DEBUG) @@ -2109,7 +2109,7 @@ awi_send_auth(sc, seq) struct ieee80211_frame *wh; u_int8_t *auth; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) return; sc->sc_status = AWI_ST_AUTH; @@ -2211,7 +2211,7 @@ awi_send_asreq(sc, reassoc) u_int16_t lintval; u_int8_t *asreq; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) return; sc->sc_status = AWI_ST_ASSOC; diff --git a/sys/dev/netif/awi/awi_wep.c b/sys/dev/netif/awi/awi_wep.c index 78d6482eba..ca39a9d68f 100644 --- a/sys/dev/netif/awi/awi_wep.c +++ b/sys/dev/netif/awi/awi_wep.c @@ -1,6 +1,6 @@ /* $NetBSD: awi_wep.c,v 1.4 2000/08/14 11:28:03 onoe Exp $ */ /* $FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.3.2.2 2003/01/23 21:06:42 sam Exp $ */ -/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wep.c,v 1.8 2004/04/07 05:45:26 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wep.c,v 1.9 2004/06/02 14:42:49 eirikn Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -319,7 +319,7 @@ awi_wep_encrypt(sc, m0, txflag) ctx = sc->sc_wep_ctx; m = m0; left = m->m_pkthdr.len; - MGET(n, M_DONTWAIT, m->m_type); + MGET(n, MB_DONTWAIT, m->m_type); n0 = n; if (n == NULL) goto fail; @@ -333,7 +333,7 @@ awi_wep_encrypt(sc, m0, txflag) } n->m_len = MHLEN; if (n->m_pkthdr.len >= MINCLSIZE) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if (n->m_flags & M_EXT) n->m_len = n->m_ext.ext_size; } @@ -382,13 +382,13 @@ awi_wep_encrypt(sc, m0, txflag) if (len > n->m_len - noff) { len = n->m_len - noff; if (len == 0) { - MGET(n->m_next, M_DONTWAIT, n->m_type); + MGET(n->m_next, MB_DONTWAIT, n->m_type); if (n->m_next == NULL) goto fail; n = n->m_next; n->m_len = MLEN; if (left >= MINCLSIZE) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if (n->m_flags & M_EXT) n->m_len = n->m_ext.ext_size; } @@ -418,7 +418,7 @@ awi_wep_encrypt(sc, m0, txflag) n->m_len = noff + sizeof(crcbuf); else { n->m_len = noff; - MGET(n->m_next, M_DONTWAIT, n->m_type); + MGET(n->m_next, MB_DONTWAIT, n->m_type); if (n->m_next == NULL) goto fail; n = n->m_next; diff --git a/sys/dev/netif/axe/if_axe.c b/sys/dev/netif/axe/if_axe.c index ce2ea47093..e7d5c76459 100644 --- a/sys/dev/netif/axe/if_axe.c +++ b/sys/dev/netif/axe/if_axe.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/if_axe.c,v 1.10 2003/12/08 07:54:14 obrien Exp $ - * $DragonFly: src/sys/dev/netif/axe/if_axe.c,v 1.2 2004/04/07 05:45:26 dillon Exp $ + * $DragonFly: src/sys/dev/netif/axe/if_axe.c,v 1.3 2004/06/02 14:42:49 eirikn Exp $ */ /* * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the @@ -573,7 +573,7 @@ axe_newbuf(struct axe_softc *sc, struct axe_chain *c, struct mbuf *m) struct mbuf *m_new = NULL; if (m == NULL) { - m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + m_new = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR); if (m_new == NULL) { printf("axe%d: no memory for rx list " "-- packet dropped!\n", sc->axe_unit); diff --git a/sys/dev/netif/bfe/if_bfe.c b/sys/dev/netif/bfe/if_bfe.c index 61b9e5d240..06c1c550ca 100644 --- a/sys/dev/netif/bfe/if_bfe.c +++ b/sys/dev/netif/bfe/if_bfe.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bfe/if_bfe.c 1.4.4.7 2004/03/02 08:41:33 julian Exp v - * $DragonFly: src/sys/dev/netif/bfe/if_bfe.c,v 1.4 2004/03/23 22:18:59 hsu Exp $ + * $DragonFly: src/sys/dev/netif/bfe/if_bfe.c,v 1.5 2004/06/02 14:42:49 eirikn Exp $ */ #include @@ -564,7 +564,7 @@ bfe_list_newbuf(struct bfe_softc *sc, int c, struct mbuf *m) return(EINVAL); if (m == NULL) { - m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR); if (m == NULL) return(ENOBUFS); 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 c158dc26fe..ecc804091f 100644 --- a/sys/dev/netif/bge/if_bge.c +++ b/sys/dev/netif/bge/if_bge.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.3.2.29 2003/12/01 21:06:59 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.19 2004/04/07 05:45:27 dillon Exp $ + * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.20 2004/06/02 14:42:49 eirikn Exp $ * */ @@ -828,12 +828,12 @@ bge_newbuf_std(sc, i, m) struct bge_rx_bd *r; if (m == NULL) { - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) { return(ENOBUFS); } - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); return(ENOBUFS); @@ -874,7 +874,7 @@ bge_newbuf_jumbo(sc, i, m) caddr_t *buf = NULL; /* Allocate the mbuf. */ - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) { return(ENOBUFS); } diff --git a/sys/dev/netif/cm/smc90cx6.c b/sys/dev/netif/cm/smc90cx6.c index b038cc01ea..3eb39155e7 100644 --- a/sys/dev/netif/cm/smc90cx6.c +++ b/sys/dev/netif/cm/smc90cx6.c @@ -1,6 +1,6 @@ /* $NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */ /* $FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.1.2.3 2003/02/05 18:42:14 fjoe Exp $ */ -/* $DragonFly: src/sys/dev/netif/cm/Attic/smc90cx6.c,v 1.8 2004/04/01 07:27:16 joerg Exp $ */ +/* $DragonFly: src/sys/dev/netif/cm/Attic/smc90cx6.c,v 1.9 2004/06/02 14:42:49 eirikn Exp $ */ /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -628,7 +628,7 @@ cm_srint(vsc) splx(s); /* Allocate header mbuf */ - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == 0) { /* @@ -665,7 +665,7 @@ cm_srint(vsc) */ if ((len + 2 + 2) > MHLEN) { /* attach an mbuf cluster */ - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); /* Insist on getting a cluster */ if ((m->m_flags & M_EXT) == 0) { diff --git a/sys/dev/netif/cs/if_cs.c b/sys/dev/netif/cs/if_cs.c index c2f1a6f6f2..0b5648180f 100644 --- a/sys/dev/netif/cs/if_cs.c +++ b/sys/dev/netif/cs/if_cs.c @@ -28,7 +28,7 @@ /* * $FreeBSD: src/sys/dev/cs/if_cs.c,v 1.19.2.1 2001/01/25 20:13:48 imp Exp $ - * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.8 2004/04/07 05:45:27 dillon Exp $ + * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.9 2004/06/02 14:42:50 eirikn Exp $ * * Device driver for Crystal Semiconductor CS8920 based ethernet * adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997 @@ -794,12 +794,12 @@ cs_get_packet(struct cs_softc *sc) return -1; } - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m==NULL) return -1; if (length > MHLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if (!(m->m_flags & M_EXT)) { m_freem(m); return -1; diff --git a/sys/dev/netif/cue/if_cue.c b/sys/dev/netif/cue/if_cue.c index d0dd5e5b3c..282a90661a 100644 --- a/sys/dev/netif/cue/if_cue.c +++ b/sys/dev/netif/cue/if_cue.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/if_cue.c,v 1.45 2003/12/08 07:54:14 obrien Exp $ - * $DragonFly: src/sys/dev/netif/cue/if_cue.c,v 1.9 2004/04/07 05:45:27 dillon Exp $ + * $DragonFly: src/sys/dev/netif/cue/if_cue.c,v 1.10 2004/06/02 14:42:50 eirikn Exp $ * */ @@ -585,14 +585,14 @@ cue_newbuf(struct cue_softc *sc, struct cue_chain *c, struct mbuf *m) struct mbuf *m_new = NULL; if (m == NULL) { - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) { printf("cue%d: no memory for rx list " "-- packet dropped!\n", sc->cue_unit); return(ENOBUFS); } - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { printf("cue%d: no memory for rx list " "-- packet dropped!\n", sc->cue_unit); diff --git a/sys/dev/netif/cx/if_cx.c b/sys/dev/netif/cx/if_cx.c index 897f6e7b29..5dd82a7585 100644 --- a/sys/dev/netif/cx/if_cx.c +++ b/sys/dev/netif/cx/if_cx.c @@ -17,7 +17,7 @@ * Version 1.9, Wed Oct 4 18:58:15 MSK 1995 * * $FreeBSD: src/sys/i386/isa/if_cx.c,v 1.32 1999/11/18 08:36:42 peter Exp $ - * $DragonFly: src/sys/dev/netif/cx/if_cx.c,v 1.12 2004/05/19 22:52:45 dillon Exp $ + * $DragonFly: src/sys/dev/netif/cx/if_cx.c,v 1.13 2004/06/02 14:42:50 eirikn Exp $ * */ #undef DEBUG @@ -143,11 +143,11 @@ static struct mbuf *makembuf (void *buf, unsigned len) { struct mbuf *m, *o, *p; - MGETHDR (m, M_DONTWAIT, MT_DATA); + MGETHDR (m, MB_DONTWAIT, MT_DATA); if (! m) return (0); if (len >= MINCLSIZE) - MCLGET (m, M_DONTWAIT); + MCLGET (m, MB_DONTWAIT); m->m_pkthdr.len = len; m->m_len = 0; @@ -160,13 +160,13 @@ static struct mbuf *makembuf (void *buf, unsigned len) if (! n) { /* Allocate new mbuf. */ o = p; - MGET (p, M_DONTWAIT, MT_DATA); + MGET (p, MB_DONTWAIT, MT_DATA); if (! p) { m_freem (m); return (0); } if (len >= MINCLSIZE) - MCLGET (p, M_DONTWAIT); + MCLGET (p, MB_DONTWAIT); p->m_len = 0; o->m_next = p; diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c index 17965905a3..cab9cc989f 100644 --- a/sys/dev/netif/dc/if_dc.c +++ b/sys/dev/netif/dc/if_dc.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $ - * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.12 2004/04/16 14:21:57 joerg Exp $ + * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.13 2004/06/02 14:42:50 eirikn Exp $ * * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $ */ @@ -2285,11 +2285,11 @@ static int dc_newbuf(sc, i, m) c = &sc->dc_ldata->dc_rx_list[i]; if (m == NULL) { - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) return(ENOBUFS); - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); return(ENOBUFS); @@ -3043,11 +3043,11 @@ static int dc_coal(sc, m_head) struct mbuf *m_new, *m; m = *m_head; - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) return(ENOBUFS); if (m->m_pkthdr.len > MHLEN) { - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); return(ENOBUFS); diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c index 80b60f2671..52f26f036d 100644 --- a/sys/dev/netif/de/if_de.c +++ b/sys/dev/netif/de/if_de.c @@ -1,7 +1,7 @@ /* $NetBSD: if_de.c,v 1.86 1999/06/01 19:17:59 thorpej Exp $ */ /* $FreeBSD: src/sys/pci/if_de.c,v 1.123.2.4 2000/08/04 23:25:09 peter Exp $ */ -/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.11 2004/04/07 05:45:27 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.12 2004/06/02 14:42:50 eirikn Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -206,7 +206,7 @@ tulip_txprobe( * either is connected so the transmit is the only way * to verify the connectivity. */ - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) return 0; /* @@ -3551,12 +3551,12 @@ tulip_rx_intr( */ if (accept || ms == NULL) { struct mbuf *m0; - MGETHDR(m0, M_DONTWAIT, MT_DATA); + MGETHDR(m0, MB_DONTWAIT, MT_DATA); if (m0 != NULL) { #if defined(TULIP_COPY_RXDATA) if (!accept || total_len >= (MHLEN - 2)) { #endif - MCLGET(m0, M_DONTWAIT); + MCLGET(m0, MB_DONTWAIT); if ((m0->m_flags & M_EXT) == 0) { m_freem(m0); m0 = NULL; @@ -4069,10 +4069,10 @@ tulip_mbuf_compress( { struct mbuf *m0; #if MCLBYTES >= ETHERMTU + 18 && !defined(BIG_PACKET) - MGETHDR(m0, M_DONTWAIT, MT_DATA); + MGETHDR(m0, MB_DONTWAIT, MT_DATA); if (m0 != NULL) { if (m->m_pkthdr.len > MHLEN) { - MCLGET(m0, M_DONTWAIT); + MCLGET(m0, MB_DONTWAIT); if ((m0->m_flags & M_EXT) == 0) { m_freem(m); m_freem(m0); @@ -4089,9 +4089,9 @@ tulip_mbuf_compress( while (len > 0) { if (mlen == MHLEN) { - MGETHDR(*mp, M_DONTWAIT, MT_DATA); + MGETHDR(*mp, MB_DONTWAIT, MT_DATA); } else { - MGET(*mp, M_DONTWAIT, MT_DATA); + MGET(*mp, MB_DONTWAIT, MT_DATA); } if (*mp == NULL) { m_freem(m0); @@ -4099,7 +4099,7 @@ tulip_mbuf_compress( break; } if (len > MLEN) { - MCLGET(*mp, M_DONTWAIT); + MCLGET(*mp, MB_DONTWAIT); if (((*mp)->m_flags & M_EXT) == 0) { m_freem(m0); m0 = NULL; diff --git a/sys/dev/netif/ed/if_ed.c b/sys/dev/netif/ed/if_ed.c index b762d8e7d0..da00ef7263 100644 --- a/sys/dev/netif/ed/if_ed.c +++ b/sys/dev/netif/ed/if_ed.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.224 2003/12/08 07:54:12 obrien Exp $ - * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.12 2004/03/23 22:18:59 hsu Exp $ + * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.13 2004/06/02 14:42:50 eirikn Exp $ */ /* @@ -2804,7 +2804,7 @@ ed_get_packet(sc, buf, len) struct mbuf *m; /* Allocate a header mbuf */ - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) return; m->m_pkthdr.rcvif = ifp; @@ -2818,7 +2818,7 @@ ed_get_packet(sc, buf, len) */ if ((len + 2) > MHLEN) { /* Attach an mbuf cluster */ - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); /* Insist on getting a cluster */ if ((m->m_flags & M_EXT) == 0) { diff --git a/sys/dev/netif/el/if_el.c b/sys/dev/netif/el/if_el.c index 1034fab26a..c0bf1f5245 100644 --- a/sys/dev/netif/el/if_el.c +++ b/sys/dev/netif/el/if_el.c @@ -7,7 +7,7 @@ * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu. * * $FreeBSD: src/sys/i386/isa/if_el.c,v 1.47.2.2 2000/07/17 21:24:30 archie Exp $ - * $DragonFly: src/sys/dev/netif/el/if_el.c,v 1.8 2004/04/01 07:27:16 joerg Exp $ + * $DragonFly: src/sys/dev/netif/el/if_el.c,v 1.9 2004/06/02 14:42:50 eirikn Exp $ */ /* Except of course for the portions of code lifted from other FreeBSD * drivers (mainly elread, elget and el_ioctl) @@ -548,7 +548,7 @@ elget(buf, totlen, ifp) cp = buf; epkt = cp + totlen; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == 0) return (0); m->m_pkthdr.rcvif = ifp; @@ -558,7 +558,7 @@ elget(buf, totlen, ifp) mp = ⊤ while (totlen > 0) { if (top) { - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m == 0) { m_freem(top); return (0); @@ -567,7 +567,7 @@ elget(buf, totlen, ifp) } len = min(totlen, epkt - cp); if (len >= MINCLSIZE) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if (m->m_flags & M_EXT) m->m_len = len = min(len, MCLBYTES); else diff --git a/sys/dev/netif/em/if_em.c b/sys/dev/netif/em/if_em.c index 75b5f1fed8..44e54ebc84 100644 --- a/sys/dev/netif/em/if_em.c +++ b/sys/dev/netif/em/if_em.c @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ /*$FreeBSD: src/sys/dev/em/if_em.c,v 1.2.2.15 2003/06/09 22:10:15 pdeuskar Exp $*/ -/*$DragonFly: src/sys/dev/netif/em/if_em.c,v 1.14 2004/05/11 22:55:15 joerg Exp $*/ +/*$DragonFly: src/sys/dev/netif/em/if_em.c,v 1.15 2004/06/02 14:42:51 eirikn Exp $*/ #include @@ -2202,7 +2202,7 @@ em_get_buf(int i, struct adapter *adapter, struct mbuf *nmp) ifp = &adapter->interface_data.ac_if; if (mp == NULL) { - mp = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + mp = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR); if (mp == NULL) { adapter->mbuf_cluster_failed++; return(ENOBUFS); diff --git a/sys/dev/netif/ep/if_ep.c b/sys/dev/netif/ep/if_ep.c index 76295268f6..d01f90419d 100644 --- a/sys/dev/netif/ep/if_ep.c +++ b/sys/dev/netif/ep/if_ep.c @@ -39,7 +39,7 @@ /* * $FreeBSD: src/sys/dev/ep/if_ep.c,v 1.95.2.3 2002/03/06 07:26:35 imp Exp $ - * $DragonFly: src/sys/dev/netif/ep/if_ep.c,v 1.9 2004/03/23 22:19:00 hsu Exp $ + * $DragonFly: src/sys/dev/netif/ep/if_ep.c,v 1.10 2004/06/02 14:42:51 eirikn Exp $ * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select @@ -698,11 +698,11 @@ read_again: rx_fifo = rx_fifo2 = status & RX_BYTES_MASK; if (EP_FTST(sc, F_RX_FIRST)) { - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (!m) goto out; if (rx_fifo >= MINCLSIZE) - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); sc->top = sc->mcur = top = m; #define EROUND ((sizeof(struct ether_header) + 3) & ~3) #define EOFF (EROUND - sizeof(struct ether_header)) @@ -726,11 +726,11 @@ read_again: lenthisone = min(rx_fifo, M_TRAILINGSPACE(m)); if (lenthisone == 0) { /* no room in this one */ mcur = m; - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (!m) goto out; if (rx_fifo >= MINCLSIZE) - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); m->m_len = 0; mcur->m_next = m; lenthisone = min(rx_fifo, M_TRAILINGSPACE(m)); diff --git a/sys/dev/netif/ex/if_ex.c b/sys/dev/netif/ex/if_ex.c index 280dcd9eb6..f7e69bc389 100644 --- a/sys/dev/netif/ex/if_ex.c +++ b/sys/dev/netif/ex/if_ex.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ex/if_ex.c,v 1.26.2.3 2001/03/05 05:33:20 imp Exp $ - * $DragonFly: src/sys/dev/netif/ex/if_ex.c,v 1.9 2004/03/23 22:19:00 hsu Exp $ + * $DragonFly: src/sys/dev/netif/ex/if_ex.c,v 1.10 2004/06/02 14:42:51 eirikn Exp $ * * MAINTAINER: Matthew N. Dodd * @@ -700,7 +700,7 @@ ex_rx_intr(struct ex_softc *sc) QQQ = pkt_len = inw(iobase + IO_PORT_REG); if (rx_status & RCV_OK_bit) { - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); ipkt = m; if (ipkt == NULL) { ifp->if_iqdrops++; @@ -711,7 +711,7 @@ ex_rx_intr(struct ex_softc *sc) while (pkt_len > 0) { if (pkt_len > MINCLSIZE) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if (m->m_flags & M_EXT) { m->m_len = MCLBYTES; } else { @@ -736,7 +736,7 @@ ex_rx_intr(struct ex_softc *sc) pkt_len -= m->m_len; if (pkt_len > 0) { - MGET(m->m_next, M_DONTWAIT, MT_DATA); + MGET(m->m_next, MB_DONTWAIT, MT_DATA); if (m->m_next == NULL) { m_freem(ipkt); ifp->if_iqdrops++; diff --git a/sys/dev/netif/fe/if_fe.c b/sys/dev/netif/fe/if_fe.c index d277aa242d..2ec31899a8 100644 --- a/sys/dev/netif/fe/if_fe.c +++ b/sys/dev/netif/fe/if_fe.c @@ -22,7 +22,7 @@ /* * $FreeBSD: src/sys/dev/fe/if_fe.c,v 1.65.2.1 2000/09/22 10:01:47 nyan Exp $ - * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.8 2004/03/23 22:19:00 hsu Exp $ + * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.9 2004/06/02 14:42:51 eirikn Exp $ * * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards. * Contributed by M. Sekiguchi. @@ -1880,13 +1880,13 @@ fe_get_packet (struct fe_softc * sc, u_short len) */ /* Allocate an mbuf with packet header info. */ - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) return -1; /* Attach a cluster if this packet doesn't fit in a normal mbuf. */ if (len > MHLEN - NFS_MAGIC_OFFSET) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if (!(m->m_flags & M_EXT)) { m_freem(m); return -1; diff --git a/sys/dev/netif/fwe/if_fwe.c b/sys/dev/netif/fwe/if_fwe.c index e10f04a95e..175e517815 100644 --- a/sys/dev/netif/fwe/if_fwe.c +++ b/sys/dev/netif/fwe/if_fwe.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.27 2004/01/08 14:58:09 simokawa Exp $ - * $DragonFly: src/sys/dev/netif/fwe/if_fwe.c,v 1.10 2004/03/23 22:19:00 hsu Exp $ + * $DragonFly: src/sys/dev/netif/fwe/if_fwe.c,v 1.11 2004/06/02 14:42:51 eirikn Exp $ */ #include "opt_inet.h" @@ -346,7 +346,9 @@ found: xferq->stproc = NULL; for (i = 0; i < xferq->bnchunk; i ++) { m = -#if defined(__DragonFly__) || __FreeBSD_version < 500000 +#if defined(__DragonFly__) + m_getcl(MB_WAIT, MT_DATA, M_PKTHDR); +#elif __FreeBSD_version < 500000 m_getcl(M_WAIT, MT_DATA, M_PKTHDR); #else m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR); @@ -541,7 +543,7 @@ fwe_as_output(struct fwe_softc *fwe, struct ifnet *ifp) #endif /* keep ip packet alignment for alpha */ - M_PREPEND(m, ETHER_ALIGN, M_DONTWAIT); + M_PREPEND(m, ETHER_ALIGN, MB_DONTWAIT); fp = &xfer->send.hdr; *(u_int32_t *)&xfer->send.hdr = *(int32_t *)&fwe->pkt_hdr; fp->mode.stream.len = m->m_pkthdr.len; @@ -593,7 +595,7 @@ fwe_as_input(struct fw_xferq *xferq) m = sxfer->mbuf; /* insert new rbuf */ - sxfer->mbuf = m0 = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + sxfer->mbuf = m0 = m_getcl(MB_DONTWAIT, 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 83355d5897..e6a96885d3 100644 --- a/sys/dev/netif/fxp/if_fxp.c +++ b/sys/dev/netif/fxp/if_fxp.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.110.2.30 2003/06/12 16:47:05 mux Exp $ - * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.11 2004/04/16 14:21:57 joerg Exp $ + * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.12 2004/06/02 14:42:51 eirikn Exp $ */ /* @@ -1084,13 +1084,13 @@ tbdinit: * mbuf chain first. Bail out if we can't get the * new buffers. */ - MGETHDR(mn, M_DONTWAIT, MT_DATA); + MGETHDR(mn, MB_DONTWAIT, MT_DATA); if (mn == NULL) { m_freem(mb_head); break; } if (mb_head->m_pkthdr.len > MHLEN) { - MCLGET(mn, M_DONTWAIT); + MCLGET(mn, MB_DONTWAIT); if ((mn->m_flags & M_EXT) == 0) { m_freem(mn); m_freem(mb_head); @@ -1884,7 +1884,7 @@ fxp_add_rfabuf(struct fxp_softc *sc, struct mbuf *oldm) struct mbuf *m; struct fxp_rfa *rfa, *p_rfa; - m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR); if (m == NULL) { /* try to recycle the old mbuf instead */ if (oldm == NULL) return 1; diff --git a/sys/dev/netif/gx/if_gx.c b/sys/dev/netif/gx/if_gx.c index 315a1bc037..1f973f5caa 100644 --- a/sys/dev/netif/gx/if_gx.c +++ b/sys/dev/netif/gx/if_gx.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/gx/if_gx.c,v 1.2.2.3 2001/12/14 19:51:39 jlemon Exp $ - * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.7 2004/03/23 22:19:01 hsu Exp $ + * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.8 2004/06/02 14:42:51 eirikn Exp $ */ #include @@ -1072,13 +1072,13 @@ gx_newbuf(struct gx_softc *gx, int idx, struct mbuf *m) struct gx_rx_desc *r; if (m == NULL) { - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) { device_printf(gx->gx_dev, "mbuf allocation failed -- packet dropped\n"); return (ENOBUFS); } - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if ((m_new->m_flags & M_EXT) == 0) { device_printf(gx->gx_dev, "cluster allocation failed -- packet dropped\n"); diff --git a/sys/dev/netif/ie/if_ie.c b/sys/dev/netif/ie/if_ie.c index 11227843db..9a604bc87c 100644 --- a/sys/dev/netif/ie/if_ie.c +++ b/sys/dev/netif/ie/if_ie.c @@ -48,7 +48,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ie/if_ie.c,v 1.72.2.4 2003/03/27 21:01:49 mdodd Exp $ - * $DragonFly: src/sys/dev/netif/ie/if_ie.c,v 1.11 2004/06/01 17:30:30 joerg Exp $ + * $DragonFly: src/sys/dev/netif/ie/if_ie.c,v 1.12 2004/06/02 14:42:52 eirikn Exp $ */ /* @@ -1192,7 +1192,7 @@ ieget(int unit, struct ie_softc *ie, struct mbuf **mp, struct ether_header *ehp) } totlen -= (offset = sizeof *ehp); - MGETHDR(*mp, M_DONTWAIT, MT_DATA); + MGETHDR(*mp, MB_DONTWAIT, MT_DATA); if (!*mp) { ie_drop_packet_buffer(unit, ie); return (-1); @@ -1218,7 +1218,7 @@ ieget(int unit, struct ie_softc *ie, struct mbuf **mp, struct ether_header *ehp) * single mbuf which may or may not be big enough. Got that? */ if (top) { - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (!m) { m_freem(top); ie_drop_packet_buffer(unit, ie); @@ -1227,7 +1227,7 @@ ieget(int unit, struct ie_softc *ie, struct mbuf **mp, struct ether_header *ehp) m->m_len = MLEN; } if (resid >= MINCLSIZE) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if (m->m_flags & M_EXT) m->m_len = min(resid, MCLBYTES); } else { diff --git a/sys/dev/netif/kue/if_kue.c b/sys/dev/netif/kue/if_kue.c index daf4c7bc8d..fa544d7da0 100644 --- a/sys/dev/netif/kue/if_kue.c +++ b/sys/dev/netif/kue/if_kue.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/if_kue.c,v 1.17.2.9 2003/04/13 02:39:25 murray Exp $ - * $DragonFly: src/sys/dev/netif/kue/if_kue.c,v 1.9 2004/04/07 05:45:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/kue/if_kue.c,v 1.10 2004/06/02 14:42:52 eirikn Exp $ */ /* @@ -555,14 +555,14 @@ kue_newbuf(struct kue_softc *sc, struct kue_chain *c, struct mbuf *m) struct mbuf *m_new = NULL; if (m == NULL) { - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) { printf("kue%d: no memory for rx list " "-- packet dropped!\n", sc->kue_unit); return(ENOBUFS); } - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { printf("kue%d: no memory for rx list " "-- packet dropped!\n", sc->kue_unit); diff --git a/sys/dev/netif/le/if_le.c b/sys/dev/netif/le/if_le.c index 60d5700a6a..6120fbc1fb 100644 --- a/sys/dev/netif/le/if_le.c +++ b/sys/dev/netif/le/if_le.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/if_le.c,v 1.56.2.4 2002/06/05 23:24:10 paul Exp $ - * $DragonFly: src/sys/dev/netif/le/if_le.c,v 1.11 2004/05/04 12:09:36 hmp Exp $ + * $DragonFly: src/sys/dev/netif/le/if_le.c,v 1.12 2004/06/02 14:42:53 eirikn Exp $ */ /* @@ -395,7 +395,7 @@ le_input( seg1 += sizeof(eh); total_len -= sizeof(eh); len1 -= sizeof(eh); - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { sc->le_if.if_ierrors++; return; @@ -403,14 +403,14 @@ le_input( m->m_pkthdr.len = total_len; m->m_pkthdr.rcvif = &sc->le_if; if (total_len + LE_XTRA > MHLEN /* >= MINCLSIZE */) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_free(m); sc->le_if.if_ierrors++; return; } } else if (total_len + LE_XTRA > MHLEN && MINCLSIZE == (MHLEN+MLEN)) { - MGET(m->m_next, M_DONTWAIT, MT_DATA); + MGET(m->m_next, MB_DONTWAIT, MT_DATA); if (m->m_next == NULL) { m_free(m); sc->le_if.if_ierrors++; diff --git a/sys/dev/netif/lge/if_lge.c b/sys/dev/netif/lge/if_lge.c index b598fb469b..c5bd622187 100644 --- a/sys/dev/netif/lge/if_lge.c +++ b/sys/dev/netif/lge/if_lge.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.5.2.2 2001/12/14 19:49:23 jlemon Exp $ - * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.10 2004/04/07 05:45:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.11 2004/06/02 14:42:53 eirikn Exp $ * * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.5.2.2 2001/12/14 19:49:23 jlemon Exp $ */ @@ -779,7 +779,7 @@ static int lge_newbuf(sc, c, m) caddr_t *buf = NULL; if (m == NULL) { - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) { printf("lge%d: no memory for rx list " "-- packet dropped!\n", sc->lge_unit); diff --git a/sys/dev/netif/lnc/if_lnc.c b/sys/dev/netif/lnc/if_lnc.c index 56dfa4708d..1c0058d5db 100644 --- a/sys/dev/netif/lnc/if_lnc.c +++ b/sys/dev/netif/lnc/if_lnc.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.89 2001/07/04 13:00:19 nyan Exp $ - * $DragonFly: src/sys/dev/netif/lnc/Attic/if_lnc.c,v 1.9 2004/03/23 22:19:01 hsu Exp $ + * $DragonFly: src/sys/dev/netif/lnc/Attic/if_lnc.c,v 1.10 2004/06/02 14:42:53 eirikn Exp $ */ /* @@ -318,10 +318,10 @@ alloc_mbuf_cluster(struct lnc_softc *sc, struct host_ring_entry *desc) sc->mbufs = m->m_next; /* XXX m->m_data = m->m_ext.ext_buf;*/ } else { - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (!m) return(1); - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if (!m->m_ext.ext_buf) { m_free(m); return(1); @@ -383,7 +383,7 @@ mbuf_packet(struct lnc_softc *sc, int start_of_packet, int pkt_len) int amount; /* Get a pkthdr mbuf for the start of packet */ - MGETHDR(head, M_DONTWAIT, MT_DATA); + MGETHDR(head, MB_DONTWAIT, MT_DATA); if (!head) { LNCSTATS(drop_packet) return(0); @@ -413,13 +413,13 @@ mbuf_packet(struct lnc_softc *sc, int start_of_packet, int pkt_len) if (amount == 0) { /* mbuf must be empty */ m_prev = m; - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (!m) { m_freem(head); return(0); } if (pkt_len >= MINCLSIZE) - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); m->m_len = 0; m_prev->m_next = m; amount = min(blen, M_TRAILINGSPACE(m)); @@ -1222,9 +1222,9 @@ chain_to_cluster(struct mbuf *m) { struct mbuf *new; - MGET(new, M_DONTWAIT, MT_DATA); + MGET(new, MB_DONTWAIT, MT_DATA); if (new) { - MCLGET(new, M_DONTWAIT); + MCLGET(new, MB_DONTWAIT); if (new->m_ext.ext_buf) { new->m_len = mbuf_to_buffer(m, new->m_data); m_freem(m); diff --git a/sys/dev/netif/mn/if_mn.c b/sys/dev/netif/mn/if_mn.c index f0e5d50f72..d54123a85a 100644 --- a/sys/dev/netif/mn/if_mn.c +++ b/sys/dev/netif/mn/if_mn.c @@ -22,7 +22,7 @@ * this gadget. * * $FreeBSD: src/sys/pci/if_mn.c,v 1.11.2.3 2001/01/23 12:47:09 phk Exp $ - * $DragonFly: src/sys/dev/netif/mn/if_mn.c,v 1.5 2004/04/07 05:45:29 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mn/if_mn.c,v 1.6 2004/06/02 14:42:53 eirikn Exp $ */ /* @@ -687,7 +687,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, M_WAIT, MT_DATA); + MGETHDR(m, MB_WAIT, MT_DATA); if (m == NULL) return (ENOBUFS); m->m_pkthdr.len = 0; @@ -704,12 +704,12 @@ ngmn_connect(hook_p hook) dp = mn_alloc_desc(); m = NULL; - MGETHDR(m, M_WAIT, MT_DATA); + MGETHDR(m, MB_WAIT, MT_DATA); if (m == NULL) { mn_free_desc(dp); return (ENOBUFS); } - MCLGET(m, M_WAIT); + MCLGET(m, MB_WAIT); if ((m->m_flags & M_EXT) == 0) { mn_free_desc(dp); m_freem(m); @@ -727,13 +727,13 @@ ngmn_connect(hook_p hook) dp2 = dp; dp = mn_alloc_desc(); m = NULL; - MGETHDR(m, M_WAIT, MT_DATA); + MGETHDR(m, MB_WAIT, MT_DATA); if (m == NULL) { mn_free_desc(dp); m_freem(m); return (ENOBUFS); } - MCLGET(m, M_WAIT); + MCLGET(m, MB_WAIT); if ((m->m_flags & M_EXT) == 0) { mn_free_desc(dp); m_freem(m); @@ -1173,12 +1173,12 @@ mn_rx_intr(struct softc *sc, u_int32_t vector) /* Replenish desc + mbuf supplies */ if (!m) { - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { mn_free_desc(dp); return; /* ENOBUFS */ } - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if((m->m_flags & M_EXT) == 0) { mn_free_desc(dp); m_freem(m); diff --git a/sys/dev/netif/my/if_my.c b/sys/dev/netif/my/if_my.c index d586b86c9d..38f2be9502 100644 --- a/sys/dev/netif/my/if_my.c +++ b/sys/dev/netif/my/if_my.c @@ -26,7 +26,7 @@ * Written by: yen_cw@myson.com.tw available at: http://www.myson.com.tw/ * * $FreeBSD: src/sys/dev/my/if_my.c,v 1.2.2.4 2002/04/17 02:05:27 julian Exp $ - * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.9 2004/04/07 05:45:29 dillon Exp $ + * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.10 2004/06/02 14:42:53 eirikn Exp $ * * Myson fast ethernet PCI NIC driver * @@ -1171,13 +1171,13 @@ my_newbuf(struct my_softc * sc, struct my_chain_onefrag * c) struct mbuf *m_new = NULL; MY_LOCK(sc); - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) { printf("my%d: no memory for rx list -- packet dropped!\n", sc->my_unit); return (ENOBUFS); } - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { printf("my%d: no memory for rx list -- packet dropped!\n", sc->my_unit); @@ -1441,13 +1441,13 @@ my_encap(struct my_softc * sc, struct my_chain * c, struct mbuf * m_head) * chain. */ m = m_head; - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) { printf("my%d: no memory for tx list", sc->my_unit); return (1); } if (m_head->m_pkthdr.len > MHLEN) { - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); printf("my%d: no memory for tx list", sc->my_unit); diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c index 7a1549957d..7ecb666705 100644 --- a/sys/dev/netif/nge/if_nge.c +++ b/sys/dev/netif/nge/if_nge.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $ - * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.10 2004/04/16 14:21:58 joerg Exp $ + * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.11 2004/06/02 14:42:53 eirikn Exp $ * * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $ */ @@ -1144,7 +1144,7 @@ static int nge_newbuf(sc, c, m) caddr_t *buf = NULL; if (m == NULL) { - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) { printf("nge%d: no memory for rx list " "-- packet dropped!\n", sc->nge_unit); diff --git a/sys/dev/netif/pcn/if_pcn.c b/sys/dev/netif/pcn/if_pcn.c index 72632e26b4..d0494adf7f 100644 --- a/sys/dev/netif/pcn/if_pcn.c +++ b/sys/dev/netif/pcn/if_pcn.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.9 2004/03/23 22:19:02 hsu Exp $ + * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.10 2004/06/02 14:42:53 eirikn Exp $ * * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $ */ @@ -753,11 +753,11 @@ static int pcn_newbuf(sc, idx, m) c = &sc->pcn_ldata->pcn_rx_list[idx]; if (m == NULL) { - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) return(ENOBUFS); - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); return(ENOBUFS); diff --git a/sys/dev/netif/pdq_layer/pdqvar.h b/sys/dev/netif/pdq_layer/pdqvar.h index 1e86a23fd2..826bf32100 100644 --- a/sys/dev/netif/pdq_layer/pdqvar.h +++ b/sys/dev/netif/pdq_layer/pdqvar.h @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/pdq/pdqvar.h,v 1.3.2.1 2002/05/14 21:02:11 gallatin Exp $ - * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdqvar.h,v 1.5 2004/04/07 05:45:29 dillon Exp $ + * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdqvar.h,v 1.6 2004/06/02 14:42:53 eirikn Exp $ * */ @@ -282,9 +282,9 @@ typedef struct mbuf PDQ_OS_DATABUF_T; #define PDQ_OS_DATABUF_ALLOC(b) do { \ PDQ_OS_DATABUF_T *x_m0; \ - MGETHDR(x_m0, M_DONTWAIT, MT_DATA); \ + MGETHDR(x_m0, MB_DONTWAIT, MT_DATA); \ if (x_m0 != NULL) { \ - MCLGET(x_m0, M_DONTWAIT); \ + MCLGET(x_m0, MB_DONTWAIT); \ if ((x_m0->m_flags & M_EXT) == 0) { \ m_free(x_m0); \ (b) = NULL; \ diff --git a/sys/dev/netif/ray/if_ray.c b/sys/dev/netif/ray/if_ray.c index aea2fa38e2..f7eb88d95e 100644 --- a/sys/dev/netif/ray/if_ray.c +++ b/sys/dev/netif/ray/if_ray.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ray/if_ray.c,v 1.47.2.4 2001/08/14 22:54:05 dmlb Exp $ - * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.11 2004/03/23 22:19:02 hsu Exp $ + * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.12 2004/06/02 14:42:54 eirikn Exp $ * */ @@ -1791,14 +1791,14 @@ ray_rx(struct ray_softc *sc, size_t rcs) goto skip_read; } - MGETHDR(m0, M_DONTWAIT, MT_DATA); + MGETHDR(m0, MB_DONTWAIT, MT_DATA); if (m0 == NULL) { RAY_RECERR(sc, "MGETHDR failed"); ifp->if_ierrors++; goto skip_read; } if (pktlen > MHLEN) { - MCLGET(m0, M_DONTWAIT); + MCLGET(m0, MB_DONTWAIT); if (!(m0->m_flags & M_EXT)) { RAY_RECERR(sc, "MCLGET failed"); ifp->if_ierrors++; diff --git a/sys/dev/netif/rdp/if_rdp.c b/sys/dev/netif/rdp/if_rdp.c index 96d321cef9..1462086ffa 100644 --- a/sys/dev/netif/rdp/if_rdp.c +++ b/sys/dev/netif/rdp/if_rdp.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/if_rdp.c,v 1.6.2.2 2000/07/17 21:24:32 archie Exp $ - * $DragonFly: src/sys/dev/netif/rdp/if_rdp.c,v 1.9 2004/04/01 07:27:17 joerg Exp $ + * $DragonFly: src/sys/dev/netif/rdp/if_rdp.c,v 1.10 2004/06/02 14:42:54 eirikn Exp $ */ /* @@ -1106,7 +1106,7 @@ rdp_get_packet(struct rdp_softc *sc, unsigned len) size_t s; /* Allocate a header mbuf */ - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) return; m->m_pkthdr.rcvif = &sc->arpcom.ac_if; @@ -1120,7 +1120,7 @@ rdp_get_packet(struct rdp_softc *sc, unsigned len) */ if ((len + 2) > MHLEN) { /* Attach an mbuf cluster */ - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); /* Insist on getting a cluster */ if ((m->m_flags & M_EXT) == 0) { diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c index bf7e065275..82fc85736d 100644 --- a/sys/dev/netif/rl/if_rl.c +++ b/sys/dev/netif/rl/if_rl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.10 2004/04/16 14:21:58 joerg Exp $ + * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.11 2004/06/02 14:42:54 eirikn Exp $ * * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $ */ @@ -1377,11 +1377,11 @@ static int rl_encap(sc, m_head) * per packet. We have to copy pretty much all the time. */ - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) return(1); if (m_head->m_pkthdr.len > MHLEN) { - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); return(1); diff --git a/sys/dev/netif/sbni/if_sbni.c b/sys/dev/netif/sbni/if_sbni.c index 080095ab1f..a66f5a1606 100644 --- a/sys/dev/netif/sbni/if_sbni.c +++ b/sys/dev/netif/sbni/if_sbni.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.1.2.4 2002/08/11 09:32:00 fjoe Exp $ - * $DragonFly: src/sys/dev/netif/sbni/if_sbni.c,v 1.12 2004/03/23 22:19:02 hsu Exp $ + * $DragonFly: src/sys/dev/netif/sbni/if_sbni.c,v 1.13 2004/06/02 14:42:54 eirikn Exp $ */ /* @@ -816,7 +816,7 @@ get_rx_buf(struct sbni_softc *sc) { struct mbuf *m; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { printf("%s: cannot allocate header mbuf\n", sc->arpcom.ac_if.if_xname); @@ -831,7 +831,7 @@ get_rx_buf(struct sbni_softc *sc) */ if (ETHER_MAX_LEN + 2 > MHLEN) { /* Attach an mbuf cluster */ - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_freem(m); return (0); diff --git a/sys/dev/netif/sbsh/if_sbsh.c b/sys/dev/netif/sbsh/if_sbsh.c index 24d85d5d26..e734de13dd 100644 --- a/sys/dev/netif/sbsh/if_sbsh.c +++ b/sys/dev/netif/sbsh/if_sbsh.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sbsh/if_sbsh.c,v 1.3.2.1 2003/04/15 18:15:07 fjoe Exp $ - * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.10 2004/03/23 22:19:02 hsu Exp $ + * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.11 2004/06/02 14:42:54 eirikn Exp $ */ #include @@ -711,7 +711,7 @@ repack(struct sbsh_softc *sc, struct mbuf *m) { struct mbuf *m_new; - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (!m_new) { if_printf (&sc->arpcom.ac_if, "unable to get mbuf.\n"); @@ -719,7 +719,7 @@ repack(struct sbsh_softc *sc, struct mbuf *m) } if (m->m_pkthdr.len > MHLEN) { - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); if_printf (&sc->arpcom.ac_if, @@ -768,7 +768,7 @@ alloc_rx_buffers(struct sbsh_softc *sc) struct mbuf *m; while (sc->tail_rq != ((sc->head_rq - 1) & (RQLEN - 1))) { - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (!m) { if_printf (&sc->arpcom.ac_if, "unable to get mbuf.\n"); @@ -776,7 +776,7 @@ alloc_rx_buffers(struct sbsh_softc *sc) } if (SBNI16_MAX_FRAME > MHLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); 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 9084ffe68f..79bb6cc3cd 100644 --- a/sys/dev/netif/sf/if_sf.c +++ b/sys/dev/netif/sf/if_sf.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $ - * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.8 2004/03/23 22:19:03 hsu Exp $ + * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.9 2004/06/02 14:42:54 eirikn Exp $ * * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $ */ @@ -919,11 +919,11 @@ static int sf_newbuf(sc, c, m) struct mbuf *m_new = NULL; if (m == NULL) { - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) return(ENOBUFS); - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); return(ENOBUFS); @@ -1295,14 +1295,14 @@ static int sf_encap(sc, c, m_head) if (m != NULL) { struct mbuf *m_new = NULL; - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) { printf("sf%d: no memory for tx list", sc->sf_unit); return(1); } if (m_head->m_pkthdr.len > MHLEN) { - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); printf("sf%d: no memory for tx list", diff --git a/sys/dev/netif/sis/if_sis.c b/sys/dev/netif/sis/if_sis.c index a2354db2d8..821ae9c683 100644 --- a/sys/dev/netif/sis/if_sis.c +++ b/sys/dev/netif/sis/if_sis.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.14 2004/05/06 10:15:37 joerg Exp $ + * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.15 2004/06/02 14:42:54 eirikn Exp $ * * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $ */ @@ -1462,7 +1462,7 @@ static int sis_newbuf(struct sis_softc *sc, struct sis_desc *c, struct mbuf *m) { if (m == NULL) { - m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + m = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR); if (m == NULL) return(ENOBUFS); } else { diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c index 322a5ca2e2..cfe171d50d 100644 --- a/sys/dev/netif/sk/if_sk.c +++ b/sys/dev/netif/sk/if_sk.c @@ -32,7 +32,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $ - * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.14 2004/04/07 05:45:29 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.15 2004/06/02 14:42:54 eirikn Exp $ * * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $ */ @@ -947,7 +947,7 @@ static int sk_newbuf(sc_if, c, m) if (m == NULL) { caddr_t *buf = NULL; - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) return(ENOBUFS); diff --git a/sys/dev/netif/sn/if_sn.c b/sys/dev/netif/sn/if_sn.c index 77fc5d2224..e35cd2a643 100644 --- a/sys/dev/netif/sn/if_sn.c +++ b/sys/dev/netif/sn/if_sn.c @@ -29,7 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sn/if_sn.c,v 1.7.2.3 2001/02/04 04:38:38 toshi Exp $ - * $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.8 2004/03/23 22:19:03 hsu Exp $ + * $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.9 2004/06/02 14:42:55 eirikn Exp $ */ /* @@ -1063,7 +1063,7 @@ read_another: /* * Allocate a header mbuf from the kernel. */ - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) goto out; @@ -1073,7 +1073,7 @@ read_another: /* * Attach an mbuf cluster */ - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); /* * Insist on getting a cluster diff --git a/sys/dev/netif/snc/dp83932.c b/sys/dev/netif/snc/dp83932.c index 0cc0331305..6f93b2604f 100644 --- a/sys/dev/netif/snc/dp83932.c +++ b/sys/dev/netif/snc/dp83932.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/snc/dp83932.c,v 1.1.2.2 2003/02/11 08:52:00 nyan Exp $ */ -/* $DragonFly: src/sys/dev/netif/snc/Attic/dp83932.c,v 1.8 2004/03/23 22:19:03 hsu Exp $ */ +/* $DragonFly: src/sys/dev/netif/snc/Attic/dp83932.c,v 1.9 2004/06/02 14:42:55 eirikn Exp $ */ /* $NecBSD: dp83932.c,v 1.5 1999/07/29 05:08:44 kmatsuda Exp $ */ /* $NetBSD: if_snc.c,v 1.18 1998/04/25 21:27:40 scottr Exp $ */ @@ -1141,7 +1141,7 @@ sonic_get(sc, pkt, datalen) * Our sonic_read() and sonic_get() require it. */ - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == 0) return (0); m->m_pkthdr.rcvif = &sc->sc_if; @@ -1152,7 +1152,7 @@ sonic_get(sc, pkt, datalen) while (datalen > 0) { if (top) { - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m == 0) { m_freem(top); return (0); @@ -1160,7 +1160,7 @@ sonic_get(sc, pkt, datalen) len = MLEN; } if (datalen >= MINCLSIZE) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { if (top) m_freem(top); return (0); diff --git a/sys/dev/netif/sr/if_sr.c b/sys/dev/netif/sr/if_sr.c index d09cbed0e6..95a261ce0e 100644 --- a/sys/dev/netif/sr/if_sr.c +++ b/sys/dev/netif/sr/if_sr.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sr/if_sr.c,v 1.48.2.1 2002/06/17 15:10:58 jhay Exp $ - * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.9 2004/04/07 05:45:29 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.10 2004/06/02 14:42:55 eirikn Exp $ */ /* @@ -2090,7 +2090,7 @@ sr_get_packets(struct sr_softc *sc) sc->unit, rxstat, len); #endif - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { /* * eat (flush) packet if get mbuf fail!! @@ -2108,7 +2108,7 @@ sr_get_packets(struct sr_softc *sc) #endif /* NETGRAPH */ m->m_pkthdr.len = m->m_len = len; if (len > MHLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { /* * We couldn't get a big enough diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c index cced1caf4d..08755f1e09 100644 --- a/sys/dev/netif/ste/if_ste.c +++ b/sys/dev/netif/ste/if_ste.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $ - * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.9 2004/03/23 22:19:04 hsu Exp $ + * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.10 2004/06/02 14:42:55 eirikn Exp $ * * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $ */ @@ -1130,10 +1130,10 @@ static int ste_newbuf(sc, c, m) struct mbuf *m_new = NULL; if (m == NULL) { - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) return(ENOBUFS); - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); return(ENOBUFS); @@ -1507,13 +1507,13 @@ encap_retry: * mbuf chain first. Bail out if we can't get the * new buffers. Code borrowed from if_fxp.c. */ - MGETHDR(mn, M_DONTWAIT, MT_DATA); + MGETHDR(mn, MB_DONTWAIT, MT_DATA); if (mn == NULL) { m_freem(m_head); return ENOMEM; } if (m_head->m_pkthdr.len > MHLEN) { - MCLGET(mn, M_DONTWAIT); + MCLGET(mn, MB_DONTWAIT); if ((mn->m_flags & M_EXT) == 0) { m_freem(mn); m_freem(m_head); diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c index dfe0fb9713..23c8ca2371 100644 --- a/sys/dev/netif/ti/if_ti.c +++ b/sys/dev/netif/ti/if_ti.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $ - * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.10 2004/04/07 05:45:29 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.11 2004/06/02 14:42:55 eirikn Exp $ * * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $ */ @@ -776,11 +776,11 @@ static int ti_newbuf_std(sc, i, m) struct ti_rx_desc *r; if (m == NULL) { - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) return(ENOBUFS); - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); return(ENOBUFS); @@ -819,7 +819,7 @@ static int ti_newbuf_mini(sc, i, m) struct ti_rx_desc *r; if (m == NULL) { - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) { return(ENOBUFS); } @@ -860,7 +860,7 @@ static int ti_newbuf_jumbo(sc, i, m) caddr_t *buf = NULL; /* Allocate the mbuf. */ - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) { return(ENOBUFS); } diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c index 305125767d..c8ae00ac33 100644 --- a/sys/dev/netif/tl/if_tl.c +++ b/sys/dev/netif/tl/if_tl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $ - * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.9 2004/03/23 22:19:04 hsu Exp $ + * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.10 2004/06/02 14:42:55 eirikn Exp $ * * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $ */ @@ -1439,11 +1439,11 @@ static int tl_newbuf(sc, c) { struct mbuf *m_new = NULL; - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) return(ENOBUFS); - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); return(ENOBUFS); @@ -1881,13 +1881,13 @@ static int tl_encap(sc, c, m_head) if (m != NULL) { struct mbuf *m_new = NULL; - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) { printf("tl%d: no memory for tx list\n", sc->tl_unit); return(1); } if (m_head->m_pkthdr.len > MHLEN) { - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); printf("tl%d: 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 555d0feb22..6b6e9b8d70 100644 --- a/sys/dev/netif/tx/if_tx.c +++ b/sys/dev/netif/tx/if_tx.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/tx/if_tx.c,v 1.61.2.1 2002/10/29 01:43:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.10 2004/04/07 05:45:30 dillon Exp $ + * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.11 2004/06/02 14:42:55 eirikn Exp $ */ /* @@ -1413,7 +1413,7 @@ epic_queue_last_packet(sc) if ((desc->status & 0x8000) || (buf->mbuf != NULL)) return (EBUSY); - MGETHDR(m0, M_DONTWAIT, MT_DATA); + MGETHDR(m0, MB_DONTWAIT, MT_DATA); if (NULL == m0) return (ENOBUFS); diff --git a/sys/dev/netif/tx/if_txvar.h b/sys/dev/netif/tx/if_txvar.h index bcd9385f29..3391cf0da3 100644 --- a/sys/dev/netif/tx/if_txvar.h +++ b/sys/dev/netif/tx/if_txvar.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/tx/if_txvar.h,v 1.14.2.1 2002/10/29 01:43:50 semenu Exp $ - * $DragonFly: src/sys/dev/netif/tx/if_txvar.h,v 1.2 2003/06/17 04:28:32 dillon Exp $ + * $DragonFly: src/sys/dev/netif/tx/if_txvar.h,v 1.3 2004/06/02 14:42:55 eirikn Exp $ */ /* @@ -134,9 +134,9 @@ struct epic_type { /* Macro to get either mbuf cluster or nothing */ #define EPIC_MGETCLUSTER(m) \ - { MGETHDR((m),M_DONTWAIT,MT_DATA); \ + { MGETHDR((m),MB_DONTWAIT,MT_DATA); \ if (m) { \ - MCLGET((m),M_DONTWAIT); \ + MCLGET((m),MB_DONTWAIT); \ if( 0 == ((m)->m_flags & M_EXT) ) { \ m_freem(m); \ (m) = NULL; \ diff --git a/sys/dev/netif/txp/if_txp.c b/sys/dev/netif/txp/if_txp.c index 4ce2111e8e..f41b2570cf 100644 --- a/sys/dev/netif/txp/if_txp.c +++ b/sys/dev/netif/txp/if_txp.c @@ -1,6 +1,6 @@ /* $OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $ */ /* $FreeBSD: src/sys/dev/txp/if_txp.c,v 1.4.2.4 2001/12/14 19:50:43 jlemon Exp $ */ -/* $DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.10 2004/04/07 05:45:30 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.11 2004/06/02 14:42:55 eirikn Exp $ */ /* * Copyright (c) 2001 @@ -737,13 +737,13 @@ txp_rx_reclaim(sc, r) */ struct mbuf *mnew; - MGETHDR(mnew, M_DONTWAIT, MT_DATA); + MGETHDR(mnew, MB_DONTWAIT, MT_DATA); if (mnew == NULL) { m_freem(m); goto next; } if (m->m_len > (MHLEN - 2)) { - MCLGET(mnew, M_DONTWAIT); + MCLGET(mnew, MB_DONTWAIT); if (!(mnew->m_flags & M_EXT)) { m_freem(mnew); m_freem(m); @@ -820,11 +820,11 @@ txp_rxbuf_reclaim(sc) if (sd->sd_mbuf != NULL) break; - MGETHDR(sd->sd_mbuf, M_DONTWAIT, MT_DATA); + MGETHDR(sd->sd_mbuf, MB_DONTWAIT, MT_DATA); if (sd->sd_mbuf == NULL) goto err_sd; - MCLGET(sd->sd_mbuf, M_DONTWAIT); + MCLGET(sd->sd_mbuf, MB_DONTWAIT); if ((sd->sd_mbuf->m_flags & M_EXT) == 0) goto err_mbuf; sd->sd_mbuf->m_pkthdr.rcvif = ifp; @@ -1125,11 +1125,11 @@ txp_rxring_fill(sc) for (i = 0; i < RXBUF_ENTRIES; i++) { sd = sc->sc_rxbufs[i].rb_sd; - MGETHDR(sd->sd_mbuf, M_DONTWAIT, MT_DATA); + MGETHDR(sd->sd_mbuf, MB_DONTWAIT, MT_DATA); if (sd->sd_mbuf == NULL) return(ENOBUFS); - MCLGET(sd->sd_mbuf, M_DONTWAIT); + MCLGET(sd->sd_mbuf, MB_DONTWAIT); if ((sd->sd_mbuf->m_flags & M_EXT) == 0) { m_freem(sd->sd_mbuf); return(ENOBUFS); diff --git a/sys/dev/netif/vr/if_vr.c b/sys/dev/netif/vr/if_vr.c index 43b241267a..6475c471d6 100644 --- a/sys/dev/netif/vr/if_vr.c +++ b/sys/dev/netif/vr/if_vr.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $ - * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.9 2004/03/23 22:19:04 hsu Exp $ + * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.10 2004/06/02 14:42:55 eirikn Exp $ * * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $ */ @@ -1024,11 +1024,11 @@ static int vr_newbuf(sc, c, m) struct mbuf *m_new = NULL; if (m == NULL) { - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) return(ENOBUFS); - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); return(ENOBUFS); @@ -1403,13 +1403,13 @@ static int vr_encap(sc, c, m_head) if (m != NULL) { struct mbuf *m_new = NULL; - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) { printf("vr%d: no memory for tx list\n", sc->vr_unit); return(1); } if (m_head->m_pkthdr.len > MHLEN) { - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); printf("vr%d: no memory for tx list\n", diff --git a/sys/dev/netif/vx/if_vx.c b/sys/dev/netif/vx/if_vx.c index fa2e59a9d9..e71bccb74d 100644 --- a/sys/dev/netif/vx/if_vx.c +++ b/sys/dev/netif/vx/if_vx.c @@ -28,7 +28,7 @@ * 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.10 2004/03/23 22:19:05 hsu Exp $ + * $DragonFly: src/sys/dev/netif/vx/if_vx.c,v 1.11 2004/06/02 14:42:56 eirikn Exp $ * */ @@ -755,7 +755,7 @@ vxget(sc, totlen) m = sc->mb[sc->next_mb]; sc->mb[sc->next_mb] = 0; if (m == 0) { - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == 0) return 0; } else { @@ -794,7 +794,7 @@ vxget(sc, totlen) m = sc->mb[sc->next_mb]; sc->mb[sc->next_mb] = 0; if (m == 0) { - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m == 0) { splx(sh); m_freem(top); @@ -806,7 +806,7 @@ vxget(sc, totlen) len = MLEN; } if (totlen >= MINCLSIZE) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if (m->m_flags & M_EXT) len = MCLBYTES; } @@ -992,7 +992,7 @@ vxmbuffill(sp) i = sc->last_mb; do { if (sc->mb[i] == NULL) - MGET(sc->mb[i], M_DONTWAIT, MT_DATA); + MGET(sc->mb[i], MB_DONTWAIT, MT_DATA); if (sc->mb[i] == NULL) break; i = (i + 1) % MAX_MBS; diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c index c3a978c200..8a983c65b1 100644 --- a/sys/dev/netif/wb/if_wb.c +++ b/sys/dev/netif/wb/if_wb.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $ - * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.9 2004/03/23 22:19:05 hsu Exp $ + * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.10 2004/06/02 14:42:56 eirikn Exp $ * * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $ */ @@ -1094,7 +1094,7 @@ static int wb_newbuf(sc, c, m) struct mbuf *m_new = NULL; if (m == NULL) { - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) return(ENOBUFS); @@ -1448,11 +1448,11 @@ static int wb_encap(sc, c, m_head) if (m != NULL) { struct mbuf *m_new = NULL; - MGETHDR(m_new, M_DONTWAIT, MT_DATA); + MGETHDR(m_new, MB_DONTWAIT, MT_DATA); if (m_new == NULL) return(1); if (m_head->m_pkthdr.len > MHLEN) { - MCLGET(m_new, M_DONTWAIT); + MCLGET(m_new, MB_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); return(1); diff --git a/sys/dev/netif/wi/if_wi.c b/sys/dev/netif/wi/if_wi.c index 804c5cb47a..67f973864c 100644 --- a/sys/dev/netif/wi/if_wi.c +++ b/sys/dev/netif/wi/if_wi.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/wi/if_wi.c,v 1.103.2.2 2002/08/02 07:11:34 imp Exp $ - * $DragonFly: src/sys/dev/netif/wi/if_wi.c,v 1.10 2004/03/23 22:19:05 hsu Exp $ + * $DragonFly: src/sys/dev/netif/wi/if_wi.c,v 1.11 2004/06/02 14:42:56 eirikn Exp $ */ /* @@ -575,12 +575,12 @@ wi_rxeof(sc) int datlen, hdrlen; /* first allocate mbuf for packet storage */ - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { ifp->if_ierrors++; return; } - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if (!(m->m_flags & M_EXT)) { m_freem(m); ifp->if_ierrors++; @@ -679,12 +679,12 @@ wi_rxeof(sc) return; } - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { ifp->if_ierrors++; return; } - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if (!(m->m_flags & M_EXT)) { m_freem(m); ifp->if_ierrors++; diff --git a/sys/dev/netif/wi/wi_hostap.c b/sys/dev/netif/wi/wi_hostap.c index 50c17a5d25..aaaa2d9bff 100644 --- a/sys/dev/netif/wi/wi_hostap.c +++ b/sys/dev/netif/wi/wi_hostap.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/wi/wi_hostap.c,v 1.7.2.4 2002/08/02 07:11:34 imp Exp $ - * $DragonFly: src/sys/dev/netif/wi/Attic/wi_hostap.c,v 1.7 2004/04/07 05:45:30 dillon Exp $ + * $DragonFly: src/sys/dev/netif/wi/Attic/wi_hostap.c,v 1.8 2004/06/02 14:42:56 eirikn Exp $ */ /* This is experimental Host AP software for Prism 2 802.11b interfaces. @@ -1106,7 +1106,7 @@ wihap_data_input(struct wi_softc *sc, struct wi_frame *rxfrm, struct mbuf *m) /* If it's multicast, make a copy. */ if (mcast) { - m = m_copym(m, 0, M_COPYALL, M_DONTWAIT); + m = m_copym(m, 0, M_COPYALL, MB_DONTWAIT); if (m == NULL) return(0); m->m_flags |= M_MCAST; /* XXX */ diff --git a/sys/dev/netif/wl/if_wl.c b/sys/dev/netif/wl/if_wl.c index 01366d5f29..58a6653134 100644 --- a/sys/dev/netif/wl/if_wl.c +++ b/sys/dev/netif/wl/if_wl.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/isa/if_wl.c,v 1.27.2.2 2000/07/17 21:24:32 archie Exp $ */ -/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.10 2004/05/04 12:08:45 hmp Exp $ */ +/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.11 2004/06/02 14:42:56 eirikn Exp $ */ /* * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -979,7 +979,7 @@ wlread(int unit, u_short fd_p) outw(PIOR1(base), fd.rbd_offset); insw(PIOP1(base), &rbd, sizeof(rbd_t)/2); bytes_in_msg = rbd.status & RBD_SW_COUNT; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); tm = m; if (m == (struct mbuf *)0) { /* @@ -1001,7 +1001,7 @@ wlread(int unit, u_short fd_p) /* always use a cluster. jrb */ - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if (m->m_flags & M_EXT) { m->m_len = MCLBYTES; } @@ -1032,7 +1032,7 @@ wlread(int unit, u_short fd_p) mlen += bytes; if (!(bytes_in_mbuf -= bytes)) { - MGET(tm->m_next, M_DONTWAIT, MT_DATA); + MGET(tm->m_next, MB_DONTWAIT, MT_DATA); tm = tm->m_next; if (tm == (struct mbuf *)0) { m_freem(m); diff --git a/sys/dev/netif/wx/if_wx.c b/sys/dev/netif/wx/if_wx.c index a3acbe7cf3..7e64a97e47 100644 --- a/sys/dev/netif/wx/if_wx.c +++ b/sys/dev/netif/wx/if_wx.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/pci/if_wx.c,v 1.5.2.12 2003/03/05 18:42:34 njl Exp $ */ -/* $DragonFly: src/sys/dev/netif/wx/Attic/if_wx.c,v 1.8 2004/03/23 22:19:05 hsu Exp $ */ +/* $DragonFly: src/sys/dev/netif/wx/Attic/if_wx.c,v 1.9 2004/06/02 14:42:56 eirikn Exp $ */ /* * Principal Author: Matthew Jacob * Copyright (c) 1999, 2001 by Traakan Software @@ -767,7 +767,7 @@ wx_start(struct ifnet *ifp) if (mb_head->m_next == NULL) { mb_head->m_len = WX_MIN_RPKT_SIZE; } else { - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { m_freem(mb_head); break; @@ -940,12 +940,12 @@ wx_start(struct ifnet *ifp) * for the last mbuf in a chain (we could just try and adjust * it), but it's just simpler to try and cluster it. */ - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { m_freem(mb_head); break; } - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_freem(m); m_freem(mb_head); @@ -1894,12 +1894,12 @@ static int wx_get_rbuf(wx_softc_t *sc, rxpkt_t *rxpkt) { struct mbuf *mb; - MGETHDR(mb, M_DONTWAIT, MT_DATA); + MGETHDR(mb, MB_DONTWAIT, MT_DATA); if (mb == NULL) { rxpkt->dptr = NULL; return (-1); } - MCLGET(mb, M_DONTWAIT); + MCLGET(mb, MB_DONTWAIT); if ((mb->m_flags & M_EXT) == 0) { m_freem(mb); rxpkt->dptr = NULL; diff --git a/sys/dev/netif/xe/if_xe.c b/sys/dev/netif/xe/if_xe.c index ed6720bb03..95bd724882 100644 --- a/sys/dev/netif/xe/if_xe.c +++ b/sys/dev/netif/xe/if_xe.c @@ -25,7 +25,7 @@ * * $Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $ * $FreeBSD: src/sys/dev/xe/if_xe.c,v 1.13.2.6 2003/02/05 22:03:57 mbr Exp $ - * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.9 2004/03/23 22:19:05 hsu Exp $ + * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.10 2004/06/02 14:42:56 eirikn Exp $ */ /* @@ -943,7 +943,7 @@ xe_intr(void *xscp) if (len & 0x01) len++; - MGETHDR(mbp, M_DONTWAIT, MT_DATA); /* Allocate a header mbuf */ + MGETHDR(mbp, MB_DONTWAIT, MT_DATA); /* Allocate a header mbuf */ if (mbp != NULL) { mbp->m_pkthdr.rcvif = ifp; mbp->m_pkthdr.len = mbp->m_len = len; @@ -954,7 +954,7 @@ xe_intr(void *xscp) * alignment hack below. */ if (len + 2 > MHLEN) { - MCLGET(mbp, M_DONTWAIT); + MCLGET(mbp, MB_DONTWAIT); if ((mbp->m_flags & M_EXT) == 0) { m_freem(mbp); mbp = NULL; diff --git a/sys/dev/netif/xl/if_xl.c b/sys/dev/netif/xl/if_xl.c index ffea59f205..58c5f4715d 100644 --- a/sys/dev/netif/xl/if_xl.c +++ b/sys/dev/netif/xl/if_xl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_xl.c,v 1.72.2.28 2003/10/08 06:01:57 murray Exp $ - * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.11 2004/03/23 22:19:05 hsu Exp $ + * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.12 2004/06/02 14:42:56 eirikn Exp $ */ /* @@ -928,7 +928,7 @@ xl_testpacket(sc) ifp = &sc->arpcom.ac_if; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) return; @@ -1999,7 +1999,7 @@ xl_newbuf(sc, c) int error; u_int32_t baddr; - m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + m_new = m_getcl(MB_DONTWAIT, MT_DATA, M_PKTHDR); if (m_new == NULL) return(ENOBUFS); @@ -2509,7 +2509,7 @@ xl_encap(sc, c, m_head) if (error) { struct mbuf *m_new; - m_new = m_defrag(m_head, M_DONTWAIT); + m_new = m_defrag(m_head, MB_DONTWAIT); if (m_new == NULL) { m_freem(m_head); return(1); diff --git a/sys/emulation/43bsd/43bsd_socket.c b/sys/emulation/43bsd/43bsd_socket.c index 4fe5661690..06efb57083 100644 --- a/sys/emulation/43bsd/43bsd_socket.c +++ b/sys/emulation/43bsd/43bsd_socket.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/emulation/43bsd/43bsd_socket.c,v 1.4 2003/10/08 01:30:32 daver Exp $ + * $DragonFly: src/sys/emulation/43bsd/43bsd_socket.c,v 1.5 2004/06/02 14:42:56 eirikn Exp $ * from: DragonFly kern/uipc_syscalls.c,v 1.13 * * The original versions of these syscalls used to live in @@ -249,7 +249,7 @@ osendmsg(struct osendmsg_args *uap) error = EINVAL; goto cleanup; } - control = m_get(M_WAIT, MT_CONTROL); + control = m_get(MB_WAIT, MT_CONTROL); if (control == NULL) { error = ENOBUFS; goto cleanup; @@ -268,7 +268,7 @@ 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), M_WAIT); + M_PREPEND(control, sizeof(*cm), MB_WAIT); if (control == NULL) { error = ENOBUFS; goto cleanup; diff --git a/sys/emulation/linux/linux_socket.c b/sys/emulation/linux/linux_socket.c index 011b068dfa..b0b0663871 100644 --- a/sys/emulation/linux/linux_socket.c +++ b/sys/emulation/linux/linux_socket.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.19.2.8 2001/11/07 20:33:55 marcel Exp $ - * $DragonFly: src/sys/emulation/linux/linux_socket.c,v 1.17 2004/04/05 00:06:02 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/linux_socket.c,v 1.18 2004/06/02 14:42:57 eirikn Exp $ */ #include @@ -856,7 +856,7 @@ linux_sendmsg(struct linux_sendmsg_args *args, int *res) error = EINVAL; goto cleanup; } - control = m_get(M_WAIT, MT_CONTROL); + control = m_get(MB_WAIT, MT_CONTROL); if (control == NULL) { error = ENOBUFS; goto cleanup; diff --git a/sys/emulation/svr4/svr4_stream.c b/sys/emulation/svr4/svr4_stream.c index 3c666dc269..174ce33f88 100644 --- a/sys/emulation/svr4/svr4_stream.c +++ b/sys/emulation/svr4/svr4_stream.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_stream.c,v 1.12.2.2 2000/11/26 04:42:27 dillon Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_stream.c,v 1.12 2004/03/04 10:29:23 hsu Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_stream.c,v 1.13 2004/06/02 14:42:57 eirikn Exp $ */ /* @@ -202,7 +202,7 @@ svr4_sendit(td, s, mp, flags, retval) error = EINVAL; goto bad; } - control = m_get(M_WAIT, MT_CONTROL); + control = m_get(MB_WAIT, MT_CONTROL); if (control == NULL) { error = ENOBUFS; goto bad; diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index cbffb0e3da..f99234874a 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -33,7 +33,7 @@ * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.51.2.24 2003/04/15 06:59:29 silby Exp $ - * $DragonFly: src/sys/kern/uipc_mbuf.c,v 1.16 2004/05/26 14:12:34 hmp Exp $ + * $DragonFly: src/sys/kern/uipc_mbuf.c,v 1.17 2004/06/02 14:42:57 eirikn Exp $ */ #include "opt_param.h" @@ -165,14 +165,14 @@ mbinit(dummy) mbstat.m_mhlen = MHLEN; s = splimp(); - if (m_mballoc(NMB_INIT, M_DONTWAIT) == 0) + if (m_mballoc(NMB_INIT, MB_DONTWAIT) == 0) goto bad; #if MCLBYTES <= PAGE_SIZE - if (m_clalloc(NCL_INIT, M_DONTWAIT) == 0) + if (m_clalloc(NCL_INIT, MB_DONTWAIT) == 0) goto bad; #else /* It's OK to call contigmalloc in this context. */ - if (m_clalloc(16, M_WAIT) == 0) + if (m_clalloc(16, MB_WAIT) == 0) goto bad; #endif splx(s); @@ -210,7 +210,7 @@ m_mballoc(nmb, how) * still be able to free a substantial amount of space. * * XXX Furthermore, we can also work with "recycled" mbufs (when - * we're calling with M_WAIT the sleep procedure will be woken + * we're calling with MB_WAIT the sleep procedure will be woken * up when an mbuf is freed. See m_mballoc_wait()). */ if (mb_map_full) @@ -218,7 +218,7 @@ m_mballoc(nmb, how) nbytes = round_page(nmb * MSIZE); p = (caddr_t)kmem_malloc(mb_map, nbytes, M_NOWAIT); - if (p == 0 && how == M_WAIT) { + if (p == 0 && how == MB_WAIT) { mbstat.m_wait++; p = (caddr_t)kmem_malloc(mb_map, nbytes, M_WAITOK); } @@ -243,7 +243,7 @@ m_mballoc(nmb, how) /* * Once the mb_map has been exhausted and if the call to the allocation macros - * (or, in some cases, functions) is with M_WAIT, then it is necessary to rely + * (or, in some cases, functions) is with MB_WAIT, then it is necessary to rely * solely on reclaimed mbufs. Here we wait for an mbuf to be freed for a * designated (mbuf_wait) time. */ @@ -269,10 +269,10 @@ m_mballoc_wait(int caller, int type) p = NULL; switch (caller) { case MGET_C: - MGET(p, M_DONTWAIT, type); + MGET(p, MB_DONTWAIT, type); break; case MGETHDR_C: - MGETHDR(p, M_DONTWAIT, type); + MGETHDR(p, MB_DONTWAIT, type); break; default: panic("m_mballoc_wait: invalid caller (%d)", caller); @@ -301,7 +301,7 @@ kproc_mclalloc(void) tsleep(&i_want_my_mcl, 0, "mclalloc", 0); for (; i_want_my_mcl; i_want_my_mcl--) { - if (m_clalloc(1, M_WAIT) == 0) + if (m_clalloc(1, MB_WAIT) == 0) printf("m_clalloc failed even in process context!\n"); } } @@ -350,7 +350,7 @@ m_clalloc(ncl, how) goto m_clalloc_fail; #if MCLBYTES > PAGE_SIZE - if (how != M_WAIT) { + if (how != MB_WAIT) { i_want_my_mcl += ncl; wakeup(&i_want_my_mcl); mbstat.m_wait++; @@ -362,7 +362,7 @@ m_clalloc(ncl, how) #else npg = ncl; p = (caddr_t)kmem_malloc(mb_map, ctob(npg), - how != M_WAIT ? M_NOWAIT : M_WAITOK); + how != MB_WAIT ? M_NOWAIT : M_WAITOK); ncl = ncl * PAGE_SIZE / MCLBYTES; #endif /* @@ -392,7 +392,7 @@ m_clalloc_fail: /* * Once the mb_map submap has been exhausted and the allocation is called with - * M_WAIT, we rely on the mclfree union pointers. If nothing is free, we will + * MB_WAIT, we rely on the mclfree union pointers. If nothing is free, we will * sleep for a designated amount of time (mbuf_wait) or until we're woken up * due to sudden mcluster availability. */ @@ -414,7 +414,7 @@ m_clalloc_wait(void) * Now that we (think) that we've got something, we will redo and * MGET, but avoid getting into another instance of m_clalloc_wait() */ - p = m_mclalloc(M_DONTWAIT); + p = m_mclalloc(MB_DONTWAIT); s = splimp(); if (p != NULL) { /* We waited and got something... */ @@ -442,7 +442,7 @@ m_retry(i, t) /* * Must only do the reclaim if not in an interrupt context. */ - if (i == M_WAIT) { + if (i == MB_WAIT) { KASSERT(mycpu->gd_intr_nesting_level == 0, ("MBALLOC: CANNOT WAIT IN INTERRUPT")); m_reclaim(); @@ -490,7 +490,7 @@ m_retryhdr(i, t) /* * Must only do the reclaim if not in an interrupt context. */ - if (i == M_WAIT) { + if (i == MB_WAIT) { KASSERT(mycpu->gd_intr_nesting_level == 0, ("MBALLOC: CANNOT WAIT IN INTERRUPT")); m_reclaim(); @@ -572,7 +572,7 @@ m_get(how, type) } else { splx(ms); m = m_retry(how, type); - if (m == NULL && how == M_WAIT) + if (m == NULL && how == MB_WAIT) m = m_mballoc_wait(MGET_C, type); } return (m); @@ -605,7 +605,7 @@ m_gethdr(how, type) } else { splx(ms); m = m_retryhdr(how, type); - if (m == NULL && how == M_WAIT) + if (m == NULL && how == MB_WAIT) m = m_mballoc_wait(MGETHDR_C, type); } return (m); @@ -766,7 +766,7 @@ m_mclalloc(int how) return(mp); } splx(s); - if (how == M_WAIT) + if (how == MB_WAIT) return(m_clalloc_wait()); return(NULL); } @@ -913,7 +913,7 @@ m_prepend(m, len, 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 M_WAIT/M_DONTWAIT from caller. + * The wait parameter is a choice of MB_WAIT/MB_DONTWAIT from caller. * Note that the copy is read-only, because clusters are not copied, * only their reference counts are incremented. */ @@ -1316,7 +1316,7 @@ m_pullup(n, len) } else { if (len > MHLEN) goto bad; - MGET(m, M_DONTWAIT, n->m_type); + MGET(m, MB_DONTWAIT, n->m_type); if (m == 0) goto bad; m->m_len = 0; @@ -1449,7 +1449,7 @@ m_devget(buf, totlen, off0, ifp, copy) cp += off + 2 * sizeof(u_short); totlen -= 2 * sizeof(u_short); } - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == 0) return (0); m->m_pkthdr.rcvif = ifp; @@ -1458,7 +1458,7 @@ m_devget(buf, totlen, off0, ifp, copy) while (totlen > 0) { if (top) { - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m == 0) { m_freem(top); return (0); @@ -1467,7 +1467,7 @@ m_devget(buf, totlen, off0, ifp, copy) } len = min(totlen, epkt - cp); if (len >= MINCLSIZE) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if (m->m_flags & M_EXT) m->m_len = len = min(len, MCLBYTES); else @@ -1519,7 +1519,7 @@ m_copyback(m0, off, len, cp) off -= mlen; totlen += mlen; if (m->m_next == 0) { - n = m_getclr(M_DONTWAIT, m->m_type); + n = m_getclr(MB_DONTWAIT, m->m_type); if (n == 0) goto out; n->m_len = min(MLEN, len + off); @@ -1538,7 +1538,7 @@ m_copyback(m0, off, len, cp) if (len == 0) break; if (m->m_next == 0) { - n = m_get(M_DONTWAIT, m->m_type); + n = m_get(MB_DONTWAIT, m->m_type); if (n == 0) break; n->m_len = min(MLEN, len); diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c index 2d8051c38b..bc42e2509b 100644 --- a/sys/kern/uipc_mbuf2.c +++ b/sys/kern/uipc_mbuf2.c @@ -1,5 +1,5 @@ /* $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.5 2004/04/20 07:35:22 joerg Exp $ */ +/* $DragonFly: src/sys/kern/uipc_mbuf2.c,v 1.6 2004/06/02 14:42:57 eirikn 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 $ */ @@ -153,7 +153,7 @@ m_pulldown(m, off, len, 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, M_DONTWAIT); + o = m_dup1(n, off, n->m_len - off, MB_DONTWAIT); if (o == NULL) { m_freem(m); return NULL; /* ENOBUFS */ @@ -212,9 +212,9 @@ m_pulldown(m, off, len, offp) * now, we need to do the hard way. don't m_copy as there's no room * on both end. */ - MGET(o, M_DONTWAIT, m->m_type); + MGET(o, MB_DONTWAIT, m->m_type); if (o && len > MLEN) { - MCLGET(o, M_DONTWAIT); + MCLGET(o, MB_DONTWAIT); if ((o->m_flags & M_EXT) == 0) { m_free(o); o = NULL; @@ -301,7 +301,7 @@ m_tag_alloc(u_int32_t cookie, int type, int len, int wait) if (len < 0) return NULL; t = malloc(len + sizeof(struct m_tag), M_PACKET_TAGS, - wait != M_WAIT ? M_NOWAIT : M_WAITOK); + wait != MB_WAIT ? M_NOWAIT : M_WAITOK); if (t == NULL) return NULL; t->m_tag_id = type; diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index e804fc4f58..35db2125f8 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -33,7 +33,7 @@ * * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 * $FreeBSD: src/sys/kern/uipc_socket.c,v 1.68.2.24 2003/11/11 17:18:18 silby Exp $ - * $DragonFly: src/sys/kern/uipc_socket.c,v 1.20 2004/05/26 14:12:34 hmp Exp $ + * $DragonFly: src/sys/kern/uipc_socket.c,v 1.21 2004/06/02 14:42:57 eirikn Exp $ */ #include "opt_inet.h" @@ -531,7 +531,7 @@ restart: top->m_flags |= M_EOR; } else do { if (top == 0) { - MGETHDR(m, M_WAIT, MT_DATA); + MGETHDR(m, MB_WAIT, MT_DATA); if (m == NULL) { error = ENOBUFS; goto release; @@ -540,7 +540,7 @@ restart: m->m_pkthdr.len = 0; m->m_pkthdr.rcvif = (struct ifnet *)0; } else { - MGET(m, M_WAIT, MT_DATA); + MGET(m, MB_WAIT, MT_DATA); if (m == NULL) { error = ENOBUFS; goto release; @@ -548,7 +548,7 @@ restart: mlen = MLEN; } if (resid >= MINCLSIZE) { - MCLGET(m, M_WAIT); + MCLGET(m, MB_WAIT); if ((m->m_flags & M_EXT) == 0) goto nopages; mlen = MCLBYTES; @@ -688,7 +688,7 @@ restart: splx(s); if (uio) { - top = m_uiomove(uio, M_WAIT, 0); + top = m_uiomove(uio, MB_WAIT, 0); if (top == NULL) goto release; } @@ -753,7 +753,7 @@ soreceive(so, psa, uio, mp0, controlp, flagsp) else flags = 0; if (flags & MSG_OOB) { - m = m_get(M_WAIT, MT_DATA); + m = m_get(MB_WAIT, MT_DATA); if (m == NULL) return (ENOBUFS); error = so_pru_rcvoob(so, m, flags & MSG_PEEK); @@ -944,7 +944,7 @@ dontblock: moff += len; else { if (mp) - *mp = m_copym(m, 0, len, M_WAIT); + *mp = m_copym(m, 0, len, MB_WAIT); m->m_data += len; m->m_len -= len; so->so_rcv.sb_cc -= len; @@ -1459,11 +1459,11 @@ soopt_getm(struct sockopt *sopt, struct mbuf **mp) struct mbuf *m, *m_prev; int sopt_size = sopt->sopt_valsize; - MGET(m, sopt->sopt_td ? M_WAIT : M_DONTWAIT, MT_DATA); + MGET(m, sopt->sopt_td ? MB_WAIT : MB_DONTWAIT, MT_DATA); if (m == 0) return ENOBUFS; if (sopt_size > MLEN) { - MCLGET(m, sopt->sopt_td ? M_WAIT : M_DONTWAIT); + MCLGET(m, sopt->sopt_td ? MB_WAIT : MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_free(m); return ENOBUFS; @@ -1477,13 +1477,13 @@ soopt_getm(struct sockopt *sopt, struct mbuf **mp) m_prev = m; while (sopt_size) { - MGET(m, sopt->sopt_td ? M_WAIT : M_DONTWAIT, MT_DATA); + MGET(m, sopt->sopt_td ? MB_WAIT : MB_DONTWAIT, MT_DATA); if (m == 0) { m_freem(*mp); return ENOBUFS; } if (sopt_size > MLEN) { - MCLGET(m, sopt->sopt_td ? M_WAIT : M_DONTWAIT); + MCLGET(m, sopt->sopt_td ? MB_WAIT : MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_freem(*mp); return ENOBUFS; diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index cbe5a28c62..69b4d62b1b 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -32,7 +32,7 @@ * * @(#)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.11 2004/05/10 10:51:31 hmp Exp $ + * $DragonFly: src/sys/kern/uipc_socket2.c,v 1.12 2004/06/02 14:42:57 eirikn Exp $ */ #include "opt_param.h" @@ -311,7 +311,7 @@ sowakeup(so, sb) if ((so->so_state & SS_ASYNC) && so->so_sigio != NULL) pgsigio(so->so_sigio, SIGIO, 0); if (sb->sb_flags & SB_UPCALL) - (*so->so_upcall)(so, so->so_upcallarg, M_DONTWAIT); + (*so->so_upcall)(so, so->so_upcallarg, MB_DONTWAIT); if (sb->sb_flags & SB_AIO) aio_swake(so, sb); KNOTE(&selinfo->si_note, 0); @@ -632,7 +632,7 @@ sbappendaddr(sb, asa, m0, control) return (0); if (asa->sa_len > MLEN) return (0); - MGET(m, M_DONTWAIT, MT_SONAME); + MGET(m, MB_DONTWAIT, MT_SONAME); if (m == 0) return (0); m->m_len = asa->sa_len; @@ -839,10 +839,10 @@ sbcreatecontrol(p, size, type, level) if (CMSG_SPACE((u_int)size) > MCLBYTES) return ((struct mbuf *) NULL); - if ((m = m_get(M_DONTWAIT, MT_CONTROL)) == NULL) + if ((m = m_get(MB_DONTWAIT, MT_CONTROL)) == NULL) return ((struct mbuf *) NULL); if (CMSG_SPACE((u_int)size) > MLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_free(m); return ((struct mbuf *) NULL); diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index c20e9bef46..ab995ff61a 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -35,7 +35,7 @@ * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.65.2.17 2003/04/04 17:11:16 tegge Exp $ - * $DragonFly: src/sys/kern/uipc_syscalls.c,v 1.36 2004/05/20 22:42:24 dillon Exp $ + * $DragonFly: src/sys/kern/uipc_syscalls.c,v 1.37 2004/06/02 14:42:57 eirikn Exp $ */ #include "opt_ktrace.h" @@ -684,7 +684,7 @@ sendmsg(struct sendmsg_args *uap) error = EINVAL; goto cleanup; } - control = m_get(M_WAIT, MT_CONTROL); + control = m_get(MB_WAIT, MT_CONTROL); if (control == NULL) { error = ENOBUFS; goto cleanup; @@ -1375,7 +1375,7 @@ sendfile(struct sendfile_args *uap) auio.uio_td = td; auio.uio_resid = hbytes; - mheader = m_uiomove(&auio, M_WAIT, 0); + mheader = m_uiomove(&auio, MB_WAIT, 0); iovec_free(&iov, aiov); if (mheader == NULL) @@ -1599,7 +1599,7 @@ retry_lookup: /* * Get an mbuf header and set it up as having external storage. */ - MGETHDR(m, M_WAIT, MT_DATA); + MGETHDR(m, MB_WAIT, MT_DATA); if (m == NULL) { error = ENOBUFS; sf_buf_free(sf); diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 1ce167775e..37afccdce7 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -32,7 +32,7 @@ * * From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94 * $FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.54.2.10 2003/03/04 17:28:09 nectar Exp $ - * $DragonFly: src/sys/kern/uipc_usrreq.c,v 1.12 2004/03/05 16:57:15 hsu Exp $ + * $DragonFly: src/sys/kern/uipc_usrreq.c,v 1.13 2004/06/02 14:42:57 eirikn Exp $ */ #include @@ -1075,7 +1075,7 @@ unp_internalize(struct mbuf *control, struct thread *td) if (newlen - control->m_len > M_TRAILINGSPACE(control)) { if (control->m_flags & M_EXT) return (E2BIG); - MCLGET(control, M_WAIT); + MCLGET(control, MB_WAIT); if ((control->m_flags & M_EXT) == 0) return (ENOBUFS); diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 7647410f29..91c6293e1e 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -38,7 +38,7 @@ * @(#)bpf.c 8.2 (Berkeley) 3/28/94 * * $FreeBSD: src/sys/net/bpf.c,v 1.59.2.12 2002/04/14 21:41:48 luigi Exp $ - * $DragonFly: src/sys/net/bpf.c,v 1.17 2004/05/19 22:52:59 dillon Exp $ + * $DragonFly: src/sys/net/bpf.c,v 1.18 2004/06/02 14:42:57 eirikn Exp $ */ #include "use_bpf.h" @@ -234,12 +234,12 @@ bpf_movein(uio, linktype, mp, sockp, datlen) if ((unsigned)len > MCLBYTES) return (EIO); - MGETHDR(m, M_WAIT, MT_DATA); + MGETHDR(m, MB_WAIT, MT_DATA); if (m == 0) return (ENOBUFS); if (len > MHLEN) { #if BSD >= 199103 - MCLGET(m, M_WAIT); + MCLGET(m, MB_WAIT); if ((m->m_flags & M_EXT) == 0) { #else MCLGET(m); diff --git a/sys/net/bridge/bridge.c b/sys/net/bridge/bridge.c index e579b0ec42..8cf8fc0760 100644 --- a/sys/net/bridge/bridge.c +++ b/sys/net/bridge/bridge.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/bridge.c,v 1.16.2.25 2003/01/23 21:06:44 sam Exp $ - * $DragonFly: src/sys/net/bridge/Attic/bridge.c,v 1.7 2004/04/22 04:21:32 dillon Exp $ + * $DragonFly: src/sys/net/bridge/Attic/bridge.c,v 1.8 2004/06/02 14:42:58 eirikn Exp $ */ /* @@ -916,7 +916,7 @@ bdg_forward(struct mbuf *m0, struct ether_header *const eh, struct ifnet *dst) struct mbuf *m ; if (shared) { - m = m_copypacket(m0, M_DONTWAIT); + m = m_copypacket(m0, MB_DONTWAIT); if (m == NULL) /* copy failed, give up */ return m0; } else { @@ -933,7 +933,7 @@ bdg_forward(struct mbuf *m0, struct ether_header *const eh, struct ifnet *dst) m->m_pkthdr.len += ETHER_HDR_LEN ; bdg_predict++; } else { - M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT); + M_PREPEND(m, ETHER_HDR_LEN, MB_DONTWAIT); if (m == NULL) /* nope... */ return m0 ; bcopy(&save_eh, mtod(m, struct ether_header *), ETHER_HDR_LEN); @@ -980,7 +980,7 @@ forward: m = m0 ; m0 = NULL ; /* original is gone */ } else { - m = m_copypacket(m0, M_DONTWAIT); + m = m_copypacket(m0, MB_DONTWAIT); if (m == NULL) { printf("bdg_forward: sorry, m_copypacket failed!\n"); return m0 ; /* the original is still there... */ @@ -997,7 +997,7 @@ forward: m->m_pkthdr.len += ETHER_HDR_LEN ; bdg_predict++; } else { - M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT); + M_PREPEND(m, ETHER_HDR_LEN, MB_DONTWAIT); if (!m && verbose) printf("M_PREPEND failed\n"); if (m == NULL) diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c index 23019b3591..8b4d16c412 100644 --- a/sys/net/bsd_comp.c +++ b/sys/net/bsd_comp.c @@ -41,7 +41,7 @@ * This version is for use with mbufs on BSD-derived systems. * * $FreeBSD: src/sys/net/bsd_comp.c,v 1.11.2.1 2002/04/14 21:41:48 luigi Exp $ - * $DragonFly: src/sys/net/bsd_comp.c,v 1.5 2004/04/22 04:21:29 dillon Exp $ + * $DragonFly: src/sys/net/bsd_comp.c,v 1.6 2004/06/02 14:42:57 eirikn Exp $ */ #include @@ -487,12 +487,12 @@ bsd_compress(state, mret, mp, slen, maxolen) *wptr++ = (v); \ if (wptr >= cp_end) { \ m->m_len = wptr - mtod(m, u_char *); \ - MGET(m->m_next, M_DONTWAIT, MT_DATA); \ + MGET(m->m_next, MB_DONTWAIT, MT_DATA); \ m = m->m_next; \ if (m) { \ m->m_len = 0; \ if (maxolen - olen > MLEN) \ - MCLGET(m, M_DONTWAIT); \ + MCLGET(m, MB_DONTWAIT); \ wptr = mtod(m, u_char *); \ cp_end = wptr + M_TRAILINGSPACE(m); \ } else \ @@ -529,12 +529,12 @@ bsd_compress(state, mret, mp, slen, maxolen) maxolen = slen; /* Allocate one mbuf to start with. */ - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); *mret = m; if (m != NULL) { m->m_len = 0; if (maxolen + db->hdrlen > MLEN) - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); m->m_data += db->hdrlen; wptr = mtod(m, u_char *); cp_end = wptr + M_TRAILINGSPACE(m); @@ -863,13 +863,13 @@ bsd_decompress(state, cmp, dmpp) /* * Allocate one mbuf to start with. */ - MGETHDR(dmp, M_DONTWAIT, MT_DATA); + MGETHDR(dmp, MB_DONTWAIT, MT_DATA); if (dmp == NULL) return DECOMP_ERROR; mret = dmp; dmp->m_len = 0; dmp->m_next = NULL; - MCLGET(dmp, M_DONTWAIT); + MCLGET(dmp, MB_DONTWAIT); dmp->m_data += db->hdrlen; wptr = mtod(dmp, u_char *); space = M_TRAILINGSPACE(dmp) - PPP_HDRLEN + 1; @@ -975,7 +975,7 @@ bsd_decompress(state, cmp, dmpp) */ if ((space -= codelen + extra) < 0) { dmp->m_len = wptr - mtod(dmp, u_char *); - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { m_freem(mret); return DECOMP_ERROR; @@ -983,7 +983,7 @@ bsd_decompress(state, cmp, dmpp) m->m_len = 0; m->m_next = NULL; dmp->m_next = m; - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); space = M_TRAILINGSPACE(m) - (codelen + extra); if (space < 0) { /* now that's what I call *compression*. */ diff --git a/sys/net/ef/if_ef.c b/sys/net/ef/if_ef.c index dbc49ddbe1..e251ee86c9 100644 --- a/sys/net/ef/if_ef.c +++ b/sys/net/ef/if_ef.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_ef.c,v 1.2.2.4 2001/02/22 09:27:04 bp Exp $ - * $DragonFly: src/sys/net/ef/if_ef.c,v 1.9 2004/03/23 22:19:06 hsu Exp $ + * $DragonFly: src/sys/net/ef/if_ef.c,v 1.10 2004/06/02 14:42:58 eirikn Exp $ */ #include "opt_inet.h" @@ -437,7 +437,7 @@ ef_output(struct ifnet *ifp, struct mbuf **mp, struct sockaddr *dst, short *tp, type = htons(m->m_pkthdr.len); break; case ETHER_FT_8022: - M_PREPEND(m, ETHER_HDR_LEN + 3, M_WAIT); + M_PREPEND(m, ETHER_HDR_LEN + 3, MB_WAIT); if (m == NULL) { *mp = NULL; return ENOBUFS; @@ -460,7 +460,7 @@ ef_output(struct ifnet *ifp, struct mbuf **mp, struct sockaddr *dst, short *tp, *hlen += 3; break; case ETHER_FT_SNAP: - M_PREPEND(m, 8, M_WAIT); + M_PREPEND(m, 8, MB_WAIT); if (m == NULL) { *mp = NULL; return ENOBUFS; diff --git a/sys/net/gre/if_gre.c b/sys/net/gre/if_gre.c index 7ef3cbcfb2..c1acbc63f4 100644 --- a/sys/net/gre/if_gre.c +++ b/sys/net/gre/if_gre.c @@ -1,6 +1,6 @@ /* $NetBSD: if_gre.c,v 1.42 2002/08/14 00:23:27 itojun Exp $ */ /* $FreeBSD: src/sys/net/if_gre.c,v 1.9.2.3 2003/01/23 21:06:44 sam Exp $ */ -/* $DragonFly: src/sys/net/gre/if_gre.c,v 1.9 2004/03/23 22:19:06 hsu Exp $ */ +/* $DragonFly: src/sys/net/gre/if_gre.c,v 1.10 2004/06/02 14:42:58 eirikn Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -297,7 +297,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, if ((m->m_data - msiz) < m->m_pktdat) { /* need new mbuf */ - MGETHDR(m0, M_DONTWAIT, MT_HEADER); + MGETHDR(m0, MB_DONTWAIT, MT_HEADER); if (m0 == NULL) { IF_DROP(&ifp->if_snd); m_freem(m); @@ -351,7 +351,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, error = EAFNOSUPPORT; goto end; } - M_PREPEND(m, sizeof(struct greip), M_DONTWAIT); + M_PREPEND(m, sizeof(struct greip), MB_DONTWAIT); } else { IF_DROP(&ifp->if_snd); m_freem(m); diff --git a/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c b/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c index 7825b24619..b3b5777ba7 100644 --- a/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c +++ b/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c @@ -37,7 +37,7 @@ * $Id: i4b_ihfc_l1if.c,v 1.10 2000/09/19 13:50:36 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c,v 1.7.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c,v 1.4 2003/08/07 21:17:26 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c,v 1.5 2004/06/02 14:42:58 eirikn Exp $ * *---------------------------------------------------------------------------*/ @@ -126,7 +126,7 @@ ihfc_ph_data_req(int unit, struct mbuf *m, int freeflag) /* "Allow" I-frames (-hp) */ - if (freeflag == MBUF_DONTFREE) m = m_copypacket(m, M_DONTWAIT); + if (freeflag == MBUF_DONTFREE) m = m_copypacket(m, MB_DONTWAIT); if (!_IF_QFULL(&S_IFQUEUE) && m) { diff --git a/sys/net/i4b/layer2/i4b_mbuf.c b/sys/net/i4b/layer2/i4b_mbuf.c index 21a3a171eb..51656427c8 100644 --- a/sys/net/i4b/layer2/i4b_mbuf.c +++ b/sys/net/i4b/layer2/i4b_mbuf.c @@ -28,7 +28,7 @@ * ------------------------------------ * * $FreeBSD: src/sys/i4b/layer2/i4b_mbuf.c,v 1.6.2.1 2001/08/10 14:08:41 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer2/i4b_mbuf.c,v 1.4 2004/02/13 17:45:50 joerg Exp $ + * $DragonFly: src/sys/net/i4b/layer2/i4b_mbuf.c,v 1.5 2004/06/02 14:42:58 eirikn Exp $ * * last edit-date: [Sat Jan 13 13:15:45 2001] * @@ -88,7 +88,7 @@ i4b_Dgetmbuf(int len) return(NULL); } - MGETHDR(m, M_DONTWAIT, MT_I4B_D); /* get mbuf with pkthdr */ + MGETHDR(m, MB_DONTWAIT, MT_I4B_D); /* get mbuf with pkthdr */ /* did we actually get the mbuf ? */ @@ -104,7 +104,7 @@ i4b_Dgetmbuf(int len) if(len >= MHLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if(!(m->m_flags & M_EXT)) { @@ -173,7 +173,7 @@ i4b_Bgetmbuf(int len) return(NULL); } - MGETHDR(m, M_DONTWAIT, MT_I4B_B); /* get mbuf with pkthdr */ + MGETHDR(m, MB_DONTWAIT, MT_I4B_B); /* get mbuf with pkthdr */ /* did we actually get the mbuf ? */ @@ -189,7 +189,7 @@ i4b_Bgetmbuf(int len) if(len >= MHLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if(!(m->m_flags & M_EXT)) { diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c index 20f3200705..8b743b4ea4 100644 --- a/sys/net/if_arcsubr.c +++ b/sys/net/if_arcsubr.c @@ -1,6 +1,6 @@ /* $NetBSD: if_arcsubr.c,v 1.36 2001/06/14 05:44:23 itojun Exp $ */ /* $FreeBSD: src/sys/net/if_arcsubr.c,v 1.1.2.5 2003/02/05 18:42:15 fjoe Exp $ */ -/* $DragonFly: src/sys/net/Attic/if_arcsubr.c,v 1.7 2004/02/13 17:45:49 joerg Exp $ */ +/* $DragonFly: src/sys/net/Attic/if_arcsubr.c,v 1.8 2004/06/02 14:42:57 eirikn Exp $ */ /* * Copyright (c) 1994, 1995 Ignatios Souvatzis @@ -212,7 +212,7 @@ arc_output(ifp, m, dst, rt0) } isphds = arc_isphds(atype); - M_PREPEND(m, isphds ? ARC_HDRNEWLEN : ARC_HDRLEN, M_DONTWAIT); + M_PREPEND(m, isphds ? ARC_HDRNEWLEN : ARC_HDRLEN, MB_DONTWAIT); if (m == 0) senderr(ENOBUFS); ah = mtod(m, struct arc_header *); @@ -299,13 +299,13 @@ arc_frag_next(ifp) /* split out next fragment and return it */ if (ac->sflag < ac->fsflag) { /* we CAN'T have short packets here */ - ac->curr_frag = m_split(m, ARC_MAX_DATA, M_DONTWAIT); + ac->curr_frag = m_split(m, ARC_MAX_DATA, MB_DONTWAIT); if (ac->curr_frag == 0) { m_freem(m); return 0; } - M_PREPEND(m, ARC_HDRNEWLEN, M_DONTWAIT); + M_PREPEND(m, ARC_HDRNEWLEN, MB_DONTWAIT); if (m == 0) { m_freem(ac->curr_frag); ac->curr_frag = 0; @@ -324,7 +324,7 @@ arc_frag_next(ifp) ARC_MAX_FORBID_LEN - ARC_HDRNEWLEN + 2)) { ac->curr_frag = 0; - M_PREPEND(m, ARC_HDRNEWLEN_EXC, M_DONTWAIT); + M_PREPEND(m, ARC_HDRNEWLEN_EXC, MB_DONTWAIT); if (m == 0) return 0; @@ -337,7 +337,7 @@ arc_frag_next(ifp) } else { ac->curr_frag = 0; - M_PREPEND(m, ARC_HDRNEWLEN, M_DONTWAIT); + M_PREPEND(m, ARC_HDRNEWLEN, MB_DONTWAIT); if (m == 0) return 0; diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c index 2db9c51380..e0f4124a65 100644 --- a/sys/net/if_atmsubr.c +++ b/sys/net/if_atmsubr.c @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_atmsubr.c,v 1.10.2.1 2001/03/06 00:29:26 obrien Exp $ - * $DragonFly: src/sys/net/if_atmsubr.c,v 1.8 2004/02/13 17:45:49 joerg Exp $ + * $DragonFly: src/sys/net/if_atmsubr.c,v 1.9 2004/06/02 14:42:57 eirikn Exp $ */ /* @@ -182,7 +182,7 @@ atm_output(ifp, m0, dst, rt0) sz = sizeof(atmdst); atm_flags = ATM_PH_FLAGS(&atmdst); if (atm_flags & ATM_PH_LLCSNAP) sz += 8; /* sizeof snap == 8 */ - M_PREPEND(m, sz, M_DONTWAIT); + M_PREPEND(m, sz, MB_DONTWAIT); if (m == 0) senderr(ENOBUFS); ad = mtod(m, struct atm_pseudohdr *); diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index b09b0e9165..446e307095 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -32,7 +32,7 @@ * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.70.2.33 2003/04/28 15:45:53 archie Exp $ - * $DragonFly: src/sys/net/if_ethersubr.c,v 1.13 2004/04/16 14:21:57 joerg Exp $ + * $DragonFly: src/sys/net/if_ethersubr.c,v 1.14 2004/06/02 14:42:57 eirikn Exp $ */ #include "opt_atalk.h" @@ -229,7 +229,7 @@ ether_output(ifp, m, dst, rt0) if ( aa->aa_flags & AFA_PHASE2 ) { struct llc llc; - M_PREPEND(m, sizeof(struct llc), M_WAIT); + M_PREPEND(m, sizeof(struct llc), MB_WAIT); llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP; llc.llc_control = LLC_UI; bcopy(at_org_code, llc.llc_snap_org_code, sizeof(at_org_code)); @@ -254,7 +254,7 @@ ether_output(ifp, m, dst, rt0) type = htons( m->m_pkthdr.len); break; case 0xe0e0: /* Novell 802.2 and Token-Ring */ - M_PREPEND(m, 3, M_WAIT); + M_PREPEND(m, 3, MB_WAIT); type = htons( m->m_pkthdr.len); cp = mtod(m, u_char *); *cp++ = 0xE0; @@ -304,7 +304,7 @@ ether_output(ifp, m, dst, rt0) * Add local net header. If no space in first mbuf, * allocate another. */ - M_PREPEND(m, sizeof (struct ether_header), M_DONTWAIT); + M_PREPEND(m, sizeof (struct ether_header), MB_DONTWAIT); if (m == 0) senderr(ENOBUFS); eh = mtod(m, struct ether_header *); @@ -425,7 +425,7 @@ no_bridge: m->m_len += ETHER_HDR_LEN ; m->m_pkthdr.len += ETHER_HDR_LEN ; } else { - M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT); + M_PREPEND(m, ETHER_HDR_LEN, MB_DONTWAIT); if (m == NULL) /* nope... */ return ENOBUFS; bcopy(&save_eh, mtod(m, struct ether_header *), @@ -496,7 +496,7 @@ ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst, struct mbuf *m ; if (shared) { - m = m_copypacket(*m0, M_DONTWAIT); + m = m_copypacket(*m0, MB_DONTWAIT); if (m == NULL) return 0; } else { @@ -512,7 +512,7 @@ ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst, m->m_len += ETHER_HDR_LEN ; m->m_pkthdr.len += ETHER_HDR_LEN ; } else { - M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT); + M_PREPEND(m, ETHER_HDR_LEN, MB_DONTWAIT); if (m == NULL) /* nope... */ return 0; bcopy(&save_eh, mtod(m, struct ether_header *), diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c index 6a5c8197b5..cb4e266e4a 100644 --- a/sys/net/if_fddisubr.c +++ b/sys/net/if_fddisubr.c @@ -34,7 +34,7 @@ * * from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.41.2.8 2002/02/20 23:34:09 fjoe Exp $ - * $DragonFly: src/sys/net/Attic/if_fddisubr.c,v 1.8 2004/02/13 17:45:49 joerg Exp $ + * $DragonFly: src/sys/net/Attic/if_fddisubr.c,v 1.9 2004/06/02 14:42:57 eirikn Exp $ */ #include "opt_atalk.h" @@ -213,7 +213,7 @@ fddi_output(ifp, m, dst, rt0) if (aa->aa_flags & AFA_PHASE2) { struct llc llc; - M_PREPEND(m, sizeof(struct llc), M_WAIT); + M_PREPEND(m, sizeof(struct llc), MB_WAIT); if (m == 0) senderr(ENOBUFS); llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP; @@ -298,7 +298,7 @@ fddi_output(ifp, m, dst, rt0) if (type != 0) { struct llc *l; - M_PREPEND(m, sizeof (struct llc), M_DONTWAIT); + M_PREPEND(m, sizeof (struct llc), MB_DONTWAIT); if (m == 0) senderr(ENOBUFS); l = mtod(m, struct llc *); @@ -313,7 +313,7 @@ fddi_output(ifp, m, dst, rt0) * Add local net header. If no space in first mbuf, * allocate another. */ - M_PREPEND(m, sizeof (struct fddi_header), M_DONTWAIT); + M_PREPEND(m, sizeof (struct fddi_header), MB_DONTWAIT); if (m == 0) senderr(ENOBUFS); fh = mtod(m, struct fddi_header *); diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c index 87036c998c..fe0775706b 100644 --- a/sys/net/if_iso88025subr.c +++ b/sys/net/if_iso88025subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_iso88025subr.c,v 1.7.2.7 2002/06/18 00:15:31 kbyanc Exp $ - * $DragonFly: src/sys/net/Attic/if_iso88025subr.c,v 1.6 2004/01/06 03:17:25 dillon Exp $ + * $DragonFly: src/sys/net/Attic/if_iso88025subr.c,v 1.7 2004/06/02 14:42:57 eirikn Exp $ * */ @@ -225,7 +225,7 @@ iso88025_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct if (!arpresolve(ifp, rt, m, dst, edst, rt0)) return (0); /* if not yet resolved */ /* Add LLC and SNAP headers */ - M_PREPEND(m, 8, M_DONTWAIT); + M_PREPEND(m, 8, MB_DONTWAIT); if (m == 0) senderr(ENOBUFS); l = mtod(m, struct llc *); @@ -268,7 +268,7 @@ iso88025_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct * allocate another. */ - M_PREPEND(m, ISO88025_HDR_LEN + rif_len, M_DONTWAIT); + M_PREPEND(m, ISO88025_HDR_LEN + rif_len, MB_DONTWAIT); if (m == 0) senderr(ENOBUFS); diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index e79594e308..e271427362 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -32,7 +32,7 @@ * * @(#)if_loop.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/net/if_loop.c,v 1.47.2.8 2003/06/01 01:46:11 silby Exp $ - * $DragonFly: src/sys/net/if_loop.c,v 1.10 2004/03/23 22:19:05 hsu Exp $ + * $DragonFly: src/sys/net/if_loop.c,v 1.11 2004/06/02 14:42:57 eirikn Exp $ */ /* @@ -155,7 +155,7 @@ looutput(ifp, m, dst, rt) */ if (m && m->m_next != NULL) { - n = m_defrag(m, M_DONTWAIT); + n = m_defrag(m, MB_DONTWAIT); if (n == NULL) { m_freem(m); diff --git a/sys/net/ip6fw/ip6_fw.c b/sys/net/ip6fw/ip6_fw.c index e84b674f47..606ba411e2 100644 --- a/sys/net/ip6fw/ip6_fw.c +++ b/sys/net/ip6fw/ip6_fw.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ip6_fw.c,v 1.2.2.9 2002/04/28 05:40:27 suz Exp $ */ -/* $DragonFly: src/sys/net/ip6fw/ip6_fw.c,v 1.7 2004/04/22 04:22:00 dillon Exp $ */ +/* $DragonFly: src/sys/net/ip6fw/ip6_fw.c,v 1.8 2004/06/02 14:42:58 eirikn Exp $ */ /* $KAME: ip6_fw.c,v 1.21 2001/01/24 01:25:32 itojun Exp $ */ /* @@ -1105,11 +1105,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(M_WAIT, MT_DATA); /* XXX */ + *mm = m = m_get(MB_WAIT, MT_DATA); /* XXX */ if (!m) return(ENOBUFS); if (sizeof *(fcp->rule) > MLEN) { - MCLGET(m, M_WAIT); + MCLGET(m, MB_WAIT); if ((m->m_flags & M_EXT) == 0) { m_free(m); return(ENOBUFS); @@ -1118,14 +1118,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(M_WAIT, MT_DATA); /* XXX */ + m->m_next = m_get(MB_WAIT, MT_DATA); /* XXX */ if (!m->m_next) { m_freem(*mm); return(ENOBUFS); } m = m->m_next; if (sizeof *(fcp->rule) > MLEN) { - MCLGET(m, M_WAIT); + MCLGET(m, MB_WAIT); 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 ca17919650..f7d8e0aa30 100644 --- a/sys/net/ip_mroute/ip_mroute.c +++ b/sys/net/ip_mroute/ip_mroute.c @@ -18,7 +18,7 @@ * bandwidth metering and signaling * * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.56.2.10 2003/08/24 21:37:34 hsu Exp $ - * $DragonFly: src/sys/net/ip_mroute/ip_mroute.c,v 1.10 2004/04/22 04:22:01 dillon Exp $ + * $DragonFly: src/sys/net/ip_mroute/ip_mroute.c,v 1.11 2004/06/02 14:42:58 eirikn Exp $ */ #include "opt_mrouting.h" @@ -1244,7 +1244,7 @@ X_ip_mforward(struct ip *ip, struct ifnet *ifp, struct mbuf *m, return ENOBUFS; } - mb0 = m_copypacket(m, M_DONTWAIT); + mb0 = m_copypacket(m, MB_DONTWAIT); if (mb0 && (M_HASCL(mb0) || mb0->m_len < hlen)) mb0 = m_pullup(mb0, hlen); if (mb0 == NULL) { @@ -1617,7 +1617,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, M_DONTWAIT); + mb_copy = m_copypacket(m, MB_DONTWAIT); if (mb_copy && (M_HASCL(mb_copy) || mb_copy->m_len < hlen)) mb_copy = m_pullup(mb_copy, hlen); if (mb_copy == NULL) @@ -1647,13 +1647,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, M_DONTWAIT, MT_HEADER); + MGETHDR(mb_copy, MB_DONTWAIT, 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, M_DONTWAIT)) == NULL) { + if ((mb_copy->m_next = m_copypacket(m, MB_DONTWAIT)) == NULL) { m_freem(mb_copy); return; } @@ -2526,7 +2526,7 @@ bw_upcalls_send(void) * Allocate a new mbuf, initialize it with the header and * the payload for the pending calls. */ - MGETHDR(m, M_DONTWAIT, MT_HEADER); + MGETHDR(m, MB_DONTWAIT, MT_HEADER); if (m == NULL) { log(LOG_WARNING, "bw_upcalls_send: cannot allocate mbuf\n"); return; @@ -2813,7 +2813,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, M_DONTWAIT); + mb_copy = m_copypacket(m, MB_DONTWAIT); if (mb_copy == NULL) return NULL; mb_copy = m_pullup(mb_copy, ip->ip_hl << 2); @@ -2858,7 +2858,7 @@ pim_register_send_upcall(struct ip *ip, struct vif *vifp, /* * Add a new mbuf with an upcall header */ - MGETHDR(mb_first, M_DONTWAIT, MT_HEADER); + MGETHDR(mb_first, MB_DONTWAIT, MT_HEADER); if (mb_first == NULL) { m_freem(mb_copy); return ENOBUFS; @@ -2916,7 +2916,7 @@ pim_register_send_rp(struct ip *ip, struct vif *vifp, /* * Add a new mbuf with the encapsulating header */ - MGETHDR(mb_first, M_DONTWAIT, MT_HEADER); + MGETHDR(mb_first, MB_DONTWAIT, 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 77a67ba198..2313198fc1 100644 --- a/sys/net/ipfw/ip_fw2.c +++ b/sys/net/ipfw/ip_fw2.c @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.6.2.12 2003/04/08 10:42:32 maxim Exp $ - * $DragonFly: src/sys/net/ipfw/ip_fw2.c,v 1.11 2004/04/22 04:22:02 dillon Exp $ + * $DragonFly: src/sys/net/ipfw/ip_fw2.c,v 1.12 2004/06/02 14:42:58 eirikn Exp $ */ #define DEB(x) @@ -1053,7 +1053,7 @@ send_pkt(struct ipfw_flow_id *id, u_int32_t seq, u_int32_t ack, int flags) struct tcphdr *tcp; struct route sro; /* fake route */ - MGETHDR(m, M_DONTWAIT, MT_HEADER); + MGETHDR(m, MB_DONTWAIT, MT_HEADER); if (m == 0) return; m->m_pkthdr.rcvif = (struct ifnet *)0; diff --git a/sys/net/oldbridge/bridge.c b/sys/net/oldbridge/bridge.c index 76ce31d870..f0fe7851c6 100644 --- a/sys/net/oldbridge/bridge.c +++ b/sys/net/oldbridge/bridge.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/bridge.c,v 1.16.2.25 2003/01/23 21:06:44 sam Exp $ - * $DragonFly: src/sys/net/oldbridge/Attic/bridge.c,v 1.7 2004/04/22 04:21:32 dillon Exp $ + * $DragonFly: src/sys/net/oldbridge/Attic/bridge.c,v 1.8 2004/06/02 14:42:58 eirikn Exp $ */ /* @@ -916,7 +916,7 @@ bdg_forward(struct mbuf *m0, struct ether_header *const eh, struct ifnet *dst) struct mbuf *m ; if (shared) { - m = m_copypacket(m0, M_DONTWAIT); + m = m_copypacket(m0, MB_DONTWAIT); if (m == NULL) /* copy failed, give up */ return m0; } else { @@ -933,7 +933,7 @@ bdg_forward(struct mbuf *m0, struct ether_header *const eh, struct ifnet *dst) m->m_pkthdr.len += ETHER_HDR_LEN ; bdg_predict++; } else { - M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT); + M_PREPEND(m, ETHER_HDR_LEN, MB_DONTWAIT); if (m == NULL) /* nope... */ return m0 ; bcopy(&save_eh, mtod(m, struct ether_header *), ETHER_HDR_LEN); @@ -980,7 +980,7 @@ forward: m = m0 ; m0 = NULL ; /* original is gone */ } else { - m = m_copypacket(m0, M_DONTWAIT); + m = m_copypacket(m0, MB_DONTWAIT); if (m == NULL) { printf("bdg_forward: sorry, m_copypacket failed!\n"); return m0 ; /* the original is still there... */ @@ -997,7 +997,7 @@ forward: m->m_pkthdr.len += ETHER_HDR_LEN ; bdg_predict++; } else { - M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT); + M_PREPEND(m, ETHER_HDR_LEN, MB_DONTWAIT); if (!m && verbose) printf("M_PREPEND failed\n"); if (m == NULL) diff --git a/sys/net/ppp/if_ppp.c b/sys/net/ppp/if_ppp.c index 91ea1506d3..fb09587d04 100644 --- a/sys/net/ppp/if_ppp.c +++ b/sys/net/ppp/if_ppp.c @@ -70,7 +70,7 @@ */ /* $FreeBSD: src/sys/net/if_ppp.c,v 1.67.2.4 2002/04/14 21:41:48 luigi Exp $ */ -/* $DragonFly: src/sys/net/ppp/if_ppp.c,v 1.17 2004/04/22 04:22:05 dillon Exp $ */ +/* $DragonFly: src/sys/net/ppp/if_ppp.c,v 1.18 2004/06/02 14:42:58 eirikn Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */ @@ -793,7 +793,7 @@ pppoutput(ifp, m0, dst, rtp) * (This assumes M_LEADINGSPACE is always 0 for a cluster mbuf.) */ if (M_LEADINGSPACE(m0) < PPP_HDRLEN) { - m0 = m_prepend(m0, PPP_HDRLEN, M_DONTWAIT); + m0 = m_prepend(m0, PPP_HDRLEN, MB_DONTWAIT); if (m0 == 0) { error = ENOBUFS; goto bad; @@ -1350,13 +1350,13 @@ ppp_inproc(sc, m) } /* Copy the PPP and IP headers into a new mbuf. */ - MGETHDR(mp, M_DONTWAIT, MT_DATA); + MGETHDR(mp, MB_DONTWAIT, MT_DATA); if (mp == NULL) goto bad; mp->m_len = 0; mp->m_next = NULL; if (hlen + PPP_HDRLEN > MHLEN) { - MCLGET(mp, M_DONTWAIT); + MCLGET(mp, MB_DONTWAIT); if (M_TRAILINGSPACE(mp) < hlen + PPP_HDRLEN) { m_freem(mp); goto bad; /* lose if big headers and no clusters */ @@ -1412,7 +1412,7 @@ ppp_inproc(sc, m) * whole cluster on it. */ if (ilen <= MHLEN && M_IS_CLUSTER(m)) { - MGETHDR(mp, M_DONTWAIT, MT_DATA); + MGETHDR(mp, MB_DONTWAIT, MT_DATA); if (mp != NULL) { 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 d0d12a2e77..9aac299390 100644 --- a/sys/net/ppp_layer/ppp_deflate.c +++ b/sys/net/ppp_layer/ppp_deflate.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/net/ppp_deflate.c,v 1.12.2.1 2002/04/14 21:41:48 luigi Exp $ */ -/* $DragonFly: src/sys/net/ppp_layer/ppp_deflate.c,v 1.5 2004/04/22 04:22:05 dillon Exp $ */ +/* $DragonFly: src/sys/net/ppp_layer/ppp_deflate.c,v 1.6 2004/06/02 14:42:59 eirikn Exp $ */ /* * ppp_deflate.c - interface the zlib procedures for Deflate compression @@ -247,12 +247,12 @@ z_compress(arg, mret, mp, orig_len, maxolen) /* Allocate one mbuf initially. */ if (maxolen > orig_len) maxolen = orig_len; - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); *mret = m; if (m != NULL) { m->m_len = 0; if (maxolen + state->hdrlen > MLEN) - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); wspace = M_TRAILINGSPACE(m); if (state->hdrlen + PPP_HDRLEN + 2 < wspace) { m->m_data += state->hdrlen; @@ -307,12 +307,12 @@ z_compress(arg, mret, mp, orig_len, maxolen) if (m != NULL) { m->m_len = wspace; olen += wspace; - MGET(m->m_next, M_DONTWAIT, MT_DATA); + MGET(m->m_next, MB_DONTWAIT, MT_DATA); m = m->m_next; if (m != NULL) { m->m_len = 0; if (maxolen - olen > MLEN) - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); state->strm.next_out = mtod(m, u_char *); state->strm.avail_out = wspace = M_TRAILINGSPACE(m); } @@ -504,13 +504,13 @@ z_decompress(arg, mi, mop) ++state->seqno; /* Allocate an output mbuf. */ - MGETHDR(mo, M_DONTWAIT, MT_DATA); + MGETHDR(mo, MB_DONTWAIT, MT_DATA); if (mo == NULL) return DECOMP_ERROR; mo_head = mo; mo->m_len = 0; mo->m_next = NULL; - MCLGET(mo, M_DONTWAIT); + MCLGET(mo, MB_DONTWAIT); ospace = M_TRAILINGSPACE(mo); if (state->hdrlen + PPP_HDRLEN < ospace) { mo->m_data += state->hdrlen; @@ -579,13 +579,13 @@ z_decompress(arg, mi, mop) } else { mo->m_len = ospace; olen += ospace; - MGET(mo->m_next, M_DONTWAIT, MT_DATA); + MGET(mo->m_next, MB_DONTWAIT, MT_DATA); mo = mo->m_next; if (mo == NULL) { m_freem(mo_head); return DECOMP_ERROR; } - MCLGET(mo, M_DONTWAIT); + MCLGET(mo, MB_DONTWAIT); state->strm.next_out = mtod(mo, u_char *); state->strm.avail_out = ospace = M_TRAILINGSPACE(mo); } diff --git a/sys/net/ppp_layer/ppp_tty.c b/sys/net/ppp_layer/ppp_tty.c index 8dd179c199..c868e4136d 100644 --- a/sys/net/ppp_layer/ppp_tty.c +++ b/sys/net/ppp_layer/ppp_tty.c @@ -71,7 +71,7 @@ */ /* $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.9 2004/01/06 03:17:26 dillon Exp $ */ +/* $DragonFly: src/sys/net/ppp_layer/ppp_tty.c,v 1.10 2004/06/02 14:42:59 eirikn Exp $ */ #include "opt_ppp.h" /* XXX for ppp_defs.h */ @@ -415,7 +415,7 @@ pppwrite(tp, uio, flag) s = spltty(); for (mp = &m0; uio->uio_resid; mp = &m->m_next) { - MGET(m, M_WAIT, MT_DATA); + MGET(m, MB_WAIT, MT_DATA); if ((*mp = m) == NULL) { m_freem(m0); splx(s); @@ -423,7 +423,7 @@ pppwrite(tp, uio, flag) } m->m_len = 0; if (uio->uio_resid >= MCLBYTES / 2) - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); len = M_TRAILINGSPACE(m); if (len > uio->uio_resid) len = uio->uio_resid; @@ -822,11 +822,11 @@ pppgetm(sc) mp = &sc->sc_m; for (len = sc->sc_mru + PPP_HDRLEN + PPP_FCSLEN; len > 0; ){ if ((m = *mp) == NULL) { - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) break; *mp = m; - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); } len -= M_DATASIZE(m); mp = &m->m_next; diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c index 1793e39b87..e2b5f4d697 100644 --- a/sys/net/raw_cb.c +++ b/sys/net/raw_cb.c @@ -32,7 +32,7 @@ * * @(#)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.5 2004/03/05 16:57:15 hsu Exp $ + * $DragonFly: src/sys/net/raw_cb.c,v 1.6 2004/06/02 14:42:57 eirikn Exp $ */ #include @@ -137,7 +137,7 @@ raw_bind(so, nam) if (ifnet == 0) return (EADDRNOTAVAIL); rp = sotorawcb(so); - nam = m_copym(nam, 0, M_COPYALL, M_TRYWAIT); + nam = m_copym(nam, 0, M_COPYALL, MB_TRYWAIT); rp->rcb_laddr = mtod(nam, struct sockaddr *); return (0); } diff --git a/sys/net/route.c b/sys/net/route.c index f708eb66b1..0c5532b2e0 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -32,7 +32,7 @@ * * @(#)route.c 8.3 (Berkeley) 1/9/95 * $FreeBSD: src/sys/net/route.c,v 1.59.2.10 2003/01/17 08:04:00 ru Exp $ - * $DragonFly: src/sys/net/route.c,v 1.6 2003/08/26 20:49:47 rob Exp $ + * $DragonFly: src/sys/net/route.c,v 1.7 2004/06/02 14:42:57 eirikn Exp $ */ #include "opt_inet.h" @@ -1079,7 +1079,7 @@ rtinit(ifa, cmd, flags) * (Assuming we have a mask) */ if (netmask != NULL) { - m = m_get(M_DONTWAIT, MT_SONAME); + m = m_get(MB_DONTWAIT, MT_SONAME); if (m == NULL) return(ENOBUFS); deldst = mtod(m, struct sockaddr *); diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 336916ed4d..3b8aa9a110 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -32,7 +32,7 @@ * * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 * $FreeBSD: src/sys/net/rtsock.c,v 1.44.2.11 2002/12/04 14:05:41 ru Exp $ - * $DragonFly: src/sys/net/rtsock.c,v 1.12 2004/04/22 04:21:29 dillon Exp $ + * $DragonFly: src/sys/net/rtsock.c,v 1.13 2004/06/02 14:42:57 eirikn Exp $ */ @@ -601,9 +601,9 @@ rt_msg1(type, rtinfo) } if (len > MCLBYTES) panic("rt_msg1"); - m = m_gethdr(M_DONTWAIT, MT_DATA); + m = m_gethdr(MB_DONTWAIT, MT_DATA); if (m && len > MHLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_free(m); m = NULL; diff --git a/sys/net/sl/if_sl.c b/sys/net/sl/if_sl.c index 3755d516a0..291e97ce9b 100644 --- a/sys/net/sl/if_sl.c +++ b/sys/net/sl/if_sl.c @@ -32,7 +32,7 @@ * * @(#)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.12 2004/04/22 04:22:06 dillon Exp $ + * $DragonFly: src/sys/net/sl/if_sl.c,v 1.13 2004/06/02 14:42:59 eirikn Exp $ */ /* @@ -251,7 +251,7 @@ slinit(sc) bio_imask, tty_imask, net_imask); #endif if (sc->sc_ep == (u_char *) 0) { - MCLALLOC(p, M_WAIT); + MCLALLOC(p, MB_WAIT); if (p) sc->sc_ep = (u_char *)p + SLBUFSIZE; else { @@ -722,7 +722,7 @@ sl_btom(sc, len) { struct mbuf *m; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) return (NULL); @@ -734,7 +734,7 @@ sl_btom(sc, len) * guarantees that packet will fit in a cluster. */ if (len >= MHLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { /* * we couldn't get a cluster - if memory's this diff --git a/sys/net/sppp/if_spppsubr.c b/sys/net/sppp/if_spppsubr.c index fff440b337..3c211624f4 100644 --- a/sys/net/sppp/if_spppsubr.c +++ b/sys/net/sppp/if_spppsubr.c @@ -18,7 +18,7 @@ * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997 * * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.59.2.13 2002/07/03 15:44:41 joerg Exp $ - * $DragonFly: src/sys/net/sppp/if_spppsubr.c,v 1.13 2004/04/22 04:22:06 dillon Exp $ + * $DragonFly: src/sys/net/sppp/if_spppsubr.c,v 1.14 2004/06/02 14:42:59 eirikn Exp $ */ #include @@ -612,7 +612,7 @@ sppp_input(struct ifnet *ifp, struct mbuf *m) * enough leading space in the existing mbuf). */ m_adj(m, vjlen); - M_PREPEND(m, hlen, M_DONTWAIT); + M_PREPEND(m, hlen, MB_DONTWAIT); if (m == NULL) goto drop2; bcopy(iphdr, mtod(m, u_char *), hlen); @@ -873,7 +873,7 @@ sppp_output(struct ifnet *ifp, struct mbuf *m, /* * Prepend general data packet PPP header. For now, IP only. */ - M_PREPEND (m, PPP_HEADER_LEN, M_DONTWAIT); + M_PREPEND (m, PPP_HEADER_LEN, MB_DONTWAIT); if (! m) { if (debug) log(LOG_DEBUG, SPP_FMT "no memory for transmit header\n", @@ -1344,7 +1344,7 @@ sppp_cisco_send(struct sppp *sp, int type, long par1, long par2) getmicrouptime(&tv); #endif - MGETHDR (m, M_DONTWAIT, MT_DATA); + MGETHDR (m, MB_DONTWAIT, MT_DATA); if (! m) return; m->m_pkthdr.len = m->m_len = PPP_HEADER_LEN + CISCO_PACKET_LEN; @@ -1404,7 +1404,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, M_DONTWAIT, MT_DATA); + MGETHDR (m, MB_DONTWAIT, MT_DATA); if (! m) return; m->m_pkthdr.len = m->m_len = PPP_HEADER_LEN + LCP_HEADER_LEN + len; @@ -4598,7 +4598,7 @@ sppp_auth_send(const struct cp *cp, struct sppp *sp, const char *msg; __va_list ap; - MGETHDR (m, M_DONTWAIT, MT_DATA); + MGETHDR (m, MB_DONTWAIT, MT_DATA); if (! m) return; m->m_pkthdr.rcvif = 0; diff --git a/sys/net/stf/if_stf.c b/sys/net/stf/if_stf.c index 7bf890e95d..7a8657d396 100644 --- a/sys/net/stf/if_stf.c +++ b/sys/net/stf/if_stf.c @@ -1,5 +1,5 @@ /* $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.8 2004/03/23 22:19:07 hsu Exp $ */ +/* $DragonFly: src/sys/net/stf/if_stf.c,v 1.9 2004/06/02 14:42:59 eirikn Exp $ */ /* $KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $ */ /* @@ -394,7 +394,7 @@ stf_output(ifp, m, dst, rt) } #endif /*NBPFILTER > 0*/ - M_PREPEND(m, sizeof(struct ip), M_DONTWAIT); + M_PREPEND(m, sizeof(struct ip), MB_DONTWAIT); if (m && m->m_len < sizeof(struct ip)) m = m_pullup(m, sizeof(struct ip)); if (m == NULL) diff --git a/sys/net/tap/if_tap.c b/sys/net/tap/if_tap.c index f85a3c6723..d3e7109d02 100644 --- a/sys/net/tap/if_tap.c +++ b/sys/net/tap/if_tap.c @@ -32,7 +32,7 @@ /* * $FreeBSD: src/sys/net/if_tap.c,v 1.3.2.3 2002/04/14 21:41:48 luigi Exp $ - * $DragonFly: src/sys/net/tap/if_tap.c,v 1.13 2004/05/19 22:53:00 dillon Exp $ + * $DragonFly: src/sys/net/tap/if_tap.c,v 1.14 2004/06/02 14:42:59 eirikn Exp $ * $Id: if_tap.c,v 0.21 2000/07/23 21:46:02 max Exp $ */ @@ -735,7 +735,7 @@ tapwrite(dev, uio, flag) tlen = uio->uio_resid; /* get a header mbuf */ - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) return (ENOBUFS); mlen = MHLEN; @@ -748,7 +748,7 @@ tapwrite(dev, uio, flag) *mp = m; mp = &m->m_next; if (uio->uio_resid > 0) { - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { error = ENOBUFS; break; diff --git a/sys/net/tun/if_tun.c b/sys/net/tun/if_tun.c index 9a3af843de..dcb55409b0 100644 --- a/sys/net/tun/if_tun.c +++ b/sys/net/tun/if_tun.c @@ -14,7 +14,7 @@ * operation though. * * $FreeBSD: src/sys/net/if_tun.c,v 1.74.2.8 2002/02/13 00:43:11 dillon Exp $ - * $DragonFly: src/sys/net/tun/if_tun.c,v 1.14 2004/05/19 22:53:01 dillon Exp $ + * $DragonFly: src/sys/net/tun/if_tun.c,v 1.15 2004/06/02 14:42:59 eirikn Exp $ */ #include "opt_atalk.h" @@ -352,7 +352,7 @@ tunoutput(ifp, m0, dst, rt) /* prepend sockaddr? this may abort if the mbuf allocation fails */ if (tp->tun_flags & TUN_LMODE) { /* allocate space for sockaddr */ - M_PREPEND(m0, dst->sa_len, M_DONTWAIT); + M_PREPEND(m0, dst->sa_len, MB_DONTWAIT); /* if allocation failed drop packet */ if (m0 == NULL){ @@ -368,7 +368,7 @@ tunoutput(ifp, m0, dst, rt) if (tp->tun_flags & TUN_IFHEAD) { /* Prepend the address family */ - M_PREPEND(m0, 4, M_DONTWAIT); + M_PREPEND(m0, 4, MB_DONTWAIT); /* if allocation failed drop packet */ if (m0 == NULL){ @@ -603,7 +603,7 @@ tunwrite(dev, uio, flag) tlen = uio->uio_resid; /* get a header mbuf */ - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) return ENOBUFS; mlen = MHLEN; @@ -616,7 +616,7 @@ tunwrite(dev, uio, flag) *mp = m; mp = &m->m_next; if (uio->uio_resid > 0) { - MGET (m, M_DONTWAIT, MT_DATA); + MGET (m, MB_DONTWAIT, MT_DATA); if (m == 0) { error = ENOBUFS; break; diff --git a/sys/net/vlan/if_vlan.c b/sys/net/vlan/if_vlan.c index 1ead59af2f..bb1c63d01d 100644 --- a/sys/net/vlan/if_vlan.c +++ b/sys/net/vlan/if_vlan.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_vlan.c,v 1.15.2.13 2003/02/14 22:25:58 fenner Exp $ - * $DragonFly: src/sys/net/vlan/if_vlan.c,v 1.8 2004/03/23 22:19:07 hsu Exp $ + * $DragonFly: src/sys/net/vlan/if_vlan.c,v 1.9 2004/06/02 14:42:59 eirikn Exp $ */ /* @@ -314,7 +314,7 @@ vlan_start(struct ifnet *ifp) m->m_pkthdr.rcvif = ifp; m->m_flags |= M_PROTO1; } else { - M_PREPEND(m, EVL_ENCAPLEN, M_DONTWAIT); + M_PREPEND(m, EVL_ENCAPLEN, MB_DONTWAIT); if (m == NULL) { printf("%s: M_PREPEND failed", ifp->if_xname); ifp->if_ierrors++; diff --git a/sys/netgraph/UI/ng_UI.c b/sys/netgraph/UI/ng_UI.c index 35b668cdeb..44cc0b7aad 100644 --- a/sys/netgraph/UI/ng_UI.c +++ b/sys/netgraph/UI/ng_UI.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_UI.c,v 1.6.2.2 2000/10/24 18:36:44 julian Exp $ - * $DragonFly: src/sys/netgraph/UI/ng_UI.c,v 1.3 2003/08/07 21:17:30 dillon Exp $ + * $DragonFly: src/sys/netgraph/UI/ng_UI.c,v 1.4 2004/06/02 14:42:59 eirikn Exp $ * $Whistle: ng_UI.c,v 1.14 1999/11/01 09:24:51 julian Exp $ */ @@ -185,7 +185,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, M_DONTWAIT); /* Prepend IP NLPID */ + M_PREPEND(m, 1, MB_DONTWAIT); /* Prepend IP NLPID */ if (!m) ERROUT(ENOBUFS); mtod(m, u_char *)[0] = HDLC_UI; diff --git a/sys/netgraph/cisco/ng_cisco.c b/sys/netgraph/cisco/ng_cisco.c index 3fcd160484..0a79ac6f99 100644 --- a/sys/netgraph/cisco/ng_cisco.c +++ b/sys/netgraph/cisco/ng_cisco.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_cisco.c,v 1.4.2.6 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/cisco/ng_cisco.c,v 1.4 2003/08/07 21:54:32 dillon Exp $ + * $DragonFly: src/sys/netgraph/cisco/ng_cisco.c,v 1.5 2004/06/02 14:43:00 eirikn Exp $ * $Whistle: ng_cisco.c,v 1.25 1999/11/01 09:24:51 julian Exp $ */ @@ -368,7 +368,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, M_DONTWAIT); + M_PREPEND(m, CISCO_HEADER_LEN, MB_DONTWAIT); if (!m) { error = ENOBUFS; goto out; @@ -610,7 +610,7 @@ cisco_send(sc_p sc, int type, long par1, long par2) getmicrotime(&time); - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (!m) return (ENOBUFS); diff --git a/sys/netgraph/ether/ng_ether.c b/sys/netgraph/ether/ng_ether.c index f418418ba3..4d1f05642f 100644 --- a/sys/netgraph/ether/ng_ether.c +++ b/sys/netgraph/ether/ng_ether.c @@ -38,7 +38,7 @@ * Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.2.2.13 2002/07/02 20:10:25 archie Exp $ - * $DragonFly: src/sys/netgraph/ether/ng_ether.c,v 1.4 2004/01/06 03:17:27 dillon Exp $ + * $DragonFly: src/sys/netgraph/ether/ng_ether.c,v 1.5 2004/06/02 14:43:00 eirikn Exp $ */ /* @@ -376,7 +376,7 @@ ng_ether_glueback_header(struct mbuf **mp, struct ether_header *eh) } /* Prepend the header back onto the front of the mbuf */ - M_PREPEND(m, sizeof(*eh), M_DONTWAIT); + M_PREPEND(m, sizeof(*eh), MB_DONTWAIT); if (m == NULL) { error = ENOBUFS; goto done; diff --git a/sys/netgraph/frame_relay/ng_frame_relay.c b/sys/netgraph/frame_relay/ng_frame_relay.c index 1c5e692fcd..b030cbd079 100644 --- a/sys/netgraph/frame_relay/ng_frame_relay.c +++ b/sys/netgraph/frame_relay/ng_frame_relay.c @@ -37,7 +37,7 @@ * Author: Julian Elisher * * $FreeBSD: src/sys/netgraph/ng_frame_relay.c,v 1.9.2.2 2000/10/24 18:36:45 julian Exp $ - * $DragonFly: src/sys/netgraph/frame_relay/ng_frame_relay.c,v 1.3 2003/08/07 21:17:31 dillon Exp $ + * $DragonFly: src/sys/netgraph/frame_relay/ng_frame_relay.c,v 1.4 2004/06/02 14:43:00 eirikn Exp $ * $Whistle: ng_frame_relay.c,v 1.20 1999/11/01 09:24:51 julian Exp $ */ @@ -373,7 +373,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, M_DONTWAIT); + M_PREPEND(m, alen, MB_DONTWAIT); if (m == NULL) { error = ENOBUFS; goto bad; diff --git a/sys/netgraph/l2tp/ng_l2tp.c b/sys/netgraph/l2tp/ng_l2tp.c index 1bdbf00b32..e562df0d64 100644 --- a/sys/netgraph/l2tp/ng_l2tp.c +++ b/sys/netgraph/l2tp/ng_l2tp.c @@ -38,7 +38,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_l2tp.c,v 1.1.2.1 2002/08/20 23:48:15 archie Exp $ - * $DragonFly: src/sys/netgraph/l2tp/ng_l2tp.c,v 1.4 2003/08/07 21:17:32 dillon Exp $ + * $DragonFly: src/sys/netgraph/l2tp/ng_l2tp.c,v 1.5 2004/06/02 14:43:00 eirikn Exp $ */ /* @@ -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, M_DONTWAIT); + M_PREPEND(m, 2, MB_DONTWAIT); 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], M_DONTWAIT)) == NULL) { + if ((m = L2TP_COPY_MBUF(seq->xwin[i], MB_DONTWAIT)) == 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)), - M_DONTWAIT); + MB_DONTWAIT); 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], M_DONTWAIT)) == NULL) + if ((m = L2TP_COPY_MBUF(seq->xwin[i], MB_DONTWAIT)) == NULL) priv->stats.memoryFailures++; else ng_l2tp_xmit_ctrl(priv, m, seq->ns); @@ -1350,7 +1350,7 @@ ng_l2tp_seq_rack_timeout(void *arg) seq->acks = 0; /* Retransmit oldest unack'd packet */ - if ((m = L2TP_COPY_MBUF(seq->xwin[0], M_DONTWAIT)) == NULL) + if ((m = L2TP_COPY_MBUF(seq->xwin[0], MB_DONTWAIT)) == NULL) priv->stats.memoryFailures++; else ng_l2tp_xmit_ctrl(priv, m, seq->rack); @@ -1377,7 +1377,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, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { priv->stats.memoryFailures++; return (ENOBUFS); @@ -1396,7 +1396,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, M_DONTWAIT); + M_PREPEND(m, 12, MB_DONTWAIT); 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 b95fe9bba0..2085a8ad71 100644 --- a/sys/netgraph/lmi/ng_lmi.c +++ b/sys/netgraph/lmi/ng_lmi.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_lmi.c,v 1.5.2.3 2002/07/02 22:17:18 archie Exp $ - * $DragonFly: src/sys/netgraph/lmi/ng_lmi.c,v 1.3 2003/08/07 21:17:32 dillon Exp $ + * $DragonFly: src/sys/netgraph/lmi/ng_lmi.c,v 1.4 2004/06/02 14:43:00 eirikn Exp $ * $Whistle: ng_lmi.c,v 1.38 1999/11/01 09:24:52 julian Exp $ */ @@ -330,7 +330,7 @@ nglmi_inquire(sc_p sc, int full) if (sc->lmi_channel == NULL) return; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { log(LOG_ERR, "nglmi: unable to start up LMI processing\n"); return; diff --git a/sys/netgraph/ppp/ng_ppp.c b/sys/netgraph/ppp/ng_ppp.c index 8d4aec2fe9..1c1b0a0bce 100644 --- a/sys/netgraph/ppp/ng_ppp.c +++ b/sys/netgraph/ppp/ng_ppp.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_ppp.c,v 1.15.2.10 2003/03/10 17:55:48 archie Exp $ - * $DragonFly: src/sys/netgraph/ppp/ng_ppp.c,v 1.5 2003/08/07 21:54:32 dillon Exp $ + * $DragonFly: src/sys/netgraph/ppp/ng_ppp.c,v 1.6 2004/06/02 14:43:00 eirikn Exp $ * $Whistle: ng_ppp.c,v 1.24 1999/11/01 09:24:52 julian Exp $ */ @@ -1546,7 +1546,7 @@ deliver: /* Split off next fragment as "m2" */ m2 = m; if (!lastFragment) { - struct mbuf *n = m_split(m, len, M_DONTWAIT); + struct mbuf *n = m_split(m, len, MB_DONTWAIT); if (n == NULL) { NG_FREE_DATA(m, meta); @@ -1864,7 +1864,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, M_DONTWAIT); + M_PREPEND(m, len, MB_DONTWAIT); if (m == NULL || (m->m_len < len && (m = m_pullup(m, len)) == NULL)) return (NULL); bcopy(buf, mtod(m, u_char *), len); diff --git a/sys/netgraph/pppoe/ng_pppoe.c b/sys/netgraph/pppoe/ng_pppoe.c index 4e5202fb93..7cb1860ba1 100644 --- a/sys/netgraph/pppoe/ng_pppoe.c +++ b/sys/netgraph/pppoe/ng_pppoe.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_pppoe.c,v 1.23.2.17 2002/07/02 22:17:18 archie Exp $ - * $DragonFly: src/sys/netgraph/pppoe/ng_pppoe.c,v 1.4 2003/12/29 15:04:13 drhodus Exp $ + * $DragonFly: src/sys/netgraph/pppoe/ng_pppoe.c,v 1.5 2004/06/02 14:43:00 eirikn Exp $ * $Whistle: ng_pppoe.c,v 1.10 1999/11/01 09:24:52 julian Exp $ */ #if 0 @@ -660,14 +660,14 @@ AAA LEAVE(ENOMEM); } bzero(neg, sizeof(*neg)); - MGETHDR(neg->m, M_DONTWAIT, MT_DATA); + MGETHDR(neg->m, MB_DONTWAIT, MT_DATA); if(neg->m == NULL) { printf("pppoe: Session out of mbufs\n"); FREE(neg, M_NETGRAPH); LEAVE(ENOBUFS); } neg->m->m_pkthdr.rcvif = NULL; - MCLGET(neg->m, M_DONTWAIT); + MCLGET(neg->m, MB_DONTWAIT); if ((neg->m->m_flags & M_EXT) == 0) { printf("pppoe: Session out of mcls\n"); m_freem(neg->m); @@ -1292,7 +1292,7 @@ AAA * But first correct the length. */ sp->pkt_hdr.ph.length = htons((short)(m->m_pkthdr.len)); - M_PREPEND(m, sizeof(*wh), M_DONTWAIT); + M_PREPEND(m, sizeof(*wh), MB_DONTWAIT); if (m == NULL) { LEAVE(ENOBUFS); } @@ -1468,7 +1468,7 @@ AAA wh->eh.ether_type = ETHERTYPE_PPPOE_DISC; /* generate a packet of that type */ - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if(m == NULL) printf("pppoe: Session out of mbufs\n"); else { @@ -1539,7 +1539,7 @@ AAA case PPPOE_SINIT: case PPPOE_SREQ: /* timeouts on these produce resends */ - m0 = m_copypacket(sp->neg->m, M_DONTWAIT); + m0 = m_copypacket(sp->neg->m, MB_DONTWAIT); NG_SEND_DATA( error, privp->ethernet_hook, m0, dummy); neg->timeout_handle = timeout(pppoe_ticker, hook, neg->timeout * hz); @@ -1586,7 +1586,7 @@ AAA case PPPOE_NEWCONNECTED: /* send the PADS without a timeout - we're now connected */ - m0 = m_copypacket(sp->neg->m, M_DONTWAIT); + m0 = m_copypacket(sp->neg->m, MB_DONTWAIT); NG_SEND_DATA( error, privp->ethernet_hook, m0, dummy); break; @@ -1601,7 +1601,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, M_DONTWAIT); + m0 = m_copypacket(sp->neg->m, MB_DONTWAIT); NG_SEND_DATA( error, privp->ethernet_hook, m0, dummy); neg->timeout_handle = timeout(pppoe_ticker, hook, PPPOE_OFFER_TIMEOUT * hz); @@ -1609,7 +1609,7 @@ AAA case PPPOE_SINIT: case PPPOE_SREQ: - m0 = m_copypacket(sp->neg->m, M_DONTWAIT); + m0 = m_copypacket(sp->neg->m, MB_DONTWAIT); NG_SEND_DATA( error, privp->ethernet_hook, m0, dummy); neg->timeout_handle = timeout(pppoe_ticker, hook, (hz * PPPOE_INITIAL_TIMEOUT)); diff --git a/sys/netgraph/pptpgre/ng_pptpgre.c b/sys/netgraph/pptpgre/ng_pptpgre.c index e1dea024d7..cd650a35e9 100644 --- a/sys/netgraph/pptpgre/ng_pptpgre.c +++ b/sys/netgraph/pptpgre/ng_pptpgre.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_pptpgre.c,v 1.2.2.13 2002/10/10 18:27:54 archie Exp $ - * $DragonFly: src/sys/netgraph/pptpgre/ng_pptpgre.c,v 1.4 2003/08/07 21:17:32 dillon Exp $ + * $DragonFly: src/sys/netgraph/pptpgre/ng_pptpgre.c,v 1.5 2004/06/02 14:43:00 eirikn Exp $ * $Whistle: ng_pptpgre.c,v 1.7 1999/12/08 00:10:06 archie Exp $ */ @@ -529,7 +529,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, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m == NULL) { priv->stats.memoryFailures++; NG_FREE_META(meta); @@ -538,7 +538,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, M_DONTWAIT); + M_PREPEND(m, grelen, MB_DONTWAIT); 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 7938d0701e..611ab3bfdb 100644 --- a/sys/netgraph/rfc1490/ng_rfc1490.c +++ b/sys/netgraph/rfc1490/ng_rfc1490.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_rfc1490.c,v 1.6.2.4 2002/07/02 22:17:18 archie Exp $ - * $DragonFly: src/sys/netgraph/rfc1490/ng_rfc1490.c,v 1.3 2003/08/07 21:17:32 dillon Exp $ + * $DragonFly: src/sys/netgraph/rfc1490/ng_rfc1490.c,v 1.4 2004/06/02 14:43:00 eirikn Exp $ * $Whistle: ng_rfc1490.c,v 1.22 1999/11/01 09:24:52 julian Exp $ */ @@ -286,14 +286,14 @@ ng_rfc1490_rcvdata(hook_p hook, struct mbuf *m, meta_p meta) break; } } else if (hook == priv->ppp) { - M_PREPEND(m, 2, M_DONTWAIT); /* Prepend PPP NLPID */ + M_PREPEND(m, 2, MB_DONTWAIT); /* Prepend PPP NLPID */ if (!m) ERROUT(ENOBUFS); mtod(m, u_char *)[0] = HDLC_UI; mtod(m, u_char *)[1] = NLPID_PPP; NG_SEND_DATA(error, priv->downlink, m, meta); } else if (hook == priv->inet) { - M_PREPEND(m, 2, M_DONTWAIT); /* Prepend IP NLPID */ + M_PREPEND(m, 2, MB_DONTWAIT); /* Prepend IP NLPID */ if (!m) ERROUT(ENOBUFS); mtod(m, u_char *)[0] = HDLC_UI; diff --git a/sys/netgraph/tty/ng_tty.c b/sys/netgraph/tty/ng_tty.c index dc90c13151..2c5b2f296c 100644 --- a/sys/netgraph/tty/ng_tty.c +++ b/sys/netgraph/tty/ng_tty.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_tty.c,v 1.7.2.3 2002/02/13 00:43:12 dillon Exp $ - * $DragonFly: src/sys/netgraph/tty/ng_tty.c,v 1.5 2003/08/07 21:17:33 dillon Exp $ + * $DragonFly: src/sys/netgraph/tty/ng_tty.c,v 1.6 2004/06/02 14:43:00 eirikn Exp $ * $Whistle: ng_tty.c,v 1.21 1999/11/01 09:24:52 julian Exp $ */ @@ -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, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, 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 56789752e7..e086f9d5e2 100644 --- a/sys/netgraph/vjc/ng_vjc.c +++ b/sys/netgraph/vjc/ng_vjc.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_vjc.c,v 1.9.2.5 2002/07/02 23:44:03 archie Exp $ - * $DragonFly: src/sys/netgraph/vjc/ng_vjc.c,v 1.3 2003/08/07 21:17:33 dillon Exp $ + * $DragonFly: src/sys/netgraph/vjc/ng_vjc.c,v 1.4 2004/06/02 14:43:01 eirikn Exp $ * $Whistle: ng_vjc.c,v 1.17 1999/11/01 09:24:52 julian Exp $ */ @@ -484,7 +484,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, M_DONTWAIT, MT_DATA); + MGETHDR(hm, MB_DONTWAIT, MT_DATA); if (hm == NULL) { priv->slc.sls_errorin++; NG_FREE_DATA(m, meta); @@ -493,7 +493,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, M_DONTWAIT); + MCLGET(hm, MB_DONTWAIT); 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 8304d3be29..9ecd1914ca 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -32,7 +32,7 @@ * * @(#)if_ether.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netinet/if_ether.c,v 1.64.2.23 2003/04/11 07:23:15 fjoe Exp $ - * $DragonFly: src/sys/netinet/if_ether.c,v 1.12 2004/04/21 18:13:56 dillon Exp $ + * $DragonFly: src/sys/netinet/if_ether.c,v 1.13 2004/06/02 14:43:01 eirikn Exp $ */ /* @@ -310,7 +310,7 @@ arprequest(ifp, sip, tip, enaddr) LLC_UI, 0x00, 0x00, 0x00, 0x08, 0x06 }; u_short ar_hrd; - if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL) + if ((m = m_gethdr(MB_DONTWAIT, MT_DATA)) == NULL) return; m->m_pkthdr.rcvif = (struct ifnet *)0; switch (ifp->if_type) { diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 6b696eb342..79bec18fc4 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -36,7 +36,7 @@ * * @(#)igmp.c 8.1 (Berkeley) 7/19/93 * $FreeBSD: src/sys/netinet/igmp.c,v 1.29.2.2 2003/01/23 21:06:44 sam Exp $ - * $DragonFly: src/sys/netinet/igmp.c,v 1.7 2004/04/22 04:35:45 dillon Exp $ + * $DragonFly: src/sys/netinet/igmp.c,v 1.8 2004/06/02 14:43:01 eirikn Exp $ */ /* @@ -105,7 +105,7 @@ igmp_init() /* * Construct a Router Alert option to use in outgoing packets */ - MGET(router_alert, M_DONTWAIT, MT_DATA); + MGET(router_alert, MB_DONTWAIT, MT_DATA); ra = mtod(router_alert, struct ipoption *); ra->ipopt_dst.s_addr = 0; ra->ipopt_list[0] = IPOPT_RA; /* Router Alert Option */ @@ -442,7 +442,7 @@ igmp_sendpkt(inm, type, addr) struct ip *ip; struct ip_moptions imo; - MGETHDR(m, M_DONTWAIT, MT_HEADER); + MGETHDR(m, MB_DONTWAIT, MT_HEADER); if (m == NULL) return; diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c index 4ac35d7fa0..86710197a8 100644 --- a/sys/netinet/in_gif.c +++ b/sys/netinet/in_gif.c @@ -1,6 +1,6 @@ /* * $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.8 2004/06/01 17:35:58 joerg Exp $ + * $DragonFly: src/sys/netinet/in_gif.c,v 1.9 2004/06/02 14:43:01 eirikn Exp $ * $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 itojun Exp $ */ /* @@ -165,7 +165,7 @@ in_gif_output(ifp, family, m) ip_ecn_ingress(ECN_NOCARE, &iphdr.ip_tos, &tos); /* prepend new IP header */ - M_PREPEND(m, sizeof(struct ip), M_DONTWAIT); + M_PREPEND(m, sizeof(struct ip), MB_DONTWAIT); if (m && m->m_len < sizeof(struct ip)) m = m_pullup(m, sizeof(struct ip)); if (m == NULL) { diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c index 849661c512..53096762cb 100644 --- a/sys/netinet/ip_encap.c +++ b/sys/netinet/ip_encap.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet/ip_encap.c,v 1.1.2.5 2003/01/23 21:06:45 sam Exp $ */ -/* $DragonFly: src/sys/netinet/ip_encap.c,v 1.6 2004/04/22 04:37:07 dillon Exp $ */ +/* $DragonFly: src/sys/netinet/ip_encap.c,v 1.7 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: ip_encap.c,v 1.41 2001/03/15 08:35:08 itojun Exp $ */ /* @@ -490,7 +490,7 @@ encap_fillarg(m, ep) { struct m_tag *tag; - tag = m_tag_get(PACKET_TAG_ENCAP, sizeof (void*), M_DONTWAIT); + tag = m_tag_get(PACKET_TAG_ENCAP, sizeof (void*), MB_DONTWAIT); if (tag) { *(void**)(tag+1) = ep->arg; m_tag_prepend(m, tag); diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index f9b6d744a9..fd7c85a8b4 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -32,7 +32,7 @@ * * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.39.2.19 2003/01/24 05:11:34 sam Exp $ - * $DragonFly: src/sys/netinet/ip_icmp.c,v 1.7 2004/02/14 21:12:39 dillon Exp $ + * $DragonFly: src/sys/netinet/ip_icmp.c,v 1.8 2004/06/02 14:43:01 eirikn Exp $ */ #include "opt_ipsec.h" @@ -176,7 +176,7 @@ icmp_error(n, type, code, dest, destifp) /* * First, formulate icmp message */ - m = m_gethdr(M_DONTWAIT, MT_HEADER); + m = m_gethdr(MB_DONTWAIT, MT_HEADER); if (m == NULL) goto freeit; icmplen = min(oiplen + 8, oip->ip_len); @@ -669,7 +669,7 @@ match: */ cp = (u_char *) (ip + 1); if ((opts = ip_srcroute()) == 0 && - (opts = m_gethdr(M_DONTWAIT, MT_HEADER))) { + (opts = m_gethdr(MB_DONTWAIT, MT_HEADER))) { opts->m_len = sizeof(struct in_addr); mtod(opts, struct in_addr *)->s_addr = 0; } diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 1d1bc3c2b9..e65241b6f7 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -32,7 +32,7 @@ * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 * $FreeBSD: src/sys/netinet/ip_input.c,v 1.130.2.52 2003/03/07 07:01:28 silby Exp $ - * $DragonFly: src/sys/netinet/ip_input.c,v 1.26 2004/06/01 20:49:06 dillon Exp $ + * $DragonFly: src/sys/netinet/ip_input.c,v 1.27 2004/06/02 14:43:01 eirikn Exp $ */ #define _IP_VHL @@ -950,7 +950,7 @@ found: /* Clone packet if we're doing a 'tee' */ if ((divert_info & IP_FW_PORT_TEE_FLAG) != 0) - clone = m_dup(m, M_DONTWAIT); + clone = m_dup(m, MB_DONTWAIT); /* Restore packet header fields to original values */ ip->ip_len += hlen; @@ -1100,7 +1100,7 @@ ip_reass(struct mbuf *m, struct ipq *fp, struct ipq *where, * If first fragment to arrive, create a reassembly queue. */ if (fp == NULL) { - if ((t = m_get(M_DONTWAIT, MT_FTABLE)) == NULL) + if ((t = m_get(MB_DONTWAIT, MT_FTABLE)) == NULL) goto dropfrag; fp = mtod(t, struct ipq *); insque(fp, where); @@ -1706,7 +1706,7 @@ ip_srcroute() if (ip_nhops == 0) return (NULL); - m = m_get(M_DONTWAIT, MT_HEADER); + m = m_get(MB_DONTWAIT, MT_HEADER); if (m == NULL) return (NULL); @@ -1881,8 +1881,8 @@ ip_forward(struct mbuf *m, int using_srcrt, struct sockaddr_in *next_hop) * assume exclusive access to the IP header in `m', so any * data in a cluster may change before we reach icmp_error(). */ - MGET(mcopy, M_DONTWAIT, m->m_type); - if (mcopy != NULL && !m_dup_pkthdr(mcopy, m, M_DONTWAIT)) { + MGET(mcopy, MB_DONTWAIT, m->m_type); + if (mcopy != NULL && !m_dup_pkthdr(mcopy, m, MB_DONTWAIT)) { /* * It's probably ok if the pkthdr dup fails (because * the deep copy of the tag chain failed), but for now diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index c45a9d4168..7a18c41338 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -32,7 +32,7 @@ * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 * $FreeBSD: src/sys/netinet/ip_output.c,v 1.99.2.37 2003/04/15 06:44:45 silby Exp $ - * $DragonFly: src/sys/netinet/ip_output.c,v 1.13 2004/06/01 20:49:06 dillon Exp $ + * $DragonFly: src/sys/netinet/ip_output.c,v 1.14 2004/06/02 14:43:01 eirikn Exp $ */ #define _IP_VHL @@ -800,7 +800,7 @@ spd_done: /* Clone packet if we're doing a 'tee' */ if ((off & IP_FW_PORT_TEE_FLAG) != 0) - clone = m_dup(m, M_DONTWAIT); + clone = m_dup(m, MB_DONTWAIT); /* * XXX @@ -1023,7 +1023,7 @@ pass: tmp = length = m->m_pkthdr.len; while ((length -= mbuf_frag_size) >= 1) { - m1 = m_split(m, length, M_DONTWAIT); + m1 = m_split(m, length, MB_DONTWAIT); if (m1 == NULL) break; m1->m_flags &= ~M_PKTHDR; @@ -1209,7 +1209,7 @@ smart_frag_failure: struct mbuf *m; int mhlen = sizeof (struct ip); - MGETHDR(m, M_DONTWAIT, MT_HEADER); + MGETHDR(m, MB_DONTWAIT, MT_HEADER); if (m == 0) { error = ENOBUFS; ipstat.ips_odropped++; @@ -1331,7 +1331,7 @@ ip_insertoptions(m, opt, 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, M_DONTWAIT, MT_HEADER); + MGETHDR(n, MB_DONTWAIT, MT_HEADER); if (n == 0) { *phlen = 0; return (m); @@ -1432,7 +1432,7 @@ ip_ctloutput(so, sopt) error = EMSGSIZE; break; } - MGET(m, sopt->sopt_td ? M_WAIT : M_DONTWAIT, MT_HEADER); + MGET(m, sopt->sopt_td ? MB_WAIT : MB_DONTWAIT, MT_HEADER); if (m == 0) { error = ENOBUFS; break; diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 4247087dd6..9057ea3de6 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -32,7 +32,7 @@ * * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.64.2.16 2003/08/24 08:24:38 hsu Exp $ - * $DragonFly: src/sys/netinet/raw_ip.c,v 1.12 2004/03/31 00:43:09 hsu Exp $ + * $DragonFly: src/sys/netinet/raw_ip.c,v 1.13 2004/06/02 14:43:01 eirikn Exp $ */ #include "opt_inet6.h" @@ -167,7 +167,7 @@ rip_input(struct mbuf *m, int off, int proto) inp->inp_faddr.s_addr != ip->ip_src.s_addr) continue; if (last) { - struct mbuf *n = m_copypacket(m, M_DONTWAIT); + struct mbuf *n = m_copypacket(m, MB_DONTWAIT); #ifdef IPSEC /* check AH/ESP integrity. */ @@ -257,7 +257,7 @@ rip_output(struct mbuf *m, struct socket *so, u_long dst) m_freem(m); return(EMSGSIZE); } - M_PREPEND(m, sizeof(struct ip), M_WAIT); + M_PREPEND(m, sizeof(struct ip), MB_WAIT); if (m == NULL) return(ENOBUFS); ip = mtod(m, struct ip *); diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 74b29b600c..ecd195d939 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -32,7 +32,7 @@ * * @(#)tcp_output.c 8.4 (Berkeley) 5/24/95 * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.39.2.20 2003/01/29 22:45:36 hsu Exp $ - * $DragonFly: src/sys/netinet/tcp_output.c,v 1.12 2004/05/20 04:32:59 hsu Exp $ + * $DragonFly: src/sys/netinet/tcp_output.c,v 1.13 2004/06/02 14:43:01 eirikn Exp $ */ #include "opt_inet6.h" @@ -581,14 +581,14 @@ send: m->m_len += hdrlen; m->m_data -= hdrlen; #else - MGETHDR(m, M_DONTWAIT, MT_HEADER); + MGETHDR(m, MB_DONTWAIT, MT_HEADER); if (m == NULL) { error = ENOBUFS; goto out; } #ifdef INET6 if (MHLEN < hdrlen + max_linkhdr) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if (!(m->m_flags & M_EXT)) { m_freem(m); error = ENOBUFS; @@ -629,7 +629,7 @@ send: else tcpstat.tcps_sndwinup++; - MGETHDR(m, M_DONTWAIT, MT_HEADER); + MGETHDR(m, MB_DONTWAIT, MT_HEADER); if (m == NULL) { error = ENOBUFS; goto out; diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index a0467460b2..76e9e1d019 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -32,7 +32,7 @@ * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.73.2.31 2003/01/24 05:11:34 sam Exp $ - * $DragonFly: src/sys/netinet/tcp_subr.c,v 1.30 2004/04/28 08:00:35 hsu Exp $ + * $DragonFly: src/sys/netinet/tcp_subr.c,v 1.31 2004/06/02 14:43:01 eirikn Exp $ */ #include "opt_compat.h" @@ -378,7 +378,7 @@ tcp_maketemplate(struct tcpcb *tp) struct mbuf *m; struct tcptemp *n; - m = m_get(M_DONTWAIT, MT_HEADER); + m = m_get(MB_DONTWAIT, MT_HEADER); if (m == NULL) return (NULL); m->m_len = sizeof(struct tcptemp); @@ -442,7 +442,7 @@ tcp_respond(struct tcpcb *tp, void *ipgen, struct tcphdr *th, struct mbuf *m, } } if (m == NULL) { - m = m_gethdr(M_DONTWAIT, MT_HEADER); + m = m_gethdr(MB_DONTWAIT, MT_HEADER); if (m == NULL) return; tlen = 0; @@ -1487,7 +1487,7 @@ ipsec_hdrsiz_tcp(struct tcpcb *tp) if ((tp == NULL) || ((inp = tp->t_inpcb) == NULL)) return (0); - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (!m) return (0); diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 14ae9ebdb5..a070ed4ae0 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.5.2.14 2003/02/24 04:02:27 silby Exp $ - * $DragonFly: src/sys/netinet/tcp_syncache.c,v 1.12 2004/04/22 04:35:45 dillon Exp $ + * $DragonFly: src/sys/netinet/tcp_syncache.c,v 1.13 2004/06/02 14:43:01 eirikn Exp $ */ #include "opt_inet6.h" @@ -1039,7 +1039,7 @@ syncache_respond(sc, m) if (m) m_freem(m); - m = m_gethdr(M_DONTWAIT, MT_HEADER); + m = m_gethdr(MB_DONTWAIT, MT_HEADER); if (m == NULL) return (ENOBUFS); m->m_data += max_linkhdr; diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 6b3a0f9efb..716a74059e 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -33,7 +33,7 @@ * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.64.2.18 2003/01/24 05:11:34 sam Exp $ - * $DragonFly: src/sys/netinet/udp_usrreq.c,v 1.22 2004/05/31 23:53:14 hsu Exp $ + * $DragonFly: src/sys/netinet/udp_usrreq.c,v 1.23 2004/06/02 14:43:01 eirikn Exp $ */ #include "opt_ipsec.h" @@ -754,7 +754,7 @@ udp_output(inp, m, dstaddr, control, td) * Calculate data length and get a mbuf * for UDP and IP headers. */ - M_PREPEND(m, sizeof(struct udpiphdr), M_DONTWAIT); + M_PREPEND(m, sizeof(struct udpiphdr), MB_DONTWAIT); if (m == 0) { error = ENOBUFS; goto release; diff --git a/sys/netinet6/ah_core.c b/sys/netinet6/ah_core.c index 7b3f608c0d..f0c421c6cf 100644 --- a/sys/netinet6/ah_core.c +++ b/sys/netinet6/ah_core.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ah_core.c,v 1.2.2.5 2002/04/28 05:40:26 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/ah_core.c,v 1.5 2004/05/20 18:30:35 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/ah_core.c,v 1.6 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: ah_core.c,v 1.44 2001/03/12 11:24:39 itojun Exp $ */ /* @@ -1174,9 +1174,9 @@ again: error = EMSGSIZE; goto fail; } - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (n && hlen > MLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_free(n); n = NULL; @@ -1289,9 +1289,9 @@ again: error = EMSGSIZE; goto fail; } - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (n && totlen > MLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_free(n); n = NULL; @@ -1436,9 +1436,9 @@ ah6_calccksum(struct mbuf *m, caddr_t ahdat, size_t len, error = EMSGSIZE; goto fail; } - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (n && newoff - off > MLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_free(n); n = NULL; @@ -1471,9 +1471,9 @@ ah6_calccksum(struct mbuf *m, caddr_t ahdat, size_t len, error = EMSGSIZE; goto fail; } - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (n && newoff - off > MLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_free(n); n = NULL; diff --git a/sys/netinet6/ah_input.c b/sys/netinet6/ah_input.c index 5248ff7209..d795ceb64b 100644 --- a/sys/netinet6/ah_input.c +++ b/sys/netinet6/ah_input.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ah_input.c,v 1.1.2.6 2002/04/28 05:40:26 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/ah_input.c,v 1.6 2004/05/20 18:30:35 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/ah_input.c,v 1.7 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: ah_input.c,v 1.67 2002/01/07 11:39:56 kjc Exp $ */ /* @@ -489,7 +489,7 @@ ah4_input(struct mbuf *m, int off, int proto) */ struct mbuf *n; - n = m_split(m, off, M_DONTWAIT); + n = m_split(m, off, MB_DONTWAIT); if (n == NULL) { /* m is retained by m_split */ goto fail; @@ -893,7 +893,7 @@ ah6_input(struct mbuf **mp, int *offp, int proto) */ struct mbuf *n; - n = m_split(m, off, M_DONTWAIT); + n = m_split(m, off, MB_DONTWAIT); if (n == NULL) { /* m is retained by m_split */ goto fail; diff --git a/sys/netinet6/ah_output.c b/sys/netinet6/ah_output.c index fcdb7948d7..8efe35105d 100644 --- a/sys/netinet6/ah_output.c +++ b/sys/netinet6/ah_output.c @@ -1,5 +1,5 @@ /* $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.5 2004/05/20 18:30:35 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/ah_output.c,v 1.6 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: ah_output.c,v 1.31 2001/07/26 06:53:15 jinmei Exp $ */ /* @@ -209,7 +209,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, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (!n) { ipseclog((LOG_DEBUG, "ENOBUFS in ah4_output %d\n", __LINE__)); @@ -384,13 +384,13 @@ ah6_output(struct mbuf *m, u_char *nexthdrp, struct mbuf *md, return EINVAL; } - MGET(mah, M_DONTWAIT, MT_DATA); + MGET(mah, MB_DONTWAIT, MT_DATA); if (!mah) { m_freem(m); return ENOBUFS; } if (ahlen > MLEN) { - MCLGET(mah, M_DONTWAIT); + MCLGET(mah, MB_DONTWAIT); if ((mah->m_flags & M_EXT) == 0) { m_free(mah); m_freem(m); diff --git a/sys/netinet6/esp_core.c b/sys/netinet6/esp_core.c index 758e5f1d8a..e3e8d4acdb 100644 --- a/sys/netinet6/esp_core.c +++ b/sys/netinet6/esp_core.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/esp_core.c,v 1.1.2.4 2002/03/26 10:12:29 ume Exp $ */ -/* $DragonFly: src/sys/netinet6/esp_core.c,v 1.6 2004/05/20 18:30:36 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/esp_core.c,v 1.7 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: esp_core.c,v 1.50 2000/11/02 12:27:38 itojun Exp $ */ /* @@ -706,10 +706,10 @@ esp_cbc_decrypt(struct mbuf *m, size_t off, struct secasvar *sav, if (!d || dn + blocklen > d->m_len) { if (d) dp = d; - MGET(d, M_DONTWAIT, MT_DATA); + MGET(d, MB_DONTWAIT, MT_DATA); i = m->m_pkthdr.len - (soff + sn); if (d && i > MLEN) { - MCLGET(d, M_DONTWAIT); + MCLGET(d, MB_DONTWAIT); if ((d->m_flags & M_EXT) == 0) { m_free(d); d = NULL; @@ -911,10 +911,10 @@ esp_cbc_encrypt(struct mbuf *m, size_t off, size_t plen, struct secasvar *sav, if (!d || dn + blocklen > d->m_len) { if (d) dp = d; - MGET(d, M_DONTWAIT, MT_DATA); + MGET(d, MB_DONTWAIT, MT_DATA); i = m->m_pkthdr.len - (soff + sn); if (d && i > MLEN) { - MCLGET(d, M_DONTWAIT); + MCLGET(d, MB_DONTWAIT); if ((d->m_flags & M_EXT) == 0) { m_free(d); d = NULL; diff --git a/sys/netinet6/esp_input.c b/sys/netinet6/esp_input.c index 28a18cdc16..1ea74b227f 100644 --- a/sys/netinet6/esp_input.c +++ b/sys/netinet6/esp_input.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/esp_input.c,v 1.1.2.8 2003/01/23 21:06:47 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/esp_input.c,v 1.5 2003/09/15 23:38:14 hsu Exp $ */ +/* $DragonFly: src/sys/netinet6/esp_input.c,v 1.6 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: esp_input.c,v 1.62 2002/01/07 11:39:57 kjc Exp $ */ /* @@ -783,7 +783,7 @@ noreplaycheck: */ struct mbuf *n; - n = m_split(m, off, M_DONTWAIT); + n = m_split(m, off, MB_DONTWAIT); if (n == NULL) { /* m is retained by m_split */ goto bad; @@ -805,12 +805,12 @@ noreplaycheck: struct mbuf *n = NULL; int maxlen; - MGETHDR(n, M_DONTWAIT, MT_HEADER); + MGETHDR(n, MB_DONTWAIT, MT_HEADER); maxlen = MHLEN; if (n) M_MOVE_PKTHDR(n, m); if (n && n->m_pkthdr.len > maxlen) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); maxlen = MCLBYTES; if ((n->m_flags & M_EXT) == 0) { m_free(n); diff --git a/sys/netinet6/esp_output.c b/sys/netinet6/esp_output.c index 048770f719..559a182562 100644 --- a/sys/netinet6/esp_output.c +++ b/sys/netinet6/esp_output.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/esp_output.c,v 1.1.2.4 2003/05/06 06:46:58 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/esp_output.c,v 1.5 2004/05/20 18:30:36 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/esp_output.c,v 1.6 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: esp_output.c,v 1.44 2001/07/26 06:53:15 jinmei Exp $ */ /* @@ -336,7 +336,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) != 0) { - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (!n) { m_freem(m); error = ENOBUFS; @@ -491,7 +491,7 @@ esp_output(struct mbuf *m, u_char *nexthdrp, struct mbuf *md, } else { struct mbuf *nn; - MGET(nn, M_DONTWAIT, MT_DATA); + MGET(nn, MB_DONTWAIT, MT_DATA); if (!nn) { ipseclog((LOG_DEBUG, "esp%d_output: can't alloc mbuf", afnumber)); @@ -620,7 +620,7 @@ esp_output(struct mbuf *m, u_char *nexthdrp, struct mbuf *md, } else { struct mbuf *nn; - MGET(nn, M_DONTWAIT, MT_DATA); + MGET(nn, MB_DONTWAIT, MT_DATA); if (!nn) { ipseclog((LOG_DEBUG, "can't alloc mbuf in esp%d_output", afnumber)); diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index 86cb72317c..0ef0ebc7e5 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -1,5 +1,5 @@ /* $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.5 2004/05/20 18:30:36 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/frag6.c,v 1.6 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: frag6.c,v 1.33 2002/01/07 11:34:48 kjc Exp $ */ /* @@ -488,7 +488,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, M_DONTWAIT)) == NULL) { + if ((t = m_split(m, offset, MB_DONTWAIT)) == NULL) { frag6_remque(q6); free(q6, M_FTABLE); frag6_nfragpackets--; diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 8969ed7563..9f92c77ea8 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/icmp6.c,v 1.6.2.13 2003/05/06 06:46:58 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/icmp6.c,v 1.9 2004/05/20 18:30:36 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/icmp6.c,v 1.10 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: icmp6.c,v 1.211 2001/04/04 05:56:20 itojun Exp $ */ /* @@ -346,7 +346,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, M_DONTWAIT); + M_PREPEND(m, preplen, MB_DONTWAIT); if (m && m->m_len < preplen) m = m_pullup(m, preplen); if (m == NULL) { @@ -560,12 +560,12 @@ icmp6_input(struct mbuf **mp, int *offp, int proto) m_freem(n0); break; } - MGETHDR(n, M_DONTWAIT, n0->m_type); + MGETHDR(n, MB_DONTWAIT, n0->m_type); n0len = n0->m_pkthdr.len; /* save for use below */ if (n) M_MOVE_PKTHDR(n, n0); if (n && maxlen >= MHLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_free(n); n = NULL; @@ -622,7 +622,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, M_DONTWAIT)) == NULL) { + if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) { /* give up local */ mld6_input(m, off); m = NULL; @@ -683,15 +683,15 @@ icmp6_input(struct mbuf **mp, int *offp, int proto) /* Give up remote */ break; } - MGETHDR(n, M_DONTWAIT, m->m_type); + MGETHDR(n, MB_DONTWAIT, m->m_type); if (n && maxlen > MHLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_free(n); n = NULL; } } - if (!m_dup_pkthdr(n, m, M_DONTWAIT)) { + if (!m_dup_pkthdr(n, m, MB_DONTWAIT)) { /* * Previous code did a blind M_COPY_PKTHDR * and said "just for rcvif". If true, then @@ -747,7 +747,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, M_DONTWAIT)) == NULL) { + if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) { /* give up local */ nd6_rs_input(m, off, icmp6len); m = NULL; @@ -763,7 +763,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, M_DONTWAIT)) == NULL) { + if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) { /* give up local */ nd6_ra_input(m, off, icmp6len); m = NULL; @@ -779,7 +779,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, M_DONTWAIT)) == NULL) { + if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) { /* give up local */ nd6_ns_input(m, off, icmp6len); m = NULL; @@ -795,7 +795,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, M_DONTWAIT)) == NULL) { + if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) { /* give up local */ nd6_na_input(m, off, icmp6len); m = NULL; @@ -811,7 +811,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, M_DONTWAIT)) == NULL) { + if ((n = m_copym(m, 0, M_COPYALL, MB_DONTWAIT)) == NULL) { /* give up local */ icmp6_redirect_input(m, off); m = NULL; @@ -1387,7 +1387,7 @@ ni6_input(struct mbuf *m, int off) } /* allocate an mbuf to reply. */ - MGETHDR(n, M_DONTWAIT, m->m_type); + MGETHDR(n, MB_DONTWAIT, m->m_type); if (n == NULL) { m_freem(m); return(NULL); @@ -1401,7 +1401,7 @@ ni6_input(struct mbuf *m, int off) */ goto bad; } - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { goto bad; } @@ -1498,9 +1498,9 @@ ni6_nametodns(const char *name, int namelen, len = MCLBYTES; /* because MAXHOSTNAMELEN is usually 256, we use cluster mbuf */ - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m && len > MLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) goto fail; } @@ -2443,9 +2443,9 @@ icmp6_redirect_output(struct mbuf *m0, struct rtentry *rt) #if IPV6_MMTU >= MCLBYTES # error assumption failed about IPV6_MMTU and MCLBYTES #endif - MGETHDR(m, M_DONTWAIT, MT_HEADER); + MGETHDR(m, MB_DONTWAIT, MT_HEADER); if (m && IPV6_MMTU >= MHLEN) - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if (!m) goto fail; m->m_pkthdr.rcvif = NULL; diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c index 80d33d6ceb..d6f5728775 100644 --- a/sys/netinet6/in6_gif.c +++ b/sys/netinet6/in6_gif.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/in6_gif.c,v 1.2.2.7 2003/01/23 21:06:47 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/in6_gif.c,v 1.6 2004/05/20 18:30:36 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/in6_gif.c,v 1.7 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $ */ /* @@ -145,7 +145,7 @@ in6_gif_output(struct ifnet *ifp, } /* prepend new IP header */ - M_PREPEND(m, sizeof(struct ip6_hdr), M_DONTWAIT); + M_PREPEND(m, sizeof(struct ip6_hdr), MB_DONTWAIT); if (m && m->m_len < sizeof(struct ip6_hdr)) m = m_pullup(m, sizeof(struct ip6_hdr)); if (m == NULL) { diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index a5ecb4cbdc..11d9556d50 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ip6_input.c,v 1.11.2.15 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/ip6_input.c,v 1.17 2004/06/01 20:49:08 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/ip6_input.c,v 1.18 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: ip6_input.c,v 1.259 2002/01/21 04:58:09 jinmei Exp $ */ /* @@ -312,11 +312,11 @@ ip6_input(struct netmsg *msg) if (m && m->m_next != NULL && m->m_pkthdr.len < MCLBYTES) { struct mbuf *n; - MGETHDR(n, M_DONTWAIT, MT_HEADER); + MGETHDR(n, MB_DONTWAIT, MT_HEADER); if (n) M_MOVE_PKTHDR(n, m); if (n && n->m_pkthdr.len > MHLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_freem(n); n = NULL; @@ -1403,9 +1403,9 @@ ip6_pullexthdr(struct mbuf *m, size_t off, int nxt) else elen = (ip6e.ip6e_len + 1) << 3; - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (n && elen >= MLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_free(n); n = NULL; @@ -1582,7 +1582,7 @@ ip6_addaux(struct mbuf *m) if (!tag) { tag = m_tag_get(PACKET_TAG_IPV6_INPUT, sizeof (struct ip6aux), - M_DONTWAIT); + MB_DONTWAIT); if (tag) m_tag_prepend(m, tag); } diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 3081c56d16..6ca551f5fa 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -1,5 +1,5 @@ /* $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.7 2004/05/20 18:30:36 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/ip6_mroute.c,v 1.8 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: ip6_mroute.c,v 1.58 2001/12/18 02:36:31 itojun Exp $ */ /* @@ -1498,7 +1498,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, M_DONTWAIT, MT_HEADER); + MGETHDR(mm, MB_DONTWAIT, 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 73627149b6..73f0d55614 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ip6_output.c,v 1.13.2.18 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/ip6_output.c,v 1.11 2004/06/01 20:49:08 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/ip6_output.c,v 1.12 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: ip6_output.c,v 1.279 2002/01/26 06:12:30 jinmei Exp $ */ /* @@ -1022,7 +1022,7 @@ skip_ipsec2:; */ m0 = m; for (off = hlen; off < tlen; off += len) { - MGETHDR(m, M_DONTWAIT, MT_HEADER); + MGETHDR(m, MB_DONTWAIT, MT_HEADER); if (!m) { error = ENOBUFS; ip6stat.ip6s_odropped++; @@ -1132,12 +1132,12 @@ ip6_copyexthdr(struct mbuf **mp, caddr_t hdr, int hlen) if (hlen > MCLBYTES) return(ENOBUFS); /* XXX */ - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (!m) return(ENOBUFS); if (hlen > MLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_free(m); return(ENOBUFS); @@ -1170,7 +1170,7 @@ ip6_insert_jumboopt(struct ip6_exthdrs *exthdrs, u_int32_t plen) * Otherwise, use it to store the options. */ if (exthdrs->ip6e_hbh == 0) { - MGET(mopt, M_DONTWAIT, MT_DATA); + MGET(mopt, MB_DONTWAIT, MT_DATA); if (mopt == 0) return(ENOBUFS); mopt->m_len = JUMBOOPTLEN; @@ -1202,9 +1202,9 @@ ip6_insert_jumboopt(struct ip6_exthdrs *exthdrs, u_int32_t plen) * As a consequence, we must always prepare a cluster * at this point. */ - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (n) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_freem(n); n = NULL; @@ -1257,7 +1257,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), M_DONTWAIT); + hlen - sizeof(struct ip6_hdr), MB_DONTWAIT); if (n == 0) return(ENOBUFS); m->m_next = n; @@ -1279,7 +1279,7 @@ ip6_insertfraghdr(struct mbuf *m0, struct mbuf *m, int hlen, /* allocate a new mbuf for the fragment header */ struct mbuf *mfrg; - MGET(mfrg, M_DONTWAIT, MT_DATA); + MGET(mfrg, MB_DONTWAIT, MT_DATA); if (mfrg == 0) return(ENOBUFS); mfrg->m_len = sizeof(struct ip6_frag); @@ -1471,7 +1471,7 @@ do { \ break; } /* XXX */ - MGET(m, sopt->sopt_td ? M_WAIT : M_DONTWAIT, MT_HEADER); + MGET(m, sopt->sopt_td ? MB_WAIT : MB_DONTWAIT, MT_HEADER); if (m == 0) { error = ENOBUFS; break; @@ -1570,7 +1570,7 @@ do { \ if (in6p->in6p_options) { struct mbuf *m; m = m_copym(in6p->in6p_options, - 0, M_COPYALL, M_WAIT); + 0, M_COPYALL, MB_WAIT); error = soopt_mcopyout(sopt, m); if (error == 0) m_freem(m); @@ -2194,7 +2194,7 @@ ip6_getmoptions(int optname, struct ip6_moptions *im6o, struct mbuf **mp) { u_int *hlim, *loop, *ifindex; - *mp = m_get(M_WAIT, MT_HEADER); /* XXX */ + *mp = m_get(MB_WAIT, MT_HEADER); /* XXX */ switch (optname) { @@ -2522,7 +2522,7 @@ ip6_splithdr(struct mbuf *m, struct ip6_exthdrs *exthdrs) ip6 = mtod(m, struct ip6_hdr *); if (m->m_len > sizeof(*ip6)) { - MGETHDR(mh, M_DONTWAIT, MT_HEADER); + MGETHDR(mh, MB_DONTWAIT, MT_HEADER); if (mh == 0) { m_freem(m); return ENOBUFS; diff --git a/sys/netinet6/ipcomp_core.c b/sys/netinet6/ipcomp_core.c index 530430a78a..0c5ca91006 100644 --- a/sys/netinet6/ipcomp_core.c +++ b/sys/netinet6/ipcomp_core.c @@ -1,5 +1,5 @@ /* $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.4 2004/05/20 18:30:36 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/ipcomp_core.c,v 1.5 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: ipcomp_core.c,v 1.25 2001/07/26 06:53:17 jinmei Exp $ */ /* @@ -138,9 +138,9 @@ do { \ } \ \ /* get a fresh reply buffer */ \ - MGET(n, M_DONTWAIT, MT_DATA); \ + MGET(n, MB_DONTWAIT, MT_DATA); \ if (n) { \ - MCLGET(n, M_DONTWAIT); \ + MCLGET(n, MB_DONTWAIT); \ } \ if (!n) { \ error = ENOBUFS; \ diff --git a/sys/netinet6/ipcomp_output.c b/sys/netinet6/ipcomp_output.c index be4a2e452a..1f1c75ada8 100644 --- a/sys/netinet6/ipcomp_output.c +++ b/sys/netinet6/ipcomp_output.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ipcomp_output.c,v 1.1.2.4 2003/04/29 08:33:50 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/ipcomp_output.c,v 1.6 2004/05/20 18:30:36 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/ipcomp_output.c,v 1.7 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: ipcomp_output.c,v 1.25 2002/06/09 14:44:00 itojun Exp $ */ /* @@ -168,12 +168,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, M_DONTWAIT); + mcopy = m_copym(m, 0, M_COPYALL, MB_DONTWAIT); if (mcopy == NULL) { error = ENOBUFS; return 0; } - md0 = m_copym(md, 0, M_COPYALL, M_DONTWAIT); + md0 = m_copym(md, 0, M_COPYALL, MB_DONTWAIT); if (md0 == NULL) { m_freem(mcopy); error = ENOBUFS; @@ -276,7 +276,7 @@ ipcomp_output(struct mbuf *m, u_char *nexthdrp, struct mbuf *md, * after: IP ... ipcomp payload */ if (M_LEADINGSPACE(md) < complen) { - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (!n) { m_freem(m); error = ENOBUFS; diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c index 884f400202..3f1abf1fdb 100644 --- a/sys/netinet6/ipsec.c +++ b/sys/netinet6/ipsec.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ipsec.c,v 1.3.2.12 2003/05/06 06:46:58 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/ipsec.c,v 1.6 2004/05/20 18:30:36 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/ipsec.c,v 1.7 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */ /* @@ -1923,7 +1923,7 @@ ipsec4_encapsulate(struct mbuf *m, struct secasvar *sav) */ if (M_LEADINGSPACE(m->m_next) < hlen) { struct mbuf *n; - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (!n) { m_freem(m); return ENOBUFS; @@ -2020,7 +2020,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, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (!n) { m_freem(m); return ENOBUFS; @@ -3012,7 +3012,7 @@ ipsec4_splithdr(struct mbuf *m) hlen = ip->ip_hl << 2; #endif if (m->m_len > hlen) { - MGETHDR(mh, M_DONTWAIT, MT_HEADER); + MGETHDR(mh, MB_DONTWAIT, MT_HEADER); if (!mh) { m_freem(m); return NULL; @@ -3047,7 +3047,7 @@ ipsec6_splithdr(struct mbuf *m) ip6 = mtod(m, struct ip6_hdr *); hlen = sizeof(struct ip6_hdr); if (m->m_len > hlen) { - MGETHDR(mh, M_DONTWAIT, MT_HEADER); + MGETHDR(mh, MB_DONTWAIT, MT_HEADER); if (!mh) { m_freem(m); return NULL; @@ -3254,16 +3254,16 @@ ipsec_copypkt(struct mbuf *m) struct mbuf *mm; if (n->m_flags & M_PKTHDR) { - MGETHDR(mnew, M_DONTWAIT, MT_HEADER); + MGETHDR(mnew, MB_DONTWAIT, MT_HEADER); if (mnew == NULL) goto fail; - if (!m_dup_pkthdr(mnew, n, M_DONTWAIT)) { + if (!m_dup_pkthdr(mnew, n, MB_DONTWAIT)) { m_free(mnew); goto fail; } } else { - MGET(mnew, M_DONTWAIT, MT_DATA); + MGET(mnew, MB_DONTWAIT, MT_DATA); if (mnew == NULL) goto fail; } @@ -3287,7 +3287,7 @@ ipsec_copypkt(struct mbuf *m) if (remain <= (mm->m_flags & M_PKTHDR ? MHLEN : MLEN)) len = remain; else { /* allocate a cluster */ - MCLGET(mm, M_DONTWAIT); + MCLGET(mm, MB_DONTWAIT); if (!(mm->m_flags & M_EXT)) { m_free(mm); goto fail; @@ -3307,7 +3307,7 @@ ipsec_copypkt(struct mbuf *m) break; /* need another mbuf */ - MGETHDR(mn, M_DONTWAIT, MT_HEADER); + MGETHDR(mn, MB_DONTWAIT, MT_HEADER); if (mn == NULL) goto fail; mn->m_pkthdr.rcvif = NULL; diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index 2cc1bbb149..cf191f2a15 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -1,5 +1,5 @@ /* $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.4 2004/05/20 18:30:36 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/mld6.c,v 1.5 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: mld6.c,v 1.27 2001/04/04 05:17:30 itojun Exp $ */ /* @@ -394,10 +394,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, M_DONTWAIT, MT_HEADER); + MGETHDR(mh, MB_DONTWAIT, MT_HEADER); if (mh == NULL) return; - MGET(md, M_DONTWAIT, MT_DATA); + MGET(md, MB_DONTWAIT, MT_DATA); if (md == NULL) { m_free(mh); return; diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 35ac530265..c9a3e00eff 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/nd6_nbr.c,v 1.4.2.6 2003/01/23 21:06:47 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/nd6_nbr.c,v 1.4 2004/05/20 18:30:36 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/nd6_nbr.c,v 1.5 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: nd6_nbr.c,v 1.86 2002/01/21 02:33:04 jinmei Exp $ */ /* @@ -360,9 +360,9 @@ nd6_ns_output(struct ifnet *ifp, const struct in6_addr *daddr6, return; } - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m && max_linkhdr + maxlen >= MHLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_free(m); m = NULL; @@ -841,9 +841,9 @@ nd6_na_output(struct ifnet *ifp, const struct in6_addr *daddr6, return; } - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m && max_linkhdr + maxlen >= MHLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_free(m); m = NULL; diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index fe0119753c..ff0daa98b3 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.7.2.7 2003/01/24 05:11:35 sam Exp $ - * $DragonFly: src/sys/netinet6/raw_ip6.c,v 1.12 2004/05/20 18:30:36 cpressey Exp $ + * $DragonFly: src/sys/netinet6/raw_ip6.c,v 1.13 2004/06/02 14:43:01 eirikn Exp $ */ /* @@ -359,7 +359,7 @@ rip6_output(struct mbuf *m, ...) code = icmp6->icmp6_code; } - M_PREPEND(m, sizeof(*ip6), M_WAIT); + M_PREPEND(m, sizeof(*ip6), MB_WAIT); ip6 = mtod(m, struct ip6_hdr *); /* diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c index 4090bb6c46..aa7b35855f 100644 --- a/sys/netinet6/udp6_output.c +++ b/sys/netinet6/udp6_output.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/udp6_output.c,v 1.1.2.6 2003/01/23 21:06:47 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/udp6_output.c,v 1.5 2004/05/20 18:30:36 cpressey Exp $ */ +/* $DragonFly: src/sys/netinet6/udp6_output.c,v 1.6 2004/06/02 14:43:01 eirikn Exp $ */ /* $KAME: udp6_output.c,v 1.31 2001/05/21 16:39:15 jinmei Exp $ */ /* @@ -244,7 +244,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), M_DONTWAIT); + M_PREPEND(m, hlen + sizeof(struct udphdr), MB_DONTWAIT); if (m == 0) { error = ENOBUFS; goto release; diff --git a/sys/netproto/atalk/aarp.c b/sys/netproto/atalk/aarp.c index 72f65fcb9b..1b88138937 100644 --- a/sys/netproto/atalk/aarp.c +++ b/sys/netproto/atalk/aarp.c @@ -3,7 +3,7 @@ * All Rights Reserved. * * $FreeBSD: src/sys/netatalk/aarp.c,v 1.12.2.2 2001/06/23 20:43:09 iedowse Exp $ - * $DragonFly: src/sys/netproto/atalk/aarp.c,v 1.10 2004/04/21 18:13:59 dillon Exp $ + * $DragonFly: src/sys/netproto/atalk/aarp.c,v 1.11 2004/06/02 14:43:02 eirikn Exp $ */ #include "opt_atalk.h" @@ -130,7 +130,7 @@ aarpwhohas( struct arpcom *ac, struct sockaddr_at *sat ) struct llc *llc; struct sockaddr sa; - if (( m = m_gethdr( M_DONTWAIT, MT_DATA )) == NULL ) { + if (( m = m_gethdr( MB_DONTWAIT, MT_DATA )) == NULL ) { return; } m->m_len = sizeof( *ea ); @@ -166,7 +166,7 @@ aarpwhohas( struct arpcom *ac, struct sockaddr_at *sat ) bcopy((caddr_t)atmulticastaddr, (caddr_t)eh->ether_dhost, sizeof( eh->ether_dhost )); eh->ether_type = htons(sizeof(struct llc) + sizeof(struct ether_aarp)); - M_PREPEND( m, sizeof( struct llc ), M_WAIT ); + M_PREPEND( m, sizeof( struct llc ), MB_WAIT ); llc = mtod( m, struct llc *); llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP; llc->llc_control = LLC_UI; @@ -444,7 +444,7 @@ at_aarpinput( struct arpcom *ac, struct mbuf *m) if ( aa->aa_flags & AFA_PHASE2 ) { eh->ether_type = htons( sizeof( struct llc ) + sizeof( struct ether_aarp )); - M_PREPEND( m, sizeof( struct llc ), M_DONTWAIT ); + M_PREPEND( m, sizeof( struct llc ), MB_DONTWAIT ); if ( m == NULL ) { return; } @@ -555,7 +555,7 @@ aarpprobe( void *arg ) aa->aa_ch = timeout( aarpprobe, (caddr_t)ac, hz / 5 ); } - if (( m = m_gethdr( M_DONTWAIT, MT_DATA )) == NULL ) { + if (( m = m_gethdr( MB_DONTWAIT, MT_DATA )) == NULL ) { return; } m->m_len = sizeof( *ea ); @@ -580,7 +580,7 @@ aarpprobe( void *arg ) sizeof( eh->ether_dhost )); eh->ether_type = htons( sizeof( struct llc ) + sizeof( struct ether_aarp )); - M_PREPEND( m, sizeof( struct llc ), M_WAIT ); + M_PREPEND( m, sizeof( struct llc ), MB_WAIT ); /* XXX-MBUF */ llc = mtod( m, struct llc *); llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP; diff --git a/sys/netproto/atalk/ddp_output.c b/sys/netproto/atalk/ddp_output.c index d647ea1519..8e38f37cb1 100644 --- a/sys/netproto/atalk/ddp_output.c +++ b/sys/netproto/atalk/ddp_output.c @@ -22,7 +22,7 @@ */ /* $FreeBSD: src/sys/netatalk/ddp_output.c,v 1.13.6.1 2000/06/02 22:39:07 archie Exp $ */ -/* $DragonFly: src/sys/netproto/atalk/ddp_output.c,v 1.5 2004/01/06 03:17:28 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/atalk/ddp_output.c,v 1.6 2004/06/02 14:43:02 eirikn Exp $ */ #include #include @@ -49,7 +49,7 @@ ddp_output( struct mbuf *m, struct socket *so) struct ddpehdr *deh; struct ddpcb *ddp = sotoddpcb( so ); - M_PREPEND( m, sizeof( struct ddpehdr ), M_WAIT ); + M_PREPEND( m, sizeof( struct ddpehdr ), MB_WAIT ); if (m == NULL) return (ENOBUFS); @@ -192,7 +192,7 @@ ddp_route( struct mbuf *m, struct route *ro) * packets end up poorly aligned due to the three byte elap header. */ if ( !(aa->aa_flags & AFA_PHASE2) ) { - MGET( m0, M_WAIT, MT_HEADER ); + MGET( m0, MB_WAIT, MT_HEADER ); if ( m0 == 0 ) { m_freem( m ); printf("ddp_route: no buffers\n"); diff --git a/sys/netproto/atm/port.h b/sys/netproto/atm/port.h index 06c59686dd..bc3285dc53 100644 --- a/sys/netproto/atm/port.h +++ b/sys/netproto/atm/port.h @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/port.h,v 1.2.2.2 2003/01/23 21:06:44 sam Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/port.h,v 1.3 2003/07/23 02:30:21 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/port.h,v 1.4 2004/06/02 14:43:02 eirikn Exp $ * */ @@ -209,8 +209,8 @@ #include typedef struct mbuf KBuffer; -#define KB_F_WAIT M_WAIT -#define KB_F_NOWAIT M_DONTWAIT +#define KB_F_WAIT MB_WAIT +#define KB_F_NOWAIT MB_DONTWAIT #define KB_T_HEADER MT_HEADER #define KB_T_DATA MT_DATA diff --git a/sys/netproto/ipsec/ipsec_mbuf.c b/sys/netproto/ipsec/ipsec_mbuf.c index c23c30269e..7cd03b12b0 100644 --- a/sys/netproto/ipsec/ipsec_mbuf.c +++ b/sys/netproto/ipsec/ipsec_mbuf.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netipsec/ipsec_mbuf.c,v 1.5.2.2 2003/03/28 20:32:53 sam Exp $ - * $DragonFly: src/sys/netproto/ipsec/ipsec_mbuf.c,v 1.4 2003/08/07 21:17:37 dillon Exp $ + * $DragonFly: src/sys/netproto/ipsec/ipsec_mbuf.c,v 1.5 2004/06/02 14:43:02 eirikn Exp $ */ /* @@ -135,20 +135,20 @@ m_clone(struct mbuf *m0) * because M_MOVE_PKTHDR will smash the data * pointer and drop the M_EXT marker. */ - MGETHDR(n, M_DONTWAIT, m->m_type); + MGETHDR(n, MB_DONTWAIT, m->m_type); if (n == NULL) { m_freem(m0); return (NULL); } M_MOVE_PKTHDR(n, m); - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_free(n); m_freem(m0); return (NULL); } } else { - n = m_getcl(M_DONTWAIT, m->m_type, m->m_flags); + n = m_getcl(MB_DONTWAIT, m->m_type, m->m_flags); if (n == NULL) { m_freem(m0); return (NULL); @@ -180,7 +180,7 @@ m_clone(struct mbuf *m0) break; off += cc; - n = m_getcl(M_DONTWAIT, m->m_type, m->m_flags); + n = m_getcl(MB_DONTWAIT, m->m_type, m->m_flags); if (n == NULL) { m_freem(mfirst); m_freem(m0); @@ -240,7 +240,7 @@ m_makespace(struct mbuf *m0, int skip, int hlen, int *off) * * NB: this ignores mbuf types. */ - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (n == NULL) return (NULL); n->m_next = m->m_next; /* splice new mbuf */ @@ -268,7 +268,7 @@ m_makespace(struct mbuf *m0, int skip, int hlen, int *off) if (remain + hlen > M_TRAILINGSPACE(n)) { struct mbuf *n2; - MGET(n2, M_DONTWAIT, MT_DATA); + MGET(n2, MB_DONTWAIT, MT_DATA); /* NB: new mbuf is on chain, let caller free */ if (n2 == NULL) return (NULL); @@ -358,7 +358,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, M_DONTWAIT, MT_DATA); + MGET(m1, MB_DONTWAIT, MT_DATA); if (m1 == 0) { m_freem(m0); DPRINTF(("m_pad: unable to get extra mbuf\n")); diff --git a/sys/netproto/ipsec/ipsec_output.c b/sys/netproto/ipsec/ipsec_output.c index 8c27519485..3db218d0c1 100644 --- a/sys/netproto/ipsec/ipsec_output.c +++ b/sys/netproto/ipsec/ipsec_output.c @@ -24,7 +24,7 @@ * 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.4 2004/02/14 21:15:33 dillon Exp $ + * $DragonFly: src/sys/netproto/ipsec/ipsec_output.c,v 1.5 2004/06/02 14:43:02 eirikn Exp $ */ /* @@ -490,7 +490,7 @@ ipsec6_splithdr(struct mbuf *m) ip6 = mtod(m, struct ip6_hdr *); hlen = sizeof(struct ip6_hdr); if (m->m_len > hlen) { - MGETHDR(mh, M_DONTWAIT, MT_HEADER); + MGETHDR(mh, MB_DONTWAIT, MT_HEADER); if (!mh) { m_freem(m); return NULL; @@ -601,7 +601,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, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (!n) { m_freem(m); return ENOBUFS; diff --git a/sys/netproto/ipsec/key.c b/sys/netproto/ipsec/key.c index 10b61e938b..20604a6d36 100644 --- a/sys/netproto/ipsec/key.c +++ b/sys/netproto/ipsec/key.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.1 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/key.c,v 1.6 2004/04/22 05:09:48 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/ipsec/key.c,v 1.7 2004/06/02 14:43:02 eirikn Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ /* @@ -1617,7 +1617,7 @@ key_gather_mbuf(struct mbuf *m, const struct sadb_msghdr *mhp, if (len > MHLEN) panic("assumption failed"); #endif - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, MB_DONTWAIT, MT_DATA); if (!n) goto fail; n->m_len = len; @@ -1636,7 +1636,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], - M_DONTWAIT); + MB_DONTWAIT); } if (n == NULL) goto fail; @@ -2069,9 +2069,9 @@ key_spddelete2(so, m, mhp) if (len > MCLBYTES) return key_senderror(so, m, ENOBUFS); - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, MB_DONTWAIT, MT_DATA); if (n && len > MHLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_freem(n); n = NULL; @@ -2093,7 +2093,7 @@ key_spddelete2(so, m, mhp) #endif n->m_next = m_copym(m, mhp->extoff[SADB_X_EXT_POLICY], - mhp->extlen[SADB_X_EXT_POLICY], M_DONTWAIT); + mhp->extlen[SADB_X_EXT_POLICY], MB_DONTWAIT); if (!n->m_next) { m_freem(n); return key_senderror(so, m, ENOBUFS); @@ -3320,7 +3320,7 @@ key_setdumpsa(sav, type, satype, seq, pid) if ((!m && !p) || (m && p)) goto fail; if (p && tres) { - M_PREPEND(tres, l, M_DONTWAIT); + M_PREPEND(tres, l, MB_DONTWAIT); if (!tres) goto fail; bcopy(p, mtod(tres, caddr_t), l); @@ -3379,9 +3379,9 @@ key_setsadbmsg(type, tlen, satype, seq, pid, reserved) len = PFKEY_ALIGN8(sizeof(struct sadb_msg)); if (len > MCLBYTES) return NULL; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m && len > MHLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_freem(m); m = NULL; @@ -4490,9 +4490,9 @@ key_getspi(so, m, mhp) if (len > MCLBYTES) return key_senderror(so, m, ENOBUFS); - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, MB_DONTWAIT, MT_DATA); if (len > MHLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_freem(n); n = NULL; @@ -5379,7 +5379,7 @@ key_getcomb_esp() KASSERT(l <= MLEN, ("key_getcomb_esp: l=%u > MLEN=%lu", l, (u_long) MLEN)); - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m) { M_ALIGN(m, l); m->m_len = l; @@ -5481,14 +5481,14 @@ key_getcomb_ah() KASSERT(l <= MLEN, ("key_getcomb_ah: l=%u > MLEN=%lu", l, (u_long) MLEN)); - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m) { M_ALIGN(m, l); m->m_len = l; m->m_next = NULL; } } else - M_PREPEND(m, l, M_DONTWAIT); + M_PREPEND(m, l, MB_DONTWAIT); if (!m) return NULL; @@ -5526,14 +5526,14 @@ key_getcomb_ipcomp() KASSERT(l <= MLEN, ("key_getcomb_ipcomp: l=%u > MLEN=%lu", l, (u_long) MLEN)); - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m) { M_ALIGN(m, l); m->m_len = l; m->m_next = NULL; } } else - M_PREPEND(m, l, M_DONTWAIT); + M_PREPEND(m, l, MB_DONTWAIT); if (!m) return NULL; @@ -5577,7 +5577,7 @@ key_getprop(saidx) if (!m) return NULL; - M_PREPEND(m, l, M_DONTWAIT); + M_PREPEND(m, l, MB_DONTWAIT); if (!m) return NULL; @@ -6082,9 +6082,9 @@ key_register(so, m, mhp) if (len > MCLBYTES) return key_senderror(so, m, ENOBUFS); - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, MB_DONTWAIT, MT_DATA); if (len > MHLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_freem(n); n = NULL; @@ -6648,9 +6648,9 @@ key_parse(m, so) if (m->m_next) { struct mbuf *n; - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, MB_DONTWAIT, MT_DATA); if (n && m->m_pkthdr.len > MHLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_free(n); n = NULL; @@ -7248,9 +7248,9 @@ key_alloc_mbuf(l) len = l; while (len > 0) { - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (n && len > MLEN) - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if (!n) { m_freem(m); return NULL; diff --git a/sys/netproto/ipsec/keysock.c b/sys/netproto/ipsec/keysock.c index 7c5637cf35..6e6fc404b5 100644 --- a/sys/netproto/ipsec/keysock.c +++ b/sys/netproto/ipsec/keysock.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netipsec/keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/keysock.c,v 1.6 2004/03/06 01:58:56 hsu Exp $ */ +/* $DragonFly: src/sys/netproto/ipsec/keysock.c,v 1.7 2004/06/02 14:43:02 eirikn Exp $ */ /* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */ /* @@ -149,7 +149,7 @@ key_sendup0(rp, m, promisc) if (promisc) { struct sadb_msg *pmsg; - M_PREPEND(m, sizeof(struct sadb_msg), M_DONTWAIT); + M_PREPEND(m, sizeof(struct sadb_msg), MB_DONTWAIT); if (m && m->m_len < sizeof(struct sadb_msg)) m = m_pullup(m, sizeof(struct sadb_msg)); if (!m) { @@ -220,10 +220,10 @@ key_sendup(so, msg, len, target) m = mprev = NULL; while (tlen > 0) { if (tlen == len) { - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, MB_DONTWAIT, MT_DATA); n->m_len = MHLEN; } else { - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); n->m_len = MLEN; } if (!n) { @@ -231,7 +231,7 @@ key_sendup(so, msg, len, target) return ENOBUFS; } if (tlen >= MCLBYTES) { /*XXX better threshold? */ - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_free(n); m_freem(m); diff --git a/sys/netproto/ipsec/xform_ipip.c b/sys/netproto/ipsec/xform_ipip.c index b84cc257cc..ca1783ed7f 100644 --- a/sys/netproto/ipsec/xform_ipip.c +++ b/sys/netproto/ipsec/xform_ipip.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netipsec/xform_ipip.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/xform_ipip.c,v 1.6 2004/03/06 01:58:56 hsu Exp $ */ +/* $DragonFly: src/sys/netproto/ipsec/xform_ipip.c,v 1.7 2004/06/02 14:43:02 eirikn Exp $ */ /* $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -442,7 +442,7 @@ ipip_output( goto bad; } - M_PREPEND(m, sizeof(struct ip), M_DONTWAIT); + M_PREPEND(m, sizeof(struct ip), MB_DONTWAIT); if (m == 0) { DPRINTF(("ipip_output: M_PREPEND failed\n")); ipipstat.ipips_hdrops++; @@ -530,7 +530,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), M_DONTWAIT); + M_PREPEND(m, sizeof(struct ip6_hdr), MB_DONTWAIT); if (m == 0) { DPRINTF(("ipip_output: M_PREPEND failed\n")); ipipstat.ipips_hdrops++; diff --git a/sys/netproto/ipx/ipx_input.c b/sys/netproto/ipx/ipx_input.c index fe815c0778..fe728b82db 100644 --- a/sys/netproto/ipx/ipx_input.c +++ b/sys/netproto/ipx/ipx_input.c @@ -34,7 +34,7 @@ * @(#)ipx_input.c * * $FreeBSD: src/sys/netipx/ipx_input.c,v 1.22.2.2 2001/02/22 09:44:18 bp Exp $ - * $DragonFly: src/sys/netproto/ipx/ipx_input.c,v 1.11 2004/04/21 18:14:02 dillon Exp $ + * $DragonFly: src/sys/netproto/ipx/ipx_input.c,v 1.12 2004/06/02 14:43:02 eirikn Exp $ */ #include @@ -474,7 +474,7 @@ struct ifnet *ifp; if (m0 != NULL) { struct ipx *ipx; - M_PREPEND(m0, sizeof(*ipx), M_DONTWAIT); + M_PREPEND(m0, sizeof(*ipx), MB_DONTWAIT); if (m0 == NULL) continue; ipx = mtod(m0, struct ipx *); diff --git a/sys/netproto/ipx/ipx_ip.c b/sys/netproto/ipx/ipx_ip.c index 9039c9c56c..caefe0bcf9 100644 --- a/sys/netproto/ipx/ipx_ip.c +++ b/sys/netproto/ipx/ipx_ip.c @@ -34,7 +34,7 @@ * @(#)ipx_ip.c * * $FreeBSD: src/sys/netipx/ipx_ip.c,v 1.24.2.2 2003/01/23 21:06:48 sam Exp $ - * $DragonFly: src/sys/netproto/ipx/ipx_ip.c,v 1.11 2004/04/22 05:09:49 dillon Exp $ + * $DragonFly: src/sys/netproto/ipx/ipx_ip.c,v 1.12 2004/06/02 14:43:02 eirikn Exp $ */ /* @@ -172,7 +172,7 @@ ipxip_input(m, hlen, dummy) if (ipxip_lastin != NULL) { m_freem(ipxip_lastin); } - ipxip_lastin = m_copym(m, 0, (int)M_COPYALL, M_DONTWAIT); + ipxip_lastin = m_copym(m, 0, (int)M_COPYALL, MB_DONTWAIT); } /* * Get IP and IPX header together in first mbuf. @@ -251,7 +251,7 @@ ipxipoutput(ifp, m, dst, rt) /* following clause not necessary on vax */ if (3 & (int)m->m_data) { /* force longword alignment of ip hdr */ - struct mbuf *m0 = m_gethdr(MT_HEADER, M_DONTWAIT); + struct mbuf *m0 = m_gethdr(MT_HEADER, MB_DONTWAIT); if (m0 == NULL) { m_freem(m); return (ENOBUFS); @@ -264,7 +264,7 @@ ipxipoutput(ifp, m, dst, rt) m->m_flags &= ~M_PKTHDR; m = m0; } else { - M_PREPEND(m, sizeof(struct ip), M_DONTWAIT); + M_PREPEND(m, sizeof(struct ip), MB_DONTWAIT); if (m == NULL) return (ENOBUFS); } diff --git a/sys/netproto/ipx/ipx_outputfl.c b/sys/netproto/ipx/ipx_outputfl.c index fc90d71573..7bbeb5b7bb 100644 --- a/sys/netproto/ipx/ipx_outputfl.c +++ b/sys/netproto/ipx/ipx_outputfl.c @@ -34,7 +34,7 @@ * @(#)ipx_outputfl.c * * $FreeBSD: src/sys/netipx/ipx_outputfl.c,v 1.14.2.1 2000/05/01 01:10:24 bp Exp $ - * $DragonFly: src/sys/netproto/ipx/ipx_outputfl.c,v 1.4 2003/08/07 21:17:37 dillon Exp $ + * $DragonFly: src/sys/netproto/ipx/ipx_outputfl.c,v 1.5 2004/06/02 14:43:03 eirikn Exp $ */ #include @@ -249,7 +249,7 @@ ipx_output_type20(m) if(ipx->ipx_sum != 0xffff) ipx->ipx_sum = ipx_cksum(m, ntohs(ipx->ipx_len)); - m1 = m_copym(m, 0, M_COPYALL, M_DONTWAIT); + m1 = m_copym(m, 0, M_COPYALL, MB_DONTWAIT); if(m1) { error = (*ifp->if_output)(ifp, m1, (struct sockaddr *)&dst, NULL); diff --git a/sys/netproto/ipx/ipx_usrreq.c b/sys/netproto/ipx/ipx_usrreq.c index 6410dbffb7..6ce352dba8 100644 --- a/sys/netproto/ipx/ipx_usrreq.c +++ b/sys/netproto/ipx/ipx_usrreq.c @@ -34,7 +34,7 @@ * @(#)ipx_usrreq.c * * $FreeBSD: src/sys/netipx/ipx_usrreq.c,v 1.26.2.1 2001/02/22 09:44:18 bp Exp $ - * $DragonFly: src/sys/netproto/ipx/ipx_usrreq.c,v 1.6 2004/03/05 16:57:16 hsu Exp $ + * $DragonFly: src/sys/netproto/ipx/ipx_usrreq.c,v 1.7 2004/06/02 14:43:03 eirikn Exp $ */ #include "opt_ipx.h" @@ -220,7 +220,7 @@ ipx_output(ipxp, m0) (m->m_len + m->m_data < &m->m_dat[MLEN])) { mtod(m, char*)[m->m_len++] = 0; } else { - struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA); + struct mbuf *m1 = m_get(MB_DONTWAIT, MT_DATA); if (m1 == NULL) { m_freem(m0); @@ -241,7 +241,7 @@ ipx_output(ipxp, m0) if (ipxp->ipxp_flags & IPXP_RAWOUT) { ipx = mtod(m, struct ipx *); } else { - M_PREPEND(m, sizeof(struct ipx), M_DONTWAIT); + M_PREPEND(m, sizeof(struct ipx), MB_DONTWAIT); if (m == NULL) return (ENOBUFS); ipx = mtod(m, struct ipx *); diff --git a/sys/netproto/ipx/spx_usrreq.c b/sys/netproto/ipx/spx_usrreq.c index c1bb61f4ec..a045a716b1 100644 --- a/sys/netproto/ipx/spx_usrreq.c +++ b/sys/netproto/ipx/spx_usrreq.c @@ -34,7 +34,7 @@ * @(#)spx_usrreq.h * * $FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.27.2.1 2001/02/22 09:44:18 bp Exp $ - * $DragonFly: src/sys/netproto/ipx/spx_usrreq.c,v 1.8 2004/04/22 05:09:49 dillon Exp $ + * $DragonFly: src/sys/netproto/ipx/spx_usrreq.c,v 1.9 2004/06/02 14:43:03 eirikn Exp $ */ #include @@ -579,7 +579,7 @@ present: spx_newchecks[4]++; if (dt != cb->s_rhdr.spx_dt) { struct mbuf *mm = - m_getclr(M_DONTWAIT, MT_CONTROL); + m_getclr(MB_DONTWAIT, MT_CONTROL); spx_newchecks[0]++; if (mm != NULL) { u_short *s = @@ -755,7 +755,7 @@ spx_output(cb, m0) * from usrreq(), so it is OK to * block. */ - m = m_copym(m0, 0, mtu, M_WAIT); + m = m_copym(m0, 0, mtu, MB_WAIT); if (cb->s_flags & SF_NEWCALL) { struct mbuf *mm = m; spx_newchecks[7]++; @@ -785,7 +785,7 @@ spx_output(cb, m0) if (M_TRAILINGSPACE(m) >= 1) m->m_len++; else { - struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA); + struct mbuf *m1 = m_get(MB_DONTWAIT, MT_DATA); if (m1 == NULL) { m_freem(m0); @@ -796,7 +796,7 @@ spx_output(cb, m0) m->m_next = m1; } } - m = m_gethdr(M_DONTWAIT, MT_HEADER); + m = m_gethdr(MB_DONTWAIT, MT_HEADER); if (m == NULL) { m_freem(m0); return (ENOBUFS); @@ -1009,7 +1009,7 @@ send: spxstat.spxs_sndprobe++; if (cb->s_flags & SF_ACKNOW) spxstat.spxs_sndacks++; - m = m_gethdr(M_DONTWAIT, MT_HEADER); + m = m_gethdr(MB_DONTWAIT, MT_HEADER); if (m == NULL) return (ENOBUFS); /* @@ -1335,7 +1335,7 @@ spx_attach(struct socket *so, int proto, struct pru_attach_info *ai) MALLOC(cb, struct spxpcb *, sizeof *cb, M_PCB, M_INTWAIT | M_ZERO); sb = &so->so_snd; - mm = m_getclr(M_DONTWAIT, MT_HEADER); + mm = m_getclr(MB_DONTWAIT, MT_HEADER); if (mm == NULL) { FREE(cb, M_PCB); error = ENOBUFS; diff --git a/sys/netproto/key/key.c b/sys/netproto/key/key.c index 20c8654952..bbf39c426d 100644 --- a/sys/netproto/key/key.c +++ b/sys/netproto/key/key.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netkey/key.c,v 1.16.2.13 2002/07/24 18:17:40 ume Exp $ */ -/* $DragonFly: src/sys/netproto/key/key.c,v 1.7 2004/06/01 17:35:03 joerg Exp $ */ +/* $DragonFly: src/sys/netproto/key/key.c,v 1.8 2004/06/02 14:43:03 eirikn Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ /* @@ -1654,7 +1654,7 @@ key_gather_mbuf(struct mbuf *m, const struct sadb_msghdr *mhp, if (len > MHLEN) panic("assumption failed"); #endif - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, MB_DONTWAIT, MT_DATA); if (!n) goto fail; n->m_len = len; @@ -1673,7 +1673,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], - M_DONTWAIT); + MB_DONTWAIT); } if (n == NULL) goto fail; @@ -2109,9 +2109,9 @@ key_spddelete2(so, m, mhp) if (len > MCLBYTES) return key_senderror(so, m, ENOBUFS); - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, MB_DONTWAIT, MT_DATA); if (n && len > MHLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_freem(n); n = NULL; @@ -2133,7 +2133,7 @@ key_spddelete2(so, m, mhp) #endif n->m_next = m_copym(m, mhp->extoff[SADB_X_EXT_POLICY], - mhp->extlen[SADB_X_EXT_POLICY], M_DONTWAIT); + mhp->extlen[SADB_X_EXT_POLICY], MB_DONTWAIT); if (!n->m_next) { m_freem(n); return key_senderror(so, m, ENOBUFS); @@ -3480,7 +3480,7 @@ key_setdumpsa(sav, type, satype, seq, pid) if ((!m && !p) || (m && p)) goto fail; if (p && tres) { - M_PREPEND(tres, l, M_DONTWAIT); + M_PREPEND(tres, l, MB_DONTWAIT); if (!tres) goto fail; bcopy(p, mtod(tres, caddr_t), l); @@ -3539,9 +3539,9 @@ key_setsadbmsg(type, tlen, satype, seq, pid, reserved) len = PFKEY_ALIGN8(sizeof(struct sadb_msg)); if (len > MCLBYTES) return NULL; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, MB_DONTWAIT, MT_DATA); if (m && len > MHLEN) { - MCLGET(m, M_DONTWAIT); + MCLGET(m, MB_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_freem(m); m = NULL; @@ -4673,9 +4673,9 @@ key_getspi(so, m, mhp) if (len > MCLBYTES) return key_senderror(so, m, ENOBUFS); - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, MB_DONTWAIT, MT_DATA); if (len > MHLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_freem(n); n = NULL; @@ -5564,7 +5564,7 @@ key_getcomb_esp() if (l > MLEN) panic("assumption failed in key_getcomb_esp"); #endif - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m) { M_ALIGN(m, l); m->m_len = l; @@ -5648,14 +5648,14 @@ key_getcomb_ah() if (l > MLEN) panic("assumption failed in key_getcomb_ah"); #endif - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m) { M_ALIGN(m, l); m->m_len = l; m->m_next = NULL; } } else - M_PREPEND(m, l, M_DONTWAIT); + M_PREPEND(m, l, MB_DONTWAIT); if (!m) return NULL; @@ -5694,14 +5694,14 @@ key_getcomb_ipcomp() if (l > MLEN) panic("assumption failed in key_getcomb_ipcomp"); #endif - MGET(m, M_DONTWAIT, MT_DATA); + MGET(m, MB_DONTWAIT, MT_DATA); if (m) { M_ALIGN(m, l); m->m_len = l; m->m_next = NULL; } } else - M_PREPEND(m, l, M_DONTWAIT); + M_PREPEND(m, l, MB_DONTWAIT); if (!m) return NULL; @@ -5747,7 +5747,7 @@ key_getprop(saidx) if (!m) return NULL; - M_PREPEND(m, l, M_DONTWAIT); + M_PREPEND(m, l, MB_DONTWAIT); if (!m) return NULL; @@ -6264,9 +6264,9 @@ key_register(so, m, mhp) if (len > MCLBYTES) return key_senderror(so, m, ENOBUFS); - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, MB_DONTWAIT, MT_DATA); if (len > MHLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_freem(n); n = NULL; @@ -6838,9 +6838,9 @@ key_parse(m, so) if (m->m_next) { struct mbuf *n; - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, MB_DONTWAIT, MT_DATA); if (n && m->m_pkthdr.len > MHLEN) { - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_free(n); n = NULL; @@ -7452,9 +7452,9 @@ key_alloc_mbuf(l) len = l; while (len > 0) { - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); if (n && len > MLEN) - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if (!n) { m_freem(m); return NULL; diff --git a/sys/netproto/key/keysock.c b/sys/netproto/key/keysock.c index 248cff820e..8c7335dc53 100644 --- a/sys/netproto/key/keysock.c +++ b/sys/netproto/key/keysock.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netkey/keysock.c,v 1.1.2.4 2003/01/11 19:10:59 ume Exp $ */ -/* $DragonFly: src/sys/netproto/key/keysock.c,v 1.9 2004/03/06 01:58:56 hsu Exp $ */ +/* $DragonFly: src/sys/netproto/key/keysock.c,v 1.10 2004/06/02 14:43:03 eirikn Exp $ */ /* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */ /* @@ -144,7 +144,7 @@ key_sendup0(rp, m, promisc) if (promisc) { struct sadb_msg *pmsg; - M_PREPEND(m, sizeof(struct sadb_msg), M_DONTWAIT); + M_PREPEND(m, sizeof(struct sadb_msg), MB_DONTWAIT); if (m && m->m_len < sizeof(struct sadb_msg)) m = m_pullup(m, sizeof(struct sadb_msg)); if (!m) { @@ -215,10 +215,10 @@ key_sendup(so, msg, len, target) m = mprev = NULL; while (tlen > 0) { if (tlen == len) { - MGETHDR(n, M_DONTWAIT, MT_DATA); + MGETHDR(n, MB_DONTWAIT, MT_DATA); n->m_len = MHLEN; } else { - MGET(n, M_DONTWAIT, MT_DATA); + MGET(n, MB_DONTWAIT, MT_DATA); n->m_len = MLEN; } if (!n) { @@ -226,7 +226,7 @@ key_sendup(so, msg, len, target) return ENOBUFS; } if (tlen >= MCLBYTES) { /*XXX better threshold? */ - MCLGET(n, M_DONTWAIT); + MCLGET(n, MB_DONTWAIT); if ((n->m_flags & M_EXT) == 0) { m_free(n); m_freem(m); diff --git a/sys/netproto/ncp/ncp_rq.c b/sys/netproto/ncp/ncp_rq.c index 4eb197138f..01a6e05cb8 100644 --- a/sys/netproto/ncp/ncp_rq.c +++ b/sys/netproto/ncp/ncp_rq.c @@ -32,7 +32,7 @@ * Routines to prepare request and fetch reply * * $FreeBSD: src/sys/netncp/ncp_rq.c,v 1.1.2.1 2001/05/21 16:27:20 ru Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_rq.c,v 1.5 2003/08/07 21:17:38 dillon Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_rq.c,v 1.6 2004/06/02 14:43:03 eirikn Exp $ */ #include #include @@ -59,9 +59,9 @@ ncp_rq_head(struct ncp_rq *rqp, u_int32_t ptype, u_int8_t fn,struct thread *td, bzero(rqp, sizeof(*rqp)); rqp->td = td; rqp->cred = cred; - m = m_gethdr(M_WAIT, MT_DATA); + m = m_gethdr(MB_WAIT, MT_DATA); if (m == NULL) - return ENOBUFS; /* if M_WAIT ? */ + return ENOBUFS; /* if MB_WAIT ? */ m->m_pkthdr.rcvif = NULL; rqp->rq = rqp->mrq = m; rqp->rp = NULL; @@ -111,7 +111,7 @@ ncp_mchecksize(struct ncp_rq *rqp, int size) { panic("ncp_mchecksize\n"); if (M_TRAILINGSPACE(rqp->mrq)<(size)) { struct mbuf *m; - m = m_get(M_WAIT, MT_DATA); + m = m_get(MB_WAIT, MT_DATA); m->m_len = 0; rqp->bpos = mtod(m, caddr_t); rqp->mrq->m_next = m; @@ -158,7 +158,7 @@ ncp_rq_pathstring(struct ncp_rq *rqp, int size, char *name, struct ncp_nlstables m->m_len += cplen; } if (size) { - m = m_getm(m, size, MT_DATA, M_WAIT); + m = m_getm(m, size, MT_DATA, MB_WAIT); while (size > 0){ m = m->m_next; cplen = min(size, M_TRAILINGSPACE(m)); @@ -191,7 +191,7 @@ ncp_rq_putanymem(struct ncp_rq *rqp, caddr_t source, int size, int type) { m->m_len += cplen; } if (size) { - m = m_getm(m, size, MT_DATA, M_WAIT); + m = m_getm(m, size, MT_DATA, MB_WAIT); while (size > 0){ m = m->m_next; cplen = min(size, M_TRAILINGSPACE(m)); @@ -411,7 +411,7 @@ ncp_rp_mbuf(struct ncp_rq *rqp, int size) { struct mbuf *m=rqp->mrp, *rm; unsigned count; - rm = m_copym(m, rqp->bpos - mtod(m,caddr_t), size, M_WAIT); + rm = m_copym(m, rqp->bpos - mtod(m,caddr_t), size, MB_WAIT); while (size > 0) { if (m == 0) { printf("ncp_rp_mbuf: can't advance\n"); @@ -531,9 +531,9 @@ nwfs_uiotombuf(uiop, mq, siz, bpos) while (left > 0) { mlen = M_TRAILINGSPACE(mp); if (mlen == 0) { - MGET(mp, M_WAIT, MT_DATA); + MGET(mp, MB_WAIT, MT_DATA); if (clflg) - MCLGET(mp, M_WAIT); + MCLGET(mp, MB_WAIT); mp->m_len = 0; mp2->m_next = mp; mp2 = mp; diff --git a/sys/netproto/ncp/ncp_sock.c b/sys/netproto/ncp/ncp_sock.c index ab17efba6d..b3e5a99ed6 100644 --- a/sys/netproto/ncp/ncp_sock.c +++ b/sys/netproto/ncp/ncp_sock.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netncp/ncp_sock.c,v 1.2 1999/10/12 10:36:59 bp Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_sock.c,v 1.9 2004/03/04 10:29:23 hsu Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_sock.c,v 1.10 2004/06/02 14:43:03 eirikn Exp $ * * Low level socket routines */ @@ -171,7 +171,7 @@ ncp_sock_send(struct socket *so, struct mbuf *top, struct ncp_rq *rqp) int sendwait; for(;;) { - m = m_copym(top, 0, M_COPYALL, M_WAIT); + m = m_copym(top, 0, M_COPYALL, MB_WAIT); /* NCPDDEBUG(m);*/ error = so_pru_sosend(so, to, NULL, m, NULL, flags, td); if (error == 0 || error == EINTR || error == ENETDOWN) diff --git a/sys/netproto/ns/idp_usrreq.c b/sys/netproto/ns/idp_usrreq.c index 899f84d104..7f2db3b5cb 100644 --- a/sys/netproto/ns/idp_usrreq.c +++ b/sys/netproto/ns/idp_usrreq.c @@ -32,7 +32,7 @@ * * @(#)idp_usrreq.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/idp_usrreq.c,v 1.9 1999/08/28 00:49:47 peter Exp $ - * $DragonFly: src/sys/netproto/ns/idp_usrreq.c,v 1.7 2004/03/05 19:17:25 hsu Exp $ + * $DragonFly: src/sys/netproto/ns/idp_usrreq.c,v 1.8 2004/06/02 14:43:03 eirikn Exp $ */ #include @@ -178,7 +178,7 @@ idp_output(nsp, m0) (m->m_len + m->m_data < &m->m_dat[MLEN])) { m->m_len++; } else { - struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA); + struct mbuf *m1 = m_get(MB_DONTWAIT, MT_DATA); if (m1 == 0) { m_freem(m0); @@ -199,7 +199,7 @@ idp_output(nsp, m0) if (nsp->nsp_flags & NSP_RAWOUT) { idp = mtod(m, struct idp *); } else { - M_PREPEND(m, sizeof (struct idp), M_DONTWAIT); + M_PREPEND(m, sizeof (struct idp), MB_DONTWAIT); if (m == 0) return (ENOBUFS); idp = mtod(m, struct idp *); @@ -292,7 +292,7 @@ idp_ctloutput(req, so, level, name, value) case PRCO_GETOPT: if (value==NULL) return (EINVAL); - m = m_get(M_DONTWAIT, MT_DATA); + m = m_get(MB_DONTWAIT, MT_DATA); if (m==NULL) return (ENOBUFS); switch (name) { diff --git a/sys/netproto/ns/ns_error.c b/sys/netproto/ns/ns_error.c index 3e29ea2198..1f6d9b22d7 100644 --- a/sys/netproto/ns/ns_error.c +++ b/sys/netproto/ns/ns_error.c @@ -32,7 +32,7 @@ * * @(#)ns_error.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/ns_error.c,v 1.9 1999/08/28 00:49:49 peter Exp $ - * $DragonFly: src/sys/netproto/ns/ns_error.c,v 1.7 2004/02/16 20:37:20 dillon Exp $ + * $DragonFly: src/sys/netproto/ns/ns_error.c,v 1.8 2004/06/02 14:43:03 eirikn Exp $ */ #include @@ -145,7 +145,7 @@ ns_error(om, type, param) /* * First, formulate ns_err message */ - m = m_gethdr(M_DONTWAIT, MT_HEADER); + m = m_gethdr(MB_DONTWAIT, MT_HEADER); if (m == NULL) goto freeit; m->m_len = sizeof(*ep); diff --git a/sys/netproto/ns/ns_input.c b/sys/netproto/ns/ns_input.c index 1ee7679fcf..ca6b0ead55 100644 --- a/sys/netproto/ns/ns_input.c +++ b/sys/netproto/ns/ns_input.c @@ -32,7 +32,7 @@ * * @(#)ns_input.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/ns_input.c,v 1.13 2000/02/13 03:32:04 peter Exp $ - * $DragonFly: src/sys/netproto/ns/ns_input.c,v 1.12 2004/04/21 18:14:04 dillon Exp $ + * $DragonFly: src/sys/netproto/ns/ns_input.c,v 1.13 2004/06/02 14:43:03 eirikn Exp $ */ #include @@ -469,7 +469,7 @@ struct ifnet *ifp; if (m0) { struct idp *idp; - M_PREPEND(m0, sizeof (*idp), M_DONTWAIT); + M_PREPEND(m0, sizeof (*idp), MB_DONTWAIT); if (m0 == NULL) continue; idp = mtod(m0, struct idp *); diff --git a/sys/netproto/ns/ns_ip.c b/sys/netproto/ns/ns_ip.c index c729dc4ddc..b3e092c9ec 100644 --- a/sys/netproto/ns/ns_ip.c +++ b/sys/netproto/ns/ns_ip.c @@ -32,7 +32,7 @@ * * @(#)ns_ip.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/ns_ip.c,v 1.9 1999/08/28 00:49:50 peter Exp $ - * $DragonFly: src/sys/netproto/ns/ns_ip.c,v 1.8 2004/04/22 05:09:51 dillon Exp $ + * $DragonFly: src/sys/netproto/ns/ns_ip.c,v 1.9 2004/06/02 14:43:03 eirikn Exp $ */ /* @@ -169,7 +169,7 @@ idpip_input(m, ifp) if (nsip_lastin) { m_freem(nsip_lastin); } - nsip_lastin = m_copym(m, 0, (int)M_COPYALL, M_DONTWAIT); + nsip_lastin = m_copym(m, 0, (int)M_COPYALL, MB_DONTWAIT); } /* * Get IP and IDP header together in first mbuf. @@ -250,7 +250,7 @@ nsipoutput(ifn, m, dst) /* following clause not necessary on vax */ if (3 & (int)m->m_data) { /* force longword alignment of ip hdr */ - struct mbuf *m0 = m_gethdr(MT_HEADER, M_DONTWAIT); + struct mbuf *m0 = m_gethdr(MT_HEADER, MB_DONTWAIT); if (m0 == 0) { m_freem(m); return (ENOBUFS); @@ -262,7 +262,7 @@ nsipoutput(ifn, m, dst) m0->m_pkthdr.len = m0->m_len + m->m_len; m->m_flags &= ~M_PKTHDR; } else { - M_PREPEND(m, sizeof (struct ip), M_DONTWAIT); + M_PREPEND(m, sizeof (struct ip), MB_DONTWAIT); if (m == 0) return (ENOBUFS); } diff --git a/sys/netproto/ns/ns_pcb.c b/sys/netproto/ns/ns_pcb.c index b8377035fe..34fea53b46 100644 --- a/sys/netproto/ns/ns_pcb.c +++ b/sys/netproto/ns/ns_pcb.c @@ -32,7 +32,7 @@ * * @(#)ns_pcb.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/ns_pcb.c,v 1.9 1999/08/28 00:49:51 peter Exp $ - * $DragonFly: src/sys/netproto/ns/ns_pcb.c,v 1.7 2004/05/04 11:56:54 hmp Exp $ + * $DragonFly: src/sys/netproto/ns/ns_pcb.c,v 1.8 2004/06/02 14:43:03 eirikn Exp $ */ #include @@ -61,7 +61,7 @@ ns_pcballoc(so, head) struct mbuf *m; struct nspcb *nsp; - m = m_getclr(M_DONTWAIT, MT_CONTROL); /*protocol private PCB */ + m = m_getclr(MB_DONTWAIT, MT_CONTROL); /*protocol private PCB */ if (m == NULL) return (ENOBUFS); nsp = mtod(m, struct nspcb *); diff --git a/sys/netproto/ns/spp_usrreq.c b/sys/netproto/ns/spp_usrreq.c index 0a28c6a240..d14b8aaada 100644 --- a/sys/netproto/ns/spp_usrreq.c +++ b/sys/netproto/ns/spp_usrreq.c @@ -32,7 +32,7 @@ * * @(#)spp_usrreq.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/spp_usrreq.c,v 1.11 1999/08/28 00:49:53 peter Exp $ - * $DragonFly: src/sys/netproto/ns/spp_usrreq.c,v 1.8 2004/05/04 11:56:54 hmp Exp $ + * $DragonFly: src/sys/netproto/ns/spp_usrreq.c,v 1.9 2004/06/02 14:43:03 eirikn Exp $ */ #include @@ -172,7 +172,7 @@ spp_input(m, nsp) spp_istat.gonawy++; goto dropwithreset; } - am = m_get(M_DONTWAIT, MT_SONAME); + am = m_get(MB_DONTWAIT, MT_SONAME); if (am == NULL) goto drop; am->m_len = sizeof (struct sockaddr_ns); @@ -540,7 +540,7 @@ present: spp_newchecks[4]++; if (dt != cb->s_rhdr.sp_dt) { struct mbuf *mm = - m_getclr(M_DONTWAIT, MT_CONTROL); + m_getclr(MB_DONTWAIT, MT_CONTROL); spp_newchecks[0]++; if (mm != NULL) { u_short *s = @@ -754,7 +754,7 @@ spp_output(cb, m0) * from usrreq(), so it is OK to * block. */ - m = m_copym(m0, 0, mtu, M_WAIT); + m = m_copym(m0, 0, mtu, MB_WAIT); if (cb->s_flags & SF_NEWCALL) { struct mbuf *mm = m; spp_newchecks[7]++; @@ -784,7 +784,7 @@ spp_output(cb, m0) if (M_TRAILINGSPACE(m) >= 1) m->m_len++; else { - struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA); + struct mbuf *m1 = m_get(MB_DONTWAIT, MT_DATA); if (m1 == 0) { m_freem(m0); @@ -795,7 +795,7 @@ spp_output(cb, m0) m->m_next = m1; } } - m = m_gethdr(M_DONTWAIT, MT_HEADER); + m = m_gethdr(MB_DONTWAIT, MT_HEADER); if (m == 0) { m_freem(m0); return (ENOBUFS); @@ -1008,7 +1008,7 @@ send: sppstat.spps_sndprobe++; if (cb->s_flags & SF_ACKNOW) sppstat.spps_sndacks++; - m = m_gethdr(M_DONTWAIT, MT_HEADER); + m = m_gethdr(MB_DONTWAIT, MT_HEADER); if (m == 0) return (ENOBUFS); /* @@ -1169,7 +1169,7 @@ spp_ctloutput(req, so, level, name, value) case PRCO_GETOPT: if (value == NULL) return (EINVAL); - m = m_get(M_DONTWAIT, MT_DATA); + m = m_get(MB_DONTWAIT, MT_DATA); if (m == NULL) return (ENOBUFS); switch (name) { @@ -1314,7 +1314,7 @@ spp_usrreq(so, req, m, nam, controlp) nsp = sotonspcb(so); /* private PCB */ - mm = m_getclr(M_DONTWAIT, MT_CONTROL); + mm = m_getclr(MB_DONTWAIT, MT_CONTROL); sb = &so->so_snd; if (mm == NULL) { @@ -1322,7 +1322,7 @@ spp_usrreq(so, req, m, nam, controlp) break; } cb = mtod(mm, struct sppcb *); - mm = m_getclr(M_DONTWAIT, MT_HEADER); + mm = m_getclr(MB_DONTWAIT, MT_HEADER); if (mm == NULL) { (void) m_free(dtom(m)); error = ENOBUFS; diff --git a/sys/netproto/smb/smb_iod.c b/sys/netproto/smb/smb_iod.c index 87396bb63c..265ff48e98 100644 --- a/sys/netproto/smb/smb_iod.c +++ b/sys/netproto/smb/smb_iod.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_iod.c,v 1.1.2.2 2002/04/23 03:45:01 bp Exp $ - * $DragonFly: src/sys/netproto/smb/smb_iod.c,v 1.8 2004/03/01 06:33:18 dillon Exp $ + * $DragonFly: src/sys/netproto/smb/smb_iod.c,v 1.9 2004/06/02 14:43:03 eirikn Exp $ */ #include @@ -255,7 +255,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, M_WAIT); + m = m_copym(rqp->sr_rq.mb_top, 0, M_COPYALL, MB_WAIT); 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 afba5f526c..d98e4b6169 100644 --- a/sys/netproto/smb/smb_rq.c +++ b/sys/netproto/smb/smb_rq.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_rq.c,v 1.1.2.2 2002/04/23 03:45:01 bp Exp $ - * $DragonFly: src/sys/netproto/smb/smb_rq.c,v 1.7 2004/03/01 06:33:18 dillon Exp $ + * $DragonFly: src/sys/netproto/smb/smb_rq.c,v 1.8 2004/06/02 14:43:03 eirikn Exp $ */ #include #include @@ -416,7 +416,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, M_WAIT); + m0 = m_split(mtop, offset, MB_WAIT); 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 cd2f15288a..248db81360 100644 --- a/sys/netproto/smb/smb_trantcp.c +++ b/sys/netproto/smb/smb_trantcp.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_trantcp.c,v 1.3.2.1 2001/05/22 08:32:34 bp Exp $ - * $DragonFly: src/sys/netproto/smb/smb_trantcp.c,v 1.9 2004/03/05 16:57:16 hsu Exp $ + * $DragonFly: src/sys/netproto/smb/smb_trantcp.c,v 1.10 2004/06/02 14:43:03 eirikn Exp $ */ #include #include @@ -567,7 +567,7 @@ smb_nbst_send(struct smb_vc *vcp, struct mbuf *m0, struct thread *td) error = ENOTCONN; goto abort; } - M_PREPEND(m0, 4, M_TRYWAIT); + M_PREPEND(m0, 4, MB_TRYWAIT); if (m0 == NULL) return ENOBUFS; nb_sethdr(m0, NB_SSN_MESSAGE, m_fixhdr(m0) - 4); diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 92aab7599a..65aca34998 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -32,7 +32,7 @@ * * @(#)mbuf.h 8.5 (Berkeley) 2/19/95 * $FreeBSD: src/sys/sys/mbuf.h,v 1.44.2.17 2003/04/15 06:15:02 silby Exp $ - * $DragonFly: src/sys/sys/mbuf.h,v 1.9 2004/03/27 11:50:45 hsu Exp $ + * $DragonFly: src/sys/sys/mbuf.h,v 1.10 2004/06/02 14:43:04 eirikn Exp $ */ #ifndef _SYS_MBUF_H_ @@ -238,14 +238,14 @@ struct mbstat { * Flags specifying how an allocation should be made. */ -#define M_DONTWAIT 0x4 -#define M_TRYWAIT 0x8 -#define M_WAIT M_TRYWAIT +#define MB_DONTWAIT 0x4 +#define MB_TRYWAIT 0x8 +#define MB_WAIT MB_TRYWAIT /* * Mbuf to Malloc Flag Conversion. */ -#define MBTOM(how) ((how) & M_TRYWAIT ? M_WAITOK : M_NOWAIT) +#define MBTOM(how) ((how) & MB_TRYWAIT ? M_WAITOK : M_NOWAIT) /* Freelists: * @@ -404,7 +404,7 @@ union mcluster { /* * 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 M_DONTWAIT and allocation fails, the original mbuf chain + * If how is MB_DONTWAIT and allocation fails, the original mbuf chain * is freed and m is set to NULL. */ #define M_PREPEND(m, plen, how) do { \ @@ -439,7 +439,7 @@ union mcluster { #define M_COPYALL 1000000000 /* Compatibility with 4.3 */ -#define m_copy(m, o, l) m_copym((m), (o), (l), M_DONTWAIT) +#define m_copy(m, o, l) m_copym((m), (o), (l), MB_DONTWAIT) #ifdef _KERNEL extern u_int m_clalloc_wid; /* mbuf cluster wait count */ diff --git a/sys/vfs/nfs/bootp_subr.c b/sys/vfs/nfs/bootp_subr.c index 44cc795041..5e89bb73b3 100644 --- a/sys/vfs/nfs/bootp_subr.c +++ b/sys/vfs/nfs/bootp_subr.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/nfs/bootp_subr.c,v 1.20.2.9 2003/04/24 16:51:08 ambrisko Exp $ */ -/* $DragonFly: src/sys/vfs/nfs/bootp_subr.c,v 1.8 2004/04/19 16:33:49 cpressey Exp $ */ +/* $DragonFly: src/sys/vfs/nfs/bootp_subr.c,v 1.9 2004/06/02 14:43:04 eirikn Exp $ */ /* * Copyright (c) 1995 Gordon Ross, Adam Glass @@ -1971,7 +1971,7 @@ md_lookup_swap(struct sockaddr_in *mdsin, /* mountd server address */ u_int32_t v3[21]; } fattribs; - m = m_get(M_WAIT,MT_DATA); + m = m_get(MB_WAIT,MT_DATA); if (m == NULL) return ENOBUFS; diff --git a/sys/vfs/nfs/krpc_subr.c b/sys/vfs/nfs/krpc_subr.c index ce9eddeb71..876adfa2f5 100644 --- a/sys/vfs/nfs/krpc_subr.c +++ b/sys/vfs/nfs/krpc_subr.c @@ -1,6 +1,6 @@ /* $NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $ */ /* $FreeBSD: src/sys/nfs/krpc_subr.c,v 1.13.2.1 2000/11/20 21:17:14 tegge Exp $ */ -/* $DragonFly: src/sys/vfs/nfs/krpc_subr.c,v 1.5 2004/04/19 16:33:49 cpressey Exp $ */ +/* $DragonFly: src/sys/vfs/nfs/krpc_subr.c,v 1.6 2004/06/02 14:43:04 eirikn Exp $ */ /* * Copyright (c) 1995 Gordon Ross, Adam Glass @@ -149,7 +149,7 @@ krpc_portmap(struct sockaddr_in *sin, /* server address */ return 0; } - m = m_get(M_WAIT, MT_DATA); + m = m_get(MB_WAIT, MT_DATA); if (m == NULL) return ENOBUFS; sdata = mtod(m, struct sdata *); @@ -273,7 +273,7 @@ krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func, /* * Prepend RPC message header. */ - mhead = m_gethdr(M_WAIT, MT_DATA); + mhead = m_gethdr(MB_WAIT, MT_DATA); mhead->m_next = *data; call = mtod(mhead, struct rpc_call *); mhead->m_len = sizeof(*call); @@ -313,7 +313,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, M_WAIT); + m = m_copym(mhead, 0, M_COPYALL, MB_WAIT); if (m == NULL) { error = ENOBUFS; goto out; @@ -467,9 +467,9 @@ xdr_string_encode(char *str, int len) if (mlen > MCLBYTES) /* If too big, we just can't do it. */ return (NULL); - m = m_get(M_WAIT, MT_DATA); + m = m_get(MB_WAIT, MT_DATA); if (mlen > MLEN) { - MCLGET(m, M_WAIT); + MCLGET(m, MB_WAIT); if ((m->m_flags & M_EXT) == 0) { (void) m_free(m); /* There can be only one. */ return (NULL); diff --git a/sys/vfs/nfs/nfs_nqlease.c b/sys/vfs/nfs/nfs_nqlease.c index 50d162a8f8..5d2f0073b9 100644 --- a/sys/vfs/nfs/nfs_nqlease.c +++ b/sys/vfs/nfs/nfs_nqlease.c @@ -35,7 +35,7 @@ * * @(#)nfs_nqlease.c 8.9 (Berkeley) 5/20/95 * $FreeBSD: src/sys/nfs/nfs_nqlease.c,v 1.50 2000/02/13 03:32:05 peter Exp $ - * $DragonFly: src/sys/vfs/nfs/Attic/nfs_nqlease.c,v 1.15 2004/04/19 16:33:49 cpressey Exp $ + * $DragonFly: src/sys/vfs/nfs/Attic/nfs_nqlease.c,v 1.16 2004/06/02 14:43:04 eirikn Exp $ */ @@ -532,7 +532,7 @@ nqsrv_send_eviction(struct vnode *vp, struct nqlease *lp, * Record Mark. */ if (sotype == SOCK_STREAM) { - M_PREPEND(m, NFSX_UNSIGNED, M_WAIT); + M_PREPEND(m, NFSX_UNSIGNED, MB_WAIT); /* XXX-MBUF */ printf("nfs_nqlease: M_PREPEND failed\n"); *mtod(m, u_int32_t *) = htonl(0x80000000 | @@ -901,7 +901,7 @@ nqnfs_vacated(struct vnode *vp, struct ucred *cred) RPCAUTH_UNIX, 5 * NFSX_UNSIGNED, (char *)0, 0, (char *)NULL, mreq, i, &mheadend, &xid); if (nmp->nm_sotype == SOCK_STREAM) { - M_PREPEND(m, NFSX_UNSIGNED, M_WAIT); + M_PREPEND(m, NFSX_UNSIGNED, MB_WAIT); if (m == NULL) return (ENOBUFS); *mtod(m, u_int32_t *) = htonl(0x80000000 | (m->m_pkthdr.len - diff --git a/sys/vfs/nfs/nfs_serv.c b/sys/vfs/nfs/nfs_serv.c index e6cb06c026..eba28e8ce5 100644 --- a/sys/vfs/nfs/nfs_serv.c +++ b/sys/vfs/nfs/nfs_serv.c @@ -35,7 +35,7 @@ * * @(#)nfs_serv.c 8.8 (Berkeley) 7/31/95 * $FreeBSD: src/sys/nfs/nfs_serv.c,v 1.93.2.6 2002/12/29 18:19:53 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_serv.c,v 1.15 2004/04/24 04:32:04 drhodus Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_serv.c,v 1.16 2004/06/02 14:43:04 eirikn Exp $ */ /* @@ -667,8 +667,8 @@ nfsrv_readlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, len = 0; i = 0; while (len < NFS_MAXPATHLEN) { - MGET(mp, M_WAIT, MT_DATA); - MCLGET(mp, M_WAIT); + MGET(mp, MB_WAIT, MT_DATA); + MCLGET(mp, MB_WAIT); mp->m_len = NFSMSIZ(mp); if (len == 0) mp3 = mp2 = mp; @@ -915,8 +915,8 @@ nfsrv_read(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, i++; } if (left > 0) { - MGET(m, M_WAIT, MT_DATA); - MCLGET(m, M_WAIT); + MGET(m, MB_WAIT, MT_DATA); + MCLGET(m, MB_WAIT); 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 7a0f534764..aa610ffa4a 100644 --- a/sys/vfs/nfs/nfs_socket.c +++ b/sys/vfs/nfs/nfs_socket.c @@ -35,7 +35,7 @@ * * @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95 * $FreeBSD: src/sys/nfs/nfs_socket.c,v 1.60.2.6 2003/03/26 01:44:46 alfred Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_socket.c,v 1.16 2004/04/19 16:33:49 cpressey Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_socket.c,v 1.17 2004/06/02 14:43:04 eirikn Exp $ */ /* @@ -582,7 +582,7 @@ tryagain: goto tryagain; } while (rep->r_flags & R_MUSTRESEND) { - m = m_copym(rep->r_mreq, 0, M_COPYALL, M_WAIT); + m = m_copym(rep->r_mreq, 0, M_COPYALL, MB_WAIT); nfsstats.rpcretries++; error = nfs_send(so, rep->r_nmp->nm_nam, m, rep); if (error) { @@ -1002,7 +1002,7 @@ kerbauth: * For stream protocols, insert a Sun RPC Record Mark. */ if (nmp->nm_sotype == SOCK_STREAM) { - M_PREPEND(m, NFSX_UNSIGNED, M_WAIT); + M_PREPEND(m, NFSX_UNSIGNED, MB_WAIT); if (m == NULL) return (ENOBUFS); *mtod(m, u_int32_t *) = htonl(0x80000000 | @@ -1052,7 +1052,7 @@ tryagain: if (nmp->nm_soflags & PR_CONNREQUIRED) error = nfs_sndlock(rep); if (!error) { - m2 = m_copym(m, 0, M_COPYALL, M_WAIT); + m2 = m_copym(m, 0, M_COPYALL, MB_WAIT); error = nfs_send(nmp->nm_so, nmp->nm_nam, m2, rep); if (nmp->nm_soflags & PR_CONNREQUIRED) nfs_sndunlock(rep); @@ -1226,7 +1226,7 @@ nfs_rephead(int siz, struct nfsrv_descript *nd, struct nfssvc_sock *slp, caddr_t bpos; struct mbuf *mb, *mb2; - MGETHDR(mreq, M_WAIT, MT_DATA); + MGETHDR(mreq, MB_WAIT, MT_DATA); mb = mreq; /* * If this is a big reply, use a cluster else @@ -1234,7 +1234,7 @@ nfs_rephead(int siz, struct nfsrv_descript *nd, struct nfssvc_sock *slp, */ siz += RPC_REPLYSIZ; if ((max_hdr + siz) >= MINCLSIZE) { - MCLGET(mreq, M_WAIT); + MCLGET(mreq, MB_WAIT); } else mreq->m_data += max_hdr; tl = mtod(mreq, u_int32_t *); @@ -1437,7 +1437,7 @@ nfs_timer(void *arg /* never used */) ((nmp->nm_flag & NFSMNT_DUMBTIMR) || (rep->r_flags & R_SENT) || nmp->nm_sent < nmp->nm_cwnd) && - (m = m_copym(rep->r_mreq, 0, M_COPYALL, M_DONTWAIT))){ + (m = m_copym(rep->r_mreq, 0, M_COPYALL, MB_DONTWAIT))){ if ((nmp->nm_flag & NFSMNT_NOCONN) == 0) error = so_pru_send(so, 0, m, (struct sockaddr *)0, (struct mbuf *)0, td); @@ -1749,9 +1749,9 @@ nfs_realign(struct mbuf **pm, int hsiz) while ((m = *pm) != NULL) { if ((m->m_len & 0x3) || (mtod(m, intptr_t) & 0x3)) { - MGET(n, M_WAIT, MT_DATA); + MGET(n, MB_WAIT, MT_DATA); if (m->m_len >= MINCLSIZE) { - MCLGET(n, M_WAIT); + MCLGET(n, MB_WAIT); } n->m_len = 0; break; @@ -2048,7 +2048,7 @@ nfs_msg(struct thread *td, char *server, char *msg) * Socket upcall routine for the nfsd sockets. * The caddr_t arg is a pointer to the "struct nfssvc_sock". * Essentially do as much as possible non-blocking, else punt and it will - * be called with M_WAIT from an nfsd. + * be called with MB_WAIT from an nfsd. */ void nfsrv_rcv(struct socket *so, void *arg, int waitflag) @@ -2066,7 +2066,7 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag) /* * Define this to test for nfsds handling this under heavy load. */ - if (waitflag == M_DONTWAIT) { + if (waitflag == MB_DONTWAIT) { slp->ns_flag |= SLP_NEEDQ; goto dorecs; } #endif @@ -2077,7 +2077,7 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag) * to an nfsd so that there is feedback to the TCP layer that * the nfs servers are heavily loaded. */ - if (STAILQ_FIRST(&slp->ns_rec) && waitflag == M_DONTWAIT) { + if (STAILQ_FIRST(&slp->ns_rec) && waitflag == MB_DONTWAIT) { slp->ns_flag |= SLP_NEEDQ; goto dorecs; } @@ -2125,7 +2125,7 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag) &flags); if (mp) { struct nfsrv_rec *rec; - int mf = (waitflag & M_DONTWAIT) ? + int mf = (waitflag & MB_DONTWAIT) ? M_NOWAIT : M_WAITOK; rec = malloc(sizeof(struct nfsrv_rec), M_NFSRVDESC, mf); @@ -2154,7 +2154,7 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag) * Now try and process the request records, non-blocking. */ dorecs: - if (waitflag == M_DONTWAIT && + if (waitflag == MB_DONTWAIT && (STAILQ_FIRST(&slp->ns_rec) || (slp->ns_flag & (SLP_NEEDQ | SLP_DISCONN)))) nfsrv_wakenfsd(slp); @@ -2276,7 +2276,7 @@ nfsrv_getstream(struct nfssvc_sock *slp, int waitflag) *mpp = recm; if (slp->ns_flag & SLP_LASTFRAG) { struct nfsrv_rec *rec; - int mf = (waitflag & M_DONTWAIT) ? M_NOWAIT : M_WAITOK; + int mf = (waitflag & MB_DONTWAIT) ? M_NOWAIT : M_WAITOK; rec = malloc(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 69f85f1675..059a4e7b5e 100644 --- a/sys/vfs/nfs/nfs_srvcache.c +++ b/sys/vfs/nfs/nfs_srvcache.c @@ -35,7 +35,7 @@ * * @(#)nfs_srvcache.c 8.3 (Berkeley) 3/30/95 * $FreeBSD: src/sys/nfs/nfs_srvcache.c,v 1.21 2000/02/13 03:32:06 peter Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_srvcache.c,v 1.6 2004/04/19 16:33:49 cpressey Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_srvcache.c,v 1.7 2004/06/02 14:43:04 eirikn Exp $ */ /* @@ -200,7 +200,7 @@ loop: } else if (rp->rc_flag & RC_REPMBUF) { nfsstats.srvcache_nonidemdonehits++; *repp = m_copym(rp->rc_reply, 0, M_COPYALL, - M_WAIT); + MB_WAIT); ret = RC_REPLY; } else { nfsstats.srvcache_idemdonehits++; @@ -310,7 +310,7 @@ loop: rp->rc_flag |= RC_REPSTATUS; } else { rp->rc_reply = m_copym(repmbuf, - 0, M_COPYALL, M_WAIT); + 0, M_COPYALL, MB_WAIT); rp->rc_flag |= RC_REPMBUF; } } diff --git a/sys/vfs/nfs/nfs_subs.c b/sys/vfs/nfs/nfs_subs.c index f07f7dcf96..3da6fd7543 100644 --- a/sys/vfs/nfs/nfs_subs.c +++ b/sys/vfs/nfs/nfs_subs.c @@ -35,7 +35,7 @@ * * @(#)nfs_subs.c 8.8 (Berkeley) 5/22/95 * $FreeBSD: /repoman/r/ncvs/src/sys/nfsclient/nfs_subs.c,v 1.128 2004/04/14 23:23:55 peadar Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_subs.c,v 1.17 2004/05/19 22:53:05 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_subs.c,v 1.18 2004/06/02 14:43:04 eirikn Exp $ */ /* @@ -587,9 +587,9 @@ nfsm_reqh(struct vnode *vp, u_long procid, int hsiz, caddr_t *bposp) struct nfsmount *nmp; int nqflag; - MGET(mb, M_WAIT, MT_DATA); + MGET(mb, MB_WAIT, MT_DATA); if (hsiz >= MINCLSIZE) - MCLGET(mb, M_WAIT); + MCLGET(mb, MB_WAIT); mb->m_len = 0; bpos = mtod(mb, caddr_t); @@ -635,9 +635,9 @@ nfsm_rpchead(struct ucred *cr, int nmflag, int procid, int auth_type, int siz, grpsiz, authsiz; authsiz = nfsm_rndup(auth_len); - MGETHDR(mb, M_WAIT, MT_DATA); + MGETHDR(mb, MB_WAIT, MT_DATA); if ((authsiz + 10 * NFSX_UNSIGNED) >= MINCLSIZE) { - MCLGET(mb, M_WAIT); + MCLGET(mb, MB_WAIT); } else if ((authsiz + 10 * NFSX_UNSIGNED) < MHLEN) { MH_ALIGN(mb, authsiz + 10 * NFSX_UNSIGNED); } else { @@ -700,9 +700,9 @@ nfsm_rpchead(struct ucred *cr, int nmflag, int procid, int auth_type, siz = auth_len; while (siz > 0) { if (M_TRAILINGSPACE(mb) == 0) { - MGET(mb2, M_WAIT, MT_DATA); + MGET(mb2, MB_WAIT, MT_DATA); if (siz >= MINCLSIZE) - MCLGET(mb2, M_WAIT); + MCLGET(mb2, MB_WAIT); mb->m_next = mb2; mb = mb2; mb->m_len = 0; @@ -733,9 +733,9 @@ nfsm_rpchead(struct ucred *cr, int nmflag, int procid, int auth_type, siz = verf_len; while (siz > 0) { if (M_TRAILINGSPACE(mb) == 0) { - MGET(mb2, M_WAIT, MT_DATA); + MGET(mb2, MB_WAIT, MT_DATA); if (siz >= MINCLSIZE) - MCLGET(mb2, M_WAIT); + MCLGET(mb2, MB_WAIT); mb->m_next = mb2; mb = mb2; mb->m_len = 0; @@ -868,9 +868,9 @@ nfsm_uiotombuf(struct uio *uiop, struct mbuf **mq, int siz, caddr_t *bpos) while (left > 0) { mlen = M_TRAILINGSPACE(mp); if (mlen == 0) { - MGET(mp, M_WAIT, MT_DATA); + MGET(mp, MB_WAIT, MT_DATA); if (clflg) - MCLGET(mp, M_WAIT); + MCLGET(mp, MB_WAIT); mp->m_len = 0; mp2->m_next = mp; mp2 = mp; @@ -900,7 +900,7 @@ nfsm_uiotombuf(struct uio *uiop, struct mbuf **mq, int siz, caddr_t *bpos) } if (rem > 0) { if (rem > M_TRAILINGSPACE(mp)) { - MGET(mp, M_WAIT, MT_DATA); + MGET(mp, MB_WAIT, MT_DATA); mp->m_len = 0; mp2->m_next = mp; } @@ -944,7 +944,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, M_WAIT, MT_DATA); + MGET(mp2, MB_WAIT, MT_DATA); mp2->m_next = mp->m_next; mp->m_next = mp2; mp->m_len -= left; @@ -1029,9 +1029,9 @@ nfsm_strtmbuf(struct mbuf **mb, char **bpos, const char *cp, long siz) } /* Loop around adding mbufs */ while (siz > 0) { - MGET(m1, M_WAIT, MT_DATA); + MGET(m1, MB_WAIT, MT_DATA); if (siz > MLEN) - MCLGET(m1, M_WAIT); + MCLGET(m1, MB_WAIT); m1->m_len = NFSMSIZ(m1); m2->m_next = m1; m2 = m1; diff --git a/sys/vfs/nfs/nfs_syscalls.c b/sys/vfs/nfs/nfs_syscalls.c index b2ae097b3a..d081a5c817 100644 --- a/sys/vfs/nfs/nfs_syscalls.c +++ b/sys/vfs/nfs/nfs_syscalls.c @@ -35,7 +35,7 @@ * * @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95 * $FreeBSD: src/sys/nfs/nfs_syscalls.c,v 1.58.2.1 2000/11/26 02:30:06 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_syscalls.c,v 1.15 2004/04/19 16:33:49 cpressey Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_syscalls.c,v 1.16 2004/06/02 14:43:04 eirikn Exp $ */ #include @@ -488,7 +488,7 @@ nfssvc_nfsd(struct nfsd_srvargs *nsd, caddr_t argp, struct thread *td) slp->ns_flag &= ~SLP_NEEDQ; (void) nfs_slplock(slp, 1); nfsrv_rcv(slp->ns_so, (caddr_t)slp, - M_WAIT); + MB_WAIT); nfs_slpunlock(slp); } error = nfsrv_dorec(slp, nfsd, &nd); @@ -640,7 +640,7 @@ nfssvc_nfsd(struct nfsd_srvargs *nsd, caddr_t argp, struct thread *td) * Record Mark. */ if (sotype == SOCK_STREAM) { - M_PREPEND(m, NFSX_UNSIGNED, M_WAIT); + M_PREPEND(m, NFSX_UNSIGNED, MB_WAIT); if (m == NULL) return (ENOBUFS); *mtod(m, u_int32_t *) = htonl(0x80000000 | siz); diff --git a/sys/vfs/nfs/nfsm_subs.h b/sys/vfs/nfs/nfsm_subs.h index 922751fd9b..7483e70eba 100644 --- a/sys/vfs/nfs/nfsm_subs.h +++ b/sys/vfs/nfs/nfsm_subs.h @@ -35,7 +35,7 @@ * * @(#)nfsm_subs.h 8.2 (Berkeley) 3/30/95 * $FreeBSD: src/sys/nfs/nfsm_subs.h,v 1.27.2.1 2000/10/28 16:27:27 dwmalone Exp $ - * $DragonFly: src/sys/vfs/nfs/nfsm_subs.h,v 1.5 2003/11/15 21:05:44 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfsm_subs.h,v 1.6 2004/06/02 14:43:04 eirikn Exp $ */ @@ -95,7 +95,7 @@ struct mbuf *nfsm_rpchead (struct ucred *cr, int nmflag, int procid, #define nfsm_build(a,c,s) \ do { \ if ((s) > M_TRAILINGSPACE(mb)) { \ - MGET(mb2, M_WAIT, MT_DATA); \ + MGET(mb2, MB_WAIT, MT_DATA); \ if ((s) > MLEN) \ panic("build > MLEN"); \ mb->m_next = mb2; \ @@ -486,8 +486,8 @@ struct mbuf *nfsm_rpchead (struct ucred *cr, int nmflag, int procid, if (bp >= be) { \ if (mp == mb) \ mp->m_len += bp-bpos; \ - MGET(mp, M_WAIT, MT_DATA); \ - MCLGET(mp, M_WAIT); \ + MGET(mp, MB_WAIT, MT_DATA); \ + MCLGET(mp, MB_WAIT); \ mp->m_len = NFSMSIZ(mp); \ mp2->m_next = mp; \ mp2 = mp; \ -- 2.41.0