Author: glebius
Date: Wed Dec 5 08:04:20 2012
New Revision: 243882
URL: http://svnweb.freebsd.org/changeset/base/243882
Log:
Mechanically substitute flags from historic mbuf allocator with
malloc(9) flags within sys.
Exceptions:
- sys/contrib not touched
- sys/mbuf.h edited manually
Modified:
head/sys/arm/at91/if_ate.c
head/sys/arm/at91/if_macb.c
head/sys/arm/econa/if_ece.c
head/sys/arm/lpc/if_lpe.c
head/sys/arm/ti/cpsw/if_cpsw.c
head/sys/arm/xscale/ixp425/if_npe.c
head/sys/compat/linux/linux_socket.c
head/sys/compat/ndis/kern_ndis.c
head/sys/fs/nfs/nfs_commonsubs.c
head/sys/fs/nfs/nfsm_subs.h
head/sys/fs/nfsclient/nfs_clcomsubs.c
head/sys/fs/nfsserver/nfs_nfsdcache.c
head/sys/fs/nfsserver/nfs_nfsdport.c
head/sys/fs/nfsserver/nfs_nfsdstate.c
head/sys/kern/subr_mchain.c
head/sys/kern/uipc_mbuf.c
head/sys/kern/uipc_mbuf2.c
head/sys/kern/uipc_sockbuf.c
head/sys/kern/uipc_socket.c
head/sys/kern/uipc_syscalls.c
head/sys/mips/adm5120/if_admsw.c
head/sys/mips/atheros/if_arge.c
head/sys/mips/cavium/if_octm.c
head/sys/mips/cavium/octe/ethernet-mem.c
head/sys/mips/cavium/octe/ethernet-rx.c
head/sys/mips/idt/if_kr.c
head/sys/mips/nlm/dev/net/xlpge.c
head/sys/mips/rmi/dev/nlge/if_nlge.c
head/sys/mips/rmi/dev/xlr/rge.c
head/sys/net/bpf.c
head/sys/net/bridgestp.c
head/sys/net/ieee8023ad_lacp.c
head/sys/net/if_arcsubr.c
head/sys/net/if_atmsubr.c
head/sys/net/if_bridge.c
head/sys/net/if_ef.c
head/sys/net/if_ethersubr.c
head/sys/net/if_fddisubr.c
head/sys/net/if_fwsubr.c
head/sys/net/if_gre.c
head/sys/net/if_iso88025subr.c
head/sys/net/if_spppfr.c
head/sys/net/if_spppsubr.c
head/sys/net/if_stf.c
head/sys/net/if_tap.c
head/sys/net/if_tun.c
head/sys/net/rtsock.c
head/sys/net80211/ieee80211_freebsd.c
head/sys/net80211/ieee80211_hostap.c
head/sys/net80211/ieee80211_hwmp.c
head/sys/net80211/ieee80211_input.c
head/sys/net80211/ieee80211_mesh.c
head/sys/net80211/ieee80211_output.c
head/sys/net80211/ieee80211_superg.c
head/sys/net80211/ieee80211_wds.c
head/sys/netatalk/aarp.c
head/sys/netatalk/ddp_output.c
head/sys/netgraph/atm/ccatm/ng_ccatm.c
head/sys/netgraph/atm/ng_atm.c
head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
head/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
head/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
head/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
head/sys/netgraph/bluetooth/hci/ng_hci_misc.c
head/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
head/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
head/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
head/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
head/sys/netgraph/netflow/netflow.c
head/sys/netgraph/netflow/netflow_v9.c
head/sys/netgraph/ng_UI.c
head/sys/netgraph/ng_atmllc.c
head/sys/netgraph/ng_bridge.c
head/sys/netgraph/ng_cisco.c
head/sys/netgraph/ng_deflate.c
head/sys/netgraph/ng_device.c
head/sys/netgraph/ng_frame_relay.c
head/sys/netgraph/ng_gif.c
head/sys/netgraph/ng_gif_demux.c
head/sys/netgraph/ng_hub.c
head/sys/netgraph/ng_iface.c
head/sys/netgraph/ng_ipfw.c
head/sys/netgraph/ng_l2tp.c
head/sys/netgraph/ng_lmi.c
head/sys/netgraph/ng_mppc.c
head/sys/netgraph/ng_one2many.c
head/sys/netgraph/ng_ppp.c
head/sys/netgraph/ng_pppoe.c
head/sys/netgraph/ng_pptpgre.c
head/sys/netgraph/ng_pred1.c
head/sys/netgraph/ng_rfc1490.c
head/sys/netgraph/ng_source.c
head/sys/netgraph/ng_tee.c
head/sys/netgraph/ng_tty.c
head/sys/netgraph/ng_vjc.c
head/sys/netgraph/ng_vlan.c
head/sys/netinet/if_ether.c
head/sys/netinet/igmp.c
head/sys/netinet/in_gif.c
head/sys/netinet/ip_icmp.c
head/sys/netinet/ip_input.c
head/sys/netinet/ip_mroute.c
head/sys/netinet/ip_options.c
head/sys/netinet/ip_output.c
head/sys/netinet/libalias/alias.c
head/sys/netinet/raw_ip.c
head/sys/netinet/sctp_asconf.c
head/sys/netinet/sctp_auth.c
head/sys/netinet/sctp_indata.c
head/sys/netinet/sctp_input.c
head/sys/netinet/sctp_output.c
head/sys/netinet/sctp_pcb.c
head/sys/netinet/sctp_timer.c
head/sys/netinet/sctp_usrreq.c
head/sys/netinet/sctputil.c
head/sys/netinet/tcp_output.c
head/sys/netinet/tcp_subr.c
head/sys/netinet/tcp_syncache.c
head/sys/netinet/tcp_timewait.c
head/sys/netinet/udp_usrreq.c
head/sys/netinet6/frag6.c
head/sys/netinet6/icmp6.c
head/sys/netinet6/in6_gif.c
head/sys/netinet6/ip6_input.c
head/sys/netinet6/ip6_mroute.c
head/sys/netinet6/ip6_output.c
head/sys/netinet6/mld6.c
head/sys/netinet6/nd6_nbr.c
head/sys/netinet6/raw_ip6.c
head/sys/netinet6/udp6_usrreq.c
head/sys/netipsec/ipsec_mbuf.c
head/sys/netipsec/ipsec_output.c
head/sys/netipsec/key.c
head/sys/netipsec/keysock.c
head/sys/netipsec/xform_ipip.c
head/sys/netipx/ipx_outputfl.c
head/sys/netipx/ipx_usrreq.c
head/sys/netipx/spx_reass.c
head/sys/netipx/spx_usrreq.c
head/sys/netnatm/natm.c
head/sys/netncp/ncp_sock.c
head/sys/netpfil/ipfw/ip_dn_glue.c
head/sys/netpfil/ipfw/ip_fw_dynamic.c
head/sys/netpfil/ipfw/ip_fw_pfil.c
head/sys/netsmb/smb_iod.c
head/sys/netsmb/smb_rq.c
head/sys/netsmb/smb_trantcp.c
head/sys/nfs/krpc_subr.c
head/sys/nfs/nfs_common.c
head/sys/nfsclient/nfs_krpc.c
head/sys/nfsclient/nfs_subs.c
head/sys/nfsserver/nfs_fha.c
head/sys/nfsserver/nfs_serv.c
head/sys/nfsserver/nfs_srvkrpc.c
head/sys/nfsserver/nfs_srvsubs.c
head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c
head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c
head/sys/ofed/drivers/net/mlx4/en_tx.c
head/sys/pci/if_rl.c
head/sys/powerpc/ps3/if_glc.c
head/sys/rpc/clnt_dg.c
head/sys/rpc/clnt_vc.c
head/sys/rpc/rpc_generic.c
head/sys/rpc/rpcm_subs.h
head/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c
head/sys/rpc/svc.c
head/sys/rpc/svc_dg.c
head/sys/rpc/svc_vc.c
head/sys/sys/mbuf.h
Modified: head/sys/arm/at91/if_ate.c
==============================================================================
--- head/sys/arm/at91/if_ate.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/arm/at91/if_ate.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -901,9 +901,9 @@ ate_intr(void *xsc)
/* Get an appropriately sized mbuf */
if (remain + ETHER_ALIGN >= MINCLSIZE)
- mb = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ mb = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
else
- MGETHDR(mb, M_DONTWAIT, MT_DATA);
+ MGETHDR(mb, M_NOWAIT, MT_DATA);
if (mb == NULL) {
sc->ifp->if_iqdrops++;
@@ -1135,7 +1135,7 @@ atestart_locked(struct ifnet *ifp)
e = bus_dmamap_load_mbuf_sg(sc->mtag, sc->tx_map[sc->txhead], m,
segs, &nseg, 0);
if (e == EFBIG) {
- mdefrag = m_defrag(m, M_DONTWAIT);
+ mdefrag = m_defrag(m, M_NOWAIT);
if (mdefrag == NULL) {
IFQ_DRV_PREPEND(&ifp->if_snd, m);
return;
Modified: head/sys/arm/at91/if_macb.c
==============================================================================
--- head/sys/arm/at91/if_macb.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/arm/at91/if_macb.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -435,7 +435,7 @@ macb_new_rxbuf(struct macb_softc *sc, in
bus_dma_segment_t seg[1];
int error, nsegs;
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL)
return (ENOBUFS);
m->m_len = m->m_pkthdr.len = MCLBYTES - ETHER_ALIGN;
@@ -878,7 +878,7 @@ macb_encap(struct macb_softc *sc, struct
error = bus_dmamap_load_mbuf_sg(sc->dmatag_ring_tx, txd->dmamap,
*m_head, segs, &nsegs, 0);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, MAX_FRAGMENT);
+ m = m_collapse(*m_head, M_NOWAIT, MAX_FRAGMENT);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
@@ -973,7 +973,7 @@ macbstart_locked(struct ifnet *ifp)
#if 0
if (m0->m_next != NULL) {
/* Fragmented mbuf chain, collapse it. */
- m_new = m_defrag(m0, M_DONTWAIT);
+ m_new = m_defrag(m0, M_NOWAIT);
if (m_new != NULL) {
/* Original frame freed. */
m0 = m_new;
Modified: head/sys/arm/econa/if_ece.c
==============================================================================
--- head/sys/arm/econa/if_ece.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/arm/econa/if_ece.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -714,7 +714,7 @@ ece_new_rxbuf(struct ece_softc *sc, stru
tag = sc->dmatag_ring_rx;
- new_mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ new_mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (new_mbuf == NULL)
return (ENOBUFS);
Modified: head/sys/arm/lpc/if_lpe.c
==============================================================================
--- head/sys/arm/lpc/if_lpe.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/arm/lpc/if_lpe.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -1122,7 +1122,7 @@ lpe_init_rxbuf(struct lpe_softc *sc, int
rxd = &sc->lpe_cdata.lpe_rx_desc[n];
hwd = &sc->lpe_rdata.lpe_rx_ring[n];
hws = &sc->lpe_rdata.lpe_rx_status[n];
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (!m) {
device_printf(sc->lpe_dev, "WARNING: mbufs exhausted!\n");
Modified: head/sys/arm/ti/cpsw/if_cpsw.c
==============================================================================
--- head/sys/arm/ti/cpsw/if_cpsw.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/arm/ti/cpsw/if_cpsw.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -625,7 +625,7 @@ cpsw_pad(struct mbuf *m)
;
if (!(M_WRITABLE(last) && M_TRAILINGSPACE(last) >= padlen)) {
/* Allocate new empty mbuf, pad it. Compact later. */
- MGET(n, M_DONTWAIT, MT_DATA);
+ MGET(n, M_NOWAIT, MT_DATA);
if (n == NULL)
return (ENOBUFS);
n->m_len = 0;
Modified: head/sys/arm/xscale/ixp425/if_npe.c
==============================================================================
--- head/sys/arm/xscale/ixp425/if_npe.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/arm/xscale/ixp425/if_npe.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -1064,7 +1064,7 @@ npe_rxbuf_init(struct npe_softc *sc, str
int error, nseg;
if (m == NULL) {
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL)
return ENOBUFS;
}
@@ -1120,7 +1120,7 @@ npe_rxdone(int qid, void *arg)
* data up the stack and replace it with the newly
* allocated one.
*/
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m != NULL) {
struct mbuf *mrx = npe->ix_m;
struct npehwbuf *hw = npe->ix_hw;
@@ -1316,7 +1316,7 @@ npestart_locked(struct ifnet *ifp)
error = bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map,
m, segs, &nseg, 0);
if (error == EFBIG) {
- n = m_collapse(m, M_DONTWAIT, NPE_MAXSEG);
+ n = m_collapse(m, M_NOWAIT, NPE_MAXSEG);
if (n == NULL) {
if_printf(ifp, "%s: too many fragments %u\n",
__func__, nseg);
Modified: head/sys/compat/linux/linux_socket.c
==============================================================================
--- head/sys/compat/linux/linux_socket.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/compat/linux/linux_socket.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -1173,7 +1173,7 @@ linux_sendmsg(struct thread *td, struct
error = ENOBUFS;
cmsg = malloc(CMSG_HDRSZ, M_TEMP, M_WAITOK | M_ZERO);
- control = m_get(M_WAIT, MT_CONTROL);
+ control = m_get(M_WAITOK, MT_CONTROL);
if (control == NULL)
goto bad;
Modified: head/sys/compat/ndis/kern_ndis.c
==============================================================================
--- head/sys/compat/ndis/kern_ndis.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/compat/ndis/kern_ndis.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -657,12 +657,12 @@ ndis_ptom(m0, p)
for (buf = priv->npp_head; buf != NULL; buf = buf->mdl_next) {
if (buf == priv->npp_head)
#ifdef MT_HEADER
- MGETHDR(m, M_DONTWAIT, MT_HEADER);
+ MGETHDR(m, M_NOWAIT, MT_HEADER);
#else
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
#endif
else
- MGET(m, M_DONTWAIT, MT_DATA);
+ MGET(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
m_freem(*m0);
*m0 = NULL;
Modified: head/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonsubs.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/fs/nfs/nfs_commonsubs.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -382,7 +382,7 @@ nfsm_strtom(struct nfsrv_descript *nd, c
while (siz > 0) {
if (left == 0) {
if (siz > ncl_mbuf_mlen)
- NFSMCLGET(m1, M_WAIT);
+ NFSMCLGET(m1, M_WAITOK);
else
NFSMGET(m1);
mbuf_setlen(m1, 0);
@@ -3455,7 +3455,7 @@ nfsrvd_rephead(struct nfsrv_descript *nd
*/
if ((nd->nd_flag & ND_GSSINITREPLY) == 0 &&
nfs_bigreply[nd->nd_procnum]) {
- NFSMCLGET(mreq, M_WAIT);
+ NFSMCLGET(mreq, M_WAITOK);
nd->nd_mreq = mreq;
nd->nd_mb = mreq;
} else {
Modified: head/sys/fs/nfs/nfsm_subs.h
==============================================================================
--- head/sys/fs/nfs/nfsm_subs.h Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/fs/nfs/nfsm_subs.h Wed Dec 5 08:04:20 2012 (r243882)
@@ -73,7 +73,7 @@ nfsm_build(struct nfsrv_descript *nd, in
struct mbuf *mb2;
if (siz > M_TRAILINGSPACE(nd->nd_mb)) {
- NFSMCLGET(mb2, M_DONTWAIT);
+ NFSMCLGET(mb2, M_NOWAIT);
if (siz > MLEN)
panic("build > MLEN");
mbuf_setlen(mb2, 0);
Modified: head/sys/fs/nfsclient/nfs_clcomsubs.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clcomsubs.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/fs/nfsclient/nfs_clcomsubs.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -138,7 +138,7 @@ nfscl_reqstart(struct nfsrv_descript *nd
* Get the first mbuf for the request.
*/
if (nfs_bigrequest[procnum])
- NFSMCLGET(mb, M_WAIT);
+ NFSMCLGET(mb, M_WAITOK);
else
NFSMGET(mb);
mbuf_setlen(mb, 0);
@@ -212,7 +212,7 @@ nfsm_uiombuf(struct nfsrv_descript *nd,
mlen = M_TRAILINGSPACE(mp);
if (mlen == 0) {
if (clflg)
- NFSMCLGET(mp, M_WAIT);
+ NFSMCLGET(mp, M_WAITOK);
else
NFSMGET(mp);
mbuf_setlen(mp, 0);
Modified: head/sys/fs/nfsserver/nfs_nfsdcache.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdcache.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/fs/nfsserver/nfs_nfsdcache.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -364,7 +364,7 @@ loop:
newnfsstats.srvcache_nonidemdonehits++;
NFSUNLOCKCACHE();
nd->nd_mreq = m_copym(rp->rc_reply, 0,
- M_COPYALL, M_WAIT);
+ M_COPYALL, M_WAITOK);
ret = RC_REPLY;
rp->rc_timestamp = NFSD_MONOSEC +
NFSRVCACHE_UDPTIMEOUT;
@@ -437,7 +437,7 @@ nfsrvd_updatecache(struct nfsrv_descript
if (!(rp->rc_flag & RC_REPMBUF))
panic("reply from cache");
nd->nd_mreq = m_copym(rp->rc_reply, 0,
- M_COPYALL, M_WAIT);
+ M_COPYALL, M_WAITOK);
rp->rc_timestamp = NFSD_MONOSEC + NFSRVCACHE_TCPTIMEOUT;
nfsrc_unlock(rp);
goto out;
@@ -473,7 +473,7 @@ nfsrvd_updatecache(struct nfsrv_descript
nfsrc_tcpsavedreplies;
}
NFSUNLOCKCACHE();
- m = m_copym(nd->nd_mreq, 0, M_COPYALL, M_WAIT);
+ m = m_copym(nd->nd_mreq, 0, M_COPYALL, M_WAITOK);
NFSLOCKCACHE();
rp->rc_reply = m;
rp->rc_flag |= RC_REPMBUF;
@@ -654,7 +654,7 @@ tryagain:
nfsrc_marksametcpconn(rp->rc_sockref);
ret = RC_REPLY;
nd->nd_mreq = m_copym(rp->rc_reply, 0,
- M_COPYALL, M_WAIT);
+ M_COPYALL, M_WAITOK);
rp->rc_timestamp = NFSD_MONOSEC +
NFSRVCACHE_TCPTIMEOUT;
} else {
Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -565,7 +565,7 @@ nfsvno_readlink(struct vnode *vp, struct
i = 0;
while (len < NFS_MAXPATHLEN) {
NFSMGET(mp);
- MCLGET(mp, M_WAIT);
+ MCLGET(mp, M_WAITOK);
mp->m_len = NFSMSIZ(mp);
if (len == 0) {
mp3 = mp2 = mp;
@@ -635,7 +635,7 @@ nfsvno_read(struct vnode *vp, off_t off,
i = 0;
while (left > 0) {
NFSMGET(m);
- MCLGET(m, M_WAIT);
+ MCLGET(m, M_WAITOK);
m->m_len = 0;
siz = min(M_TRAILINGSPACE(m), left);
left -= siz;
Modified: head/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdstate.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/fs/nfsserver/nfs_nfsdstate.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -3726,7 +3726,7 @@ nfsrv_docallback(struct nfsclient *clp,
/*
* Get the first mbuf for the request.
*/
- MGET(m, M_WAIT, MT_DATA);
+ MGET(m, M_WAITOK, MT_DATA);
mbuf_setlen(m, 0);
nd->nd_mreq = nd->nd_mb = m;
nd->nd_bpos = NFSMTOD(m, caddr_t);
Modified: head/sys/kern/subr_mchain.c
==============================================================================
--- head/sys/kern/subr_mchain.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/kern/subr_mchain.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -59,7 +59,7 @@ mb_init(struct mbchain *mbp)
{
struct mbuf *m;
- m = m_gethdr(M_WAIT, MT_DATA);
+ m = m_gethdr(M_WAITOK, MT_DATA);
m->m_len = 0;
mb_initm(mbp, m);
return (0);
@@ -114,7 +114,7 @@ mb_reserve(struct mbchain *mbp, int size
panic("mb_reserve: size = %d\n", size);
m = mbp->mb_cur;
if (mbp->mb_mleft < size) {
- mn = m_get(M_WAIT, MT_DATA);
+ mn = m_get(M_WAITOK, MT_DATA);
mbp->mb_cur = m->m_next = mn;
m = mn;
m->m_len = 0;
@@ -205,7 +205,7 @@ mb_put_mem(struct mbchain *mbp, c_caddr_
while (size > 0) {
if (mleft == 0) {
if (m->m_next == NULL)
- m = m_getm(m, size, M_WAIT, MT_DATA);
+ m = m_getm(m, size, M_WAITOK, MT_DATA);
else
m = m->m_next;
mleft = M_TRAILINGSPACE(m);
@@ -307,7 +307,7 @@ md_init(struct mdchain *mdp)
{
struct mbuf *m;
- m = m_gethdr(M_WAIT, MT_DATA);
+ m = m_gethdr(M_WAITOK, MT_DATA);
m->m_len = 0;
md_initm(mdp, m);
return (0);
@@ -514,7 +514,7 @@ md_get_mbuf(struct mdchain *mdp, int siz
{
struct mbuf *m = mdp->md_cur, *rm;
- rm = m_copym(m, mdp->md_pos - mtod(m, u_char*), size, M_WAIT);
+ rm = m_copym(m, mdp->md_pos - mtod(m, u_char*), size, M_WAITOK);
md_get_mem(mdp, NULL, size, MB_MZERO);
*ret = rm;
return (0);
Modified: head/sys/kern/uipc_mbuf.c
==============================================================================
--- head/sys/kern/uipc_mbuf.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/kern/uipc_mbuf.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -520,7 +520,7 @@ m_prepend(struct mbuf *m, int len, int h
/*
* 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 M_WAITOK/M_NOWAIT from caller.
* Note that the copy is read-only, because clusters are not copied,
* only their reference counts are incremented.
*/
@@ -1028,7 +1028,7 @@ m_pullup(struct mbuf *n, int len)
} else {
if (len > MHLEN)
goto bad;
- MGET(m, M_DONTWAIT, n->m_type);
+ MGET(m, M_NOWAIT, n->m_type);
if (m == NULL)
goto bad;
m->m_len = 0;
@@ -1076,7 +1076,7 @@ m_copyup(struct mbuf *n, int len, int ds
if (len > (MHLEN - dstoff))
goto bad;
- MGET(m, M_DONTWAIT, n->m_type);
+ MGET(m, M_NOWAIT, n->m_type);
if (m == NULL)
goto bad;
m->m_len = 0;
@@ -1195,10 +1195,10 @@ m_devget(char *buf, int totlen, int off,
while (totlen > 0) {
if (top == NULL) { /* First one, must be PKTHDR */
if (totlen + off >= MINCLSIZE) {
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
len = MCLBYTES;
} else {
- m = m_gethdr(M_DONTWAIT, MT_DATA);
+ m = m_gethdr(M_NOWAIT, MT_DATA);
len = MHLEN;
/* Place initial small packet/header at end of
mbuf */
@@ -1213,10 +1213,10 @@ m_devget(char *buf, int totlen, int off,
m->m_pkthdr.len = totlen;
} else {
if (totlen + off >= MINCLSIZE) {
- m = m_getcl(M_DONTWAIT, MT_DATA, 0);
+ m = m_getcl(M_NOWAIT, MT_DATA, 0);
len = MCLBYTES;
} else {
- m = m_get(M_DONTWAIT, MT_DATA);
+ m = m_get(M_NOWAIT, MT_DATA);
len = MLEN;
}
if (m == NULL) {
@@ -1260,7 +1260,7 @@ m_copyback(struct mbuf *m0, int off, int
off -= mlen;
totlen += mlen;
if (m->m_next == NULL) {
- n = m_get(M_DONTWAIT, m->m_type);
+ n = m_get(M_NOWAIT, m->m_type);
if (n == NULL)
goto out;
bzero(mtod(n, caddr_t), MLEN);
@@ -1284,7 +1284,7 @@ m_copyback(struct mbuf *m0, int off, int
if (len == 0)
break;
if (m->m_next == NULL) {
- n = m_get(M_DONTWAIT, m->m_type);
+ n = m_get(M_NOWAIT, m->m_type);
if (n == NULL)
break;
n->m_len = min(MLEN, len);
@@ -1328,7 +1328,7 @@ m_append(struct mbuf *m0, int len, c_cad
* Allocate a new mbuf; could check space
* and allocate a cluster instead.
*/
- n = m_get(M_DONTWAIT, m->m_type);
+ n = m_get(M_NOWAIT, m->m_type);
if (n == NULL)
break;
n->m_len = min(MLEN, remainder);
Modified: head/sys/kern/uipc_mbuf2.c
==============================================================================
--- head/sys/kern/uipc_mbuf2.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/kern/uipc_mbuf2.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -171,7 +171,7 @@ m_pulldown(struct mbuf *m, int off, int
* 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, M_NOWAIT);
if (o == NULL) {
m_freem(m);
return NULL; /* ENOBUFS */
@@ -231,9 +231,9 @@ m_pulldown(struct mbuf *m, int off, int
* on both end.
*/
if (len > MLEN)
- o = m_getcl(M_DONTWAIT, m->m_type, 0);
+ o = m_getcl(M_NOWAIT, m->m_type, 0);
else
- o = m_get(M_DONTWAIT, m->m_type);
+ o = m_get(M_NOWAIT, m->m_type);
if (!o) {
m_freem(m);
return NULL; /* ENOBUFS */
Modified: head/sys/kern/uipc_sockbuf.c
==============================================================================
--- head/sys/kern/uipc_sockbuf.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/kern/uipc_sockbuf.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -188,7 +188,7 @@ sowakeup(struct socket *so, struct sockb
}
KNOTE_LOCKED(&sb->sb_sel.si_note, 0);
if (sb->sb_upcall != NULL) {
- ret = sb->sb_upcall(so, sb->sb_upcallarg, M_DONTWAIT);
+ ret = sb->sb_upcall(so, sb->sb_upcallarg, M_NOWAIT);
if (ret == SU_ISCONNECTED) {
KASSERT(sb == &so->so_rcv,
("SO_SND upcall returned SU_ISCONNECTED"));
@@ -644,7 +644,7 @@ sbappendaddr_locked(struct sockbuf *sb,
if (asa->sa_len > MLEN)
return (0);
#endif
- MGET(m, M_DONTWAIT, MT_SONAME);
+ MGET(m, M_NOWAIT, MT_SONAME);
if (m == 0)
return (0);
m->m_len = asa->sa_len;
@@ -1002,9 +1002,9 @@ sbcreatecontrol(caddr_t p, int size, int
if (CMSG_SPACE((u_int)size) > MCLBYTES)
return ((struct mbuf *) NULL);
if (CMSG_SPACE((u_int)size) > MLEN)
- m = m_getcl(M_DONTWAIT, MT_CONTROL, 0);
+ m = m_getcl(M_NOWAIT, MT_CONTROL, 0);
else
- m = m_get(M_DONTWAIT, MT_CONTROL);
+ m = m_get(M_NOWAIT, MT_CONTROL);
if (m == NULL)
return ((struct mbuf *) NULL);
cp = mtod(m, struct cmsghdr *);
Modified: head/sys/kern/uipc_socket.c
==============================================================================
--- head/sys/kern/uipc_socket.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/kern/uipc_socket.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -998,7 +998,7 @@ sosend_copyin(struct uio *uio, struct mb
}
} else {
if (top == NULL) {
- m = m_gethdr(M_WAIT, MT_DATA);
+ m = m_gethdr(M_WAITOK, MT_DATA);
m->m_pkthdr.len = 0;
m->m_pkthdr.rcvif = NULL;
@@ -1010,7 +1010,7 @@ sosend_copyin(struct uio *uio, struct mb
if (atomic && m && len < MHLEN)
MH_ALIGN(m, len);
} else {
- m = m_get(M_WAIT, MT_DATA);
+ m = m_get(M_WAITOK, MT_DATA);
len = min(min(MLEN, resid), *space);
}
}
@@ -1433,7 +1433,7 @@ soreceive_rcvoob(struct socket *so, stru
KASSERT(flags & MSG_OOB, ("soreceive_rcvoob: (flags & MSG_OOB) == 0"));
VNET_SO_ASSERT(so);
- m = m_get(M_WAIT, MT_DATA);
+ m = m_get(M_WAITOK, MT_DATA);
error = (*pr->pr_usrreqs->pru_rcvoob)(so, m, flags & MSG_PEEK);
if (error)
goto bad;
@@ -1841,13 +1841,13 @@ dontblock:
int copy_flag;
if (flags & MSG_DONTWAIT)
- copy_flag = M_DONTWAIT;
+ copy_flag = M_NOWAIT;
else
copy_flag = M_WAIT;
- if (copy_flag == M_WAIT)
+ if (copy_flag == M_WAITOK)
SOCKBUF_UNLOCK(&so->so_rcv);
*mp = m_copym(m, 0, len, copy_flag);
- if (copy_flag == M_WAIT)
+ if (copy_flag == M_WAITOK)
SOCKBUF_LOCK(&so->so_rcv);
if (*mp == NULL) {
/*
@@ -2114,7 +2114,7 @@ deliver:
KASSERT(sb->sb_mb != NULL,
("%s: len > 0 && sb->sb_mb empty", __func__));
- m = m_copym(sb->sb_mb, 0, len, M_DONTWAIT);
+ m = m_copym(sb->sb_mb, 0, len, M_NOWAIT);
if (m == NULL)
len = 0; /* Don't flush data from
sockbuf. */
else
@@ -2901,11 +2901,11 @@ soopt_getm(struct sockopt *sopt, struct
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 ? M_WAITOK : M_NOWAIT, MT_DATA);
if (m == NULL)
return ENOBUFS;
if (sopt_size > MLEN) {
- MCLGET(m, sopt->sopt_td ? M_WAIT : M_DONTWAIT);
+ MCLGET(m, sopt->sopt_td ? M_WAITOK : M_NOWAIT);
if ((m->m_flags & M_EXT) == 0) {
m_free(m);
return ENOBUFS;
@@ -2919,14 +2919,14 @@ soopt_getm(struct sockopt *sopt, struct
m_prev = m;
while (sopt_size) {
- MGET(m, sopt->sopt_td ? M_WAIT : M_DONTWAIT, MT_DATA);
+ MGET(m, sopt->sopt_td ? M_WAITOK : M_NOWAIT, MT_DATA);
if (m == NULL) {
m_freem(*mp);
return ENOBUFS;
}
if (sopt_size > MLEN) {
- MCLGET(m, sopt->sopt_td != NULL ? M_WAIT :
- M_DONTWAIT);
+ MCLGET(m, sopt->sopt_td != NULL ? M_WAITOK :
+ M_NOWAIT);
if ((m->m_flags & M_EXT) == 0) {
m_freem(m);
m_freem(*mp);
@@ -3409,7 +3409,7 @@ restart:
head->so_accf->so_accept_filter_arg);
so->so_options &= ~SO_ACCEPTFILTER;
ret = head->so_accf->so_accept_filter->accf_callback(so,
- head->so_accf->so_accept_filter_arg, M_DONTWAIT);
+ head->so_accf->so_accept_filter_arg, M_NOWAIT);
if (ret == SU_ISCONNECTED)
soupcall_clear(so, SO_RCV);
SOCK_UNLOCK(so);
Modified: head/sys/kern/uipc_syscalls.c
==============================================================================
--- head/sys/kern/uipc_syscalls.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/kern/uipc_syscalls.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -722,7 +722,7 @@ sendit(td, s, mp, flags)
if (mp->msg_flags == MSG_COMPAT) {
struct cmsghdr *cm;
- M_PREPEND(control, sizeof(*cm), M_WAIT);
+ M_PREPEND(control, sizeof(*cm), M_WAITOK);
cm = mtod(control, struct cmsghdr *);
cm->cmsg_len = control->m_len;
cm->cmsg_level = SOL_SOCKET;
@@ -1661,9 +1661,9 @@ sockargs(mp, buf, buflen, type)
if ((u_int)buflen > MCLBYTES)
return (EINVAL);
}
- m = m_get(M_WAIT, type);
+ m = m_get(M_WAITOK, type);
if ((u_int)buflen > MLEN)
- MCLGET(m, M_WAIT);
+ MCLGET(m, M_WAITOK);
m->m_len = buflen;
error = copyin(buf, mtod(m, caddr_t), (u_int)buflen);
if (error)
Modified: head/sys/mips/adm5120/if_admsw.c
==============================================================================
--- head/sys/mips/adm5120/if_admsw.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/mips/adm5120/if_admsw.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -647,14 +647,14 @@ admsw_start(struct ifnet *ifp)
if (m0->m_pkthdr.len < ETHER_MIN_LEN ||
bus_dmamap_load_mbuf(sc->sc_bufs_dmat, dmamap, m0,
admsw_mbuf_map_addr, ds, BUS_DMA_NOWAIT) != 0) {
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
device_printf(sc->sc_dev,
"unable to allocate Tx mbuf\n");
break;
}
if (m0->m_pkthdr.len > MHLEN) {
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if ((m->m_flags & M_EXT) == 0) {
device_printf(sc->sc_dev,
"unable to allocate Tx cluster\n");
@@ -1222,11 +1222,11 @@ admsw_add_rxbuf(struct admsw_softc *sc,
else
ds = &sc->sc_rxlsoft[idx];
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
return (ENOBUFS);
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if ((m->m_flags & M_EXT) == 0) {
m_freem(m);
return (ENOBUFS);
Modified: head/sys/mips/atheros/if_arge.c
==============================================================================
--- head/sys/mips/atheros/if_arge.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/mips/atheros/if_arge.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -1090,7 +1090,7 @@ arge_encap(struct arge_softc *sc, struct
m = *m_head;
if (! arge_mbuf_chain_is_tx_aligned(m)) {
sc->stats.tx_pkts_unaligned++;
- m = m_defrag(*m_head, M_DONTWAIT);
+ m = m_defrag(*m_head, M_NOWAIT);
if (m == NULL) {
*m_head = NULL;
return (ENOBUFS);
@@ -1772,7 +1772,7 @@ arge_newbuf(struct arge_softc *sc, int i
bus_dmamap_t map;
int nsegs;
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL)
return (ENOBUFS);
m->m_len = m->m_pkthdr.len = MCLBYTES;
Modified: head/sys/mips/cavium/if_octm.c
==============================================================================
--- head/sys/mips/cavium/if_octm.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/mips/cavium/if_octm.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -505,7 +505,7 @@ octm_rx_intr(void *arg)
}
for (;;) {
- struct mbuf *m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ struct mbuf *m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL) {
device_printf(sc->sc_dev, "no memory for receive
mbuf.\n");
return;
Modified: head/sys/mips/cavium/octe/ethernet-mem.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-mem.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/mips/cavium/octe/ethernet-mem.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -57,7 +57,7 @@ int cvm_oct_mem_fill_fpa(int pool, int s
while (freed) {
KASSERT(size <= MCLBYTES - 128, ("mbuf clusters are too
small"));
- struct mbuf *m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ struct mbuf *m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (__predict_false(m == NULL)) {
printf("Failed to allocate mbuf for hardware pool
%d\n", pool);
break;
Modified: head/sys/mips/cavium/octe/ethernet-rx.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-rx.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/mips/cavium/octe/ethernet-rx.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -228,7 +228,7 @@ void cvm_oct_tasklet_rx(void *context, i
/* We have to copy the packet. First allocate an
mbuf for it */
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
DEBUGPRINT("Port %d failed to allocate mbuf,
packet dropped\n", work->word1.cn38xx.ipprt);
cvm_oct_free_work(work);
Modified: head/sys/mips/idt/if_kr.c
==============================================================================
--- head/sys/mips/idt/if_kr.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/mips/idt/if_kr.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -1305,7 +1305,7 @@ kr_newbuf(struct kr_softc *sc, int idx)
bus_dmamap_t map;
int nsegs;
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL)
return (ENOBUFS);
m->m_len = m->m_pkthdr.len = MCLBYTES;
Modified: head/sys/mips/nlm/dev/net/xlpge.c
==============================================================================
--- head/sys/mips/nlm/dev/net/xlpge.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/mips/nlm/dev/net/xlpge.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -1125,7 +1125,7 @@ get_buf(void)
vm_paddr_t temp1, temp2;
#endif
- if ((m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR)) == NULL)
+ if ((m_new = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR)) == NULL)
return (NULL);
m_new->m_len = m_new->m_pkthdr.len = MCLBYTES;
m_adj(m_new, NAE_CACHELINE_SIZE - ((uintptr_t)m_new->m_data & 0x1f));
Modified: head/sys/mips/rmi/dev/nlge/if_nlge.c
==============================================================================
--- head/sys/mips/rmi/dev/nlge/if_nlge.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/mips/rmi/dev/nlge/if_nlge.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -2158,7 +2158,7 @@ get_buf(void)
vm_paddr_t temp1, temp2;
#endif
- if ((m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR)) == NULL)
+ if ((m_new = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR)) == NULL)
return (NULL);
m_new->m_len = m_new->m_pkthdr.len = MCLBYTES;
m_adj(m_new, XLR_CACHELINE_SIZE - ((uintptr_t)m_new->m_data & 0x1f));
Modified: head/sys/mips/rmi/dev/xlr/rge.c
==============================================================================
--- head/sys/mips/rmi/dev/xlr/rge.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/mips/rmi/dev/xlr/rge.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -568,7 +568,7 @@ get_mbuf(void)
{
struct mbuf *m_new = NULL;
- if ((m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR)) == NULL)
+ if ((m_new = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR)) == NULL)
return NULL;
m_new->m_len = MCLBYTES;
Modified: head/sys/net/bpf.c
==============================================================================
--- head/sys/net/bpf.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/net/bpf.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -530,11 +530,11 @@ bpf_movein(struct uio *uio, int linktype
return (EIO);
if (len <= MHLEN)
- MGETHDR(m, M_WAIT, MT_DATA);
+ MGETHDR(m, M_WAITOK, MT_DATA);
else if (len <= MCLBYTES)
- m = m_getcl(M_WAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR);
else
- m = m_getjcl(M_WAIT, MT_DATA, M_PKTHDR,
+ m = m_getjcl(M_WAITOK, MT_DATA, M_PKTHDR,
#if (MJUMPAGESIZE > MCLBYTES)
len <= MJUMPAGESIZE ? MJUMPAGESIZE :
#endif
@@ -1064,7 +1064,7 @@ bpfwrite(struct cdev *dev, struct uio *u
dst.sa_family = pseudo_AF_HDRCMPLT;
if (d->bd_feedback) {
- mc = m_dup(m, M_DONTWAIT);
+ mc = m_dup(m, M_NOWAIT);
if (mc != NULL)
mc->m_pkthdr.rcvif = ifp;
/* Set M_PROMISC for outgoing packets to be discarded. */
Modified: head/sys/net/bridgestp.c
==============================================================================
--- head/sys/net/bridgestp.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/net/bridgestp.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -234,7 +234,7 @@ bstp_transmit_tcn(struct bstp_state *bs,
if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
return;
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
return;
@@ -348,7 +348,7 @@ bstp_send_bpdu(struct bstp_state *bs, st
if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
return;
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
return;
Modified: head/sys/net/ieee8023ad_lacp.c
==============================================================================
--- head/sys/net/ieee8023ad_lacp.c Wed Dec 5 07:03:37 2012
(r243881)
+++ head/sys/net/ieee8023ad_lacp.c Wed Dec 5 08:04:20 2012
(r243882)
@@ -348,7 +348,7 @@ lacp_xmit_lacpdu(struct lacp_port *lp)
LACP_LOCK_ASSERT(lp->lp_lsc);
- m = m_gethdr(M_DONTWAIT, MT_DATA);
+ m = m_gethdr(M_NOWAIT, MT_DATA);
if (m == NULL) {
return (ENOMEM);
}
@@ -402,7 +402,7 @@ lacp_xmit_marker(struct lacp_port *lp)
LACP_LOCK_ASSERT(lp->lp_lsc);
- m = m_gethdr(M_DONTWAIT, MT_DATA);
+ m = m_gethdr(M_NOWAIT, MT_DATA);
if (m == NULL) {
return (ENOMEM);
}
Modified: head/sys/net/if_arcsubr.c
==============================================================================
--- head/sys/net/if_arcsubr.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/net/if_arcsubr.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -214,7 +214,7 @@ arc_output(struct ifnet *ifp, struct mbu
}
isphds = arc_isphds(atype);
- M_PREPEND(m, isphds ? ARC_HDRNEWLEN : ARC_HDRLEN, M_DONTWAIT);
+ M_PREPEND(m, isphds ? ARC_HDRNEWLEN : ARC_HDRLEN, M_NOWAIT);
if (m == 0)
senderr(ENOBUFS);
ah = mtod(m, struct arc_header *);
@@ -294,13 +294,13 @@ arc_frag_next(struct ifnet *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, M_NOWAIT);
if (ac->curr_frag == 0) {
m_freem(m);
return 0;
}
- M_PREPEND(m, ARC_HDRNEWLEN, M_DONTWAIT);
+ M_PREPEND(m, ARC_HDRNEWLEN, M_NOWAIT);
if (m == 0) {
m_freem(ac->curr_frag);
ac->curr_frag = 0;
@@ -319,7 +319,7 @@ arc_frag_next(struct ifnet *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, M_NOWAIT);
if (m == 0)
return 0;
@@ -332,7 +332,7 @@ arc_frag_next(struct ifnet *ifp)
} else {
ac->curr_frag = 0;
- M_PREPEND(m, ARC_HDRNEWLEN, M_DONTWAIT);
+ M_PREPEND(m, ARC_HDRNEWLEN, M_NOWAIT);
if (m == 0)
return 0;
Modified: head/sys/net/if_atmsubr.c
==============================================================================
--- head/sys/net/if_atmsubr.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/net/if_atmsubr.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -190,7 +190,7 @@ atm_output(struct ifnet *ifp, struct mbu
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, M_NOWAIT);
if (m == 0)
senderr(ENOBUFS);
ad = mtod(m, struct atm_pseudohdr *);
Modified: head/sys/net/if_bridge.c
==============================================================================
--- head/sys/net/if_bridge.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/net/if_bridge.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -1948,7 +1948,7 @@ bridge_output(struct ifnet *ifp, struct
used = 1;
mc = m;
} else {
- mc = m_copypacket(m, M_DONTWAIT);
+ mc = m_copypacket(m, M_NOWAIT);
if (mc == NULL) {
sc->sc_ifp->if_oerrors++;
continue;
@@ -2237,7 +2237,7 @@ bridge_input(struct ifnet *ifp, struct m
* for bridge processing; return the original packet for
* local processing.
*/
- mc = m_dup(m, M_DONTWAIT);
+ mc = m_dup(m, M_NOWAIT);
if (mc == NULL) {
BRIDGE_UNLOCK(sc);
return (m);
@@ -2254,7 +2254,7 @@ bridge_input(struct ifnet *ifp, struct m
*/
KASSERT(bifp->if_bridge == NULL,
("loop created in bridge_input"));
- mc2 = m_dup(m, M_DONTWAIT);
+ mc2 = m_dup(m, M_NOWAIT);
if (mc2 != NULL) {
/* Keep the layer3 header aligned */
int i = min(mc2->m_pkthdr.len, max_protohdr);
@@ -2431,7 +2431,7 @@ bridge_broadcast(struct bridge_softc *sc
mc = m;
used = 1;
} else {
- mc = m_dup(m, M_DONTWAIT);
+ mc = m_dup(m, M_NOWAIT);
if (mc == NULL) {
sc->sc_ifp->if_oerrors++;
continue;
@@ -2494,7 +2494,7 @@ bridge_span(struct bridge_softc *sc, str
if ((dst_if->if_drv_flags & IFF_DRV_RUNNING) == 0)
continue;
- mc = m_copypacket(m, M_DONTWAIT);
+ mc = m_copypacket(m, M_NOWAIT);
if (mc == NULL) {
sc->sc_ifp->if_oerrors++;
continue;
@@ -3189,13 +3189,13 @@ bridge_pfil(struct mbuf **mp, struct ifn
* Finally, put everything back the way it was and return
*/
if (snap) {
- M_PREPEND(*mp, sizeof(struct llc), M_DONTWAIT);
+ M_PREPEND(*mp, sizeof(struct llc), M_NOWAIT);
if (*mp == NULL)
return (error);
bcopy(&llc1, mtod(*mp, caddr_t), sizeof(struct llc));
}
- M_PREPEND(*mp, ETHER_HDR_LEN, M_DONTWAIT);
+ M_PREPEND(*mp, ETHER_HDR_LEN, M_NOWAIT);
if (*mp == NULL)
return (error);
bcopy(&eh2, mtod(*mp, caddr_t), ETHER_HDR_LEN);
@@ -3390,7 +3390,7 @@ bridge_fragment(struct ifnet *ifp, struc
for (m0 = m; m0; m0 = m0->m_nextpkt) {
if (error == 0) {
if (snap) {
- M_PREPEND(m0, sizeof(struct llc), M_DONTWAIT);
+ M_PREPEND(m0, sizeof(struct llc), M_NOWAIT);
if (m0 == NULL) {
error = ENOBUFS;
continue;
@@ -3398,7 +3398,7 @@ bridge_fragment(struct ifnet *ifp, struc
bcopy(llc, mtod(m0, caddr_t),
sizeof(struct llc));
}
- M_PREPEND(m0, ETHER_HDR_LEN, M_DONTWAIT);
+ M_PREPEND(m0, ETHER_HDR_LEN, M_NOWAIT);
if (m0 == NULL) {
error = ENOBUFS;
continue;
Modified: head/sys/net/if_ef.c
==============================================================================
--- head/sys/net/if_ef.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/net/if_ef.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -408,7 +408,7 @@ ef_output(struct ifnet *ifp, struct mbuf
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, M_WAITOK);
/*
* Ensure that ethernet header and next three bytes
* will fit into single mbuf
@@ -427,7 +427,7 @@ ef_output(struct ifnet *ifp, struct mbuf
*hlen += 3;
break;
case ETHER_FT_SNAP:
- M_PREPEND(m, 8, M_WAIT);
+ M_PREPEND(m, 8, M_WAITOK);
type = htons(m->m_pkthdr.len);
cp = mtod(m, u_char *);
bcopy("\xAA\xAA\x03\x00\x00\x00\x81\x37", cp, 8);
Modified: head/sys/net/if_ethersubr.c
==============================================================================
--- head/sys/net/if_ethersubr.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/net/if_ethersubr.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -260,7 +260,7 @@ ether_output(struct ifnet *ifp, struct m
struct llc llc;
ifa_free(&aa->aa_ifa);
- M_PREPEND(m, LLC_SNAPFRAMELEN, M_DONTWAIT);
+ M_PREPEND(m, LLC_SNAPFRAMELEN, M_NOWAIT);
if (m == NULL)
senderr(ENOBUFS);
llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP;
@@ -313,7 +313,7 @@ ether_output(struct ifnet *ifp, struct m
* Add local net header. If no space in first mbuf,
* allocate another.
*/
- M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT);
+ M_PREPEND(m, ETHER_HDR_LEN, M_NOWAIT);
if (m == NULL)
senderr(ENOBUFS);
eh = mtod(m, struct ether_header *);
@@ -362,7 +362,7 @@ ether_output(struct ifnet *ifp, struct m
* often used kernel parts suffer from the same bug.
* See PR kern/105943 for a proposed general solution.
*/
- if ((n = m_dup(m, M_DONTWAIT)) != NULL) {
+ if ((n = m_dup(m, M_NOWAIT)) != NULL) {
n->m_pkthdr.csum_flags |= csum_flags;
if (csum_flags & CSUM_DATA_VALID)
n->m_pkthdr.csum_data = 0xffff;
@@ -864,7 +864,7 @@ discard:
* Put back the ethernet header so netgraph has a
* consistent view of inbound packets.
*/
- M_PREPEND(m, ETHER_HDR_LEN, M_DONTWAIT);
+ M_PREPEND(m, ETHER_HDR_LEN, M_NOWAIT);
(*ng_ether_input_orphan_p)(ifp, m);
return;
}
@@ -1288,7 +1288,7 @@ ether_vlanencap(struct mbuf *m, uint16_t
{
struct ether_vlan_header *evl;
- M_PREPEND(m, ETHER_VLAN_ENCAP_LEN, M_DONTWAIT);
+ M_PREPEND(m, ETHER_VLAN_ENCAP_LEN, M_NOWAIT);
if (m == NULL)
return (NULL);
/* M_PREPEND takes care of m_len, m_pkthdr.len for us */
Modified: head/sys/net/if_fddisubr.c
==============================================================================
--- head/sys/net/if_fddisubr.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/net/if_fddisubr.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -212,7 +212,7 @@ fddi_output(ifp, m, dst, ro)
if (aa->aa_flags & AFA_PHASE2) {
struct llc llc;
- M_PREPEND(m, LLC_SNAPFRAMELEN, M_WAIT);
+ M_PREPEND(m, LLC_SNAPFRAMELEN, M_WAITOK);
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));
@@ -291,7 +291,7 @@ fddi_output(ifp, m, dst, ro)
*/
if (type != 0) {
struct llc *l;
- M_PREPEND(m, LLC_SNAPFRAMELEN, M_DONTWAIT);
+ M_PREPEND(m, LLC_SNAPFRAMELEN, M_NOWAIT);
if (m == 0)
senderr(ENOBUFS);
l = mtod(m, struct llc *);
@@ -307,7 +307,7 @@ fddi_output(ifp, m, dst, ro)
* Add local net header. If no space in first mbuf,
* allocate another.
*/
- M_PREPEND(m, FDDI_HDR_LEN, M_DONTWAIT);
+ M_PREPEND(m, FDDI_HDR_LEN, M_NOWAIT);
if (m == 0)
senderr(ENOBUFS);
fh = mtod(m, struct fddi_header *);
Modified: head/sys/net/if_fwsubr.c
==============================================================================
--- head/sys/net/if_fwsubr.c Wed Dec 5 07:03:37 2012 (r243881)
+++ head/sys/net/if_fwsubr.c Wed Dec 5 08:04:20 2012 (r243882)
@@ -229,7 +229,7 @@ firewire_output(struct ifnet *ifp, struc
/*
* No fragmentation is necessary.
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
