diff options
author | glebius <glebius@FreeBSD.org> | 2012-12-05 08:04:20 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2012-12-05 08:04:20 +0000 |
commit | 8e20fa5ae93243e19700ca06c01524b90fe3b784 (patch) | |
tree | bf083a0829f8044362fc83354c8e8b60d1f7932a /sys/netgraph/atm | |
parent | d0604243f84872a5dd39fc735ebcdb4fbe1b6bb5 (diff) | |
download | FreeBSD-src-8e20fa5ae93243e19700ca06c01524b90fe3b784.zip FreeBSD-src-8e20fa5ae93243e19700ca06c01524b90fe3b784.tar.gz |
Mechanically substitute flags from historic mbuf allocator with
malloc(9) flags within sys.
Exceptions:
- sys/contrib not touched
- sys/mbuf.h edited manually
Diffstat (limited to 'sys/netgraph/atm')
-rw-r--r-- | sys/netgraph/atm/ccatm/ng_ccatm.c | 4 | ||||
-rw-r--r-- | sys/netgraph/atm/ng_atm.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/netgraph/atm/ccatm/ng_ccatm.c b/sys/netgraph/atm/ccatm/ng_ccatm.c index a6ff474..cdbc86f 100644 --- a/sys/netgraph/atm/ccatm/ng_ccatm.c +++ b/sys/netgraph/atm/ccatm/ng_ccatm.c @@ -434,13 +434,13 @@ send_dump(struct ccdata *data, void *uarg, const char *buf) struct ccnode *priv = uarg; if (priv->dump == NULL) { - m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); if (m == NULL) return (ENOBUFS); priv->dump_first = priv->dump_last = m; m->m_pkthdr.len = 0; } else { - m = m_getcl(M_DONTWAIT, MT_DATA, 0); + m = m_getcl(M_NOWAIT, MT_DATA, 0); if (m == 0) { m_freem(priv->dump_first); return (ENOBUFS); diff --git a/sys/netgraph/atm/ng_atm.c b/sys/netgraph/atm/ng_atm.c index 32bde57..ef168ac 100644 --- a/sys/netgraph/atm/ng_atm.c +++ b/sys/netgraph/atm/ng_atm.c @@ -384,7 +384,7 @@ ng_atm_input(struct ifnet *ifp, struct mbuf **mp, /* * Prepend the atm_pseudoheader. */ - M_PREPEND(*mp, sizeof(*ah), M_DONTWAIT); + M_PREPEND(*mp, sizeof(*ah), M_NOWAIT); if (*mp == NULL) return; memcpy(mtod(*mp, struct atm_pseudohdr *), ah, sizeof(*ah)); @@ -462,7 +462,7 @@ ng_atm_input_orphans(struct ifnet *ifp, struct mbuf *m, /* * Prepend the atm_pseudoheader. */ - M_PREPEND(m, sizeof(*ah), M_DONTWAIT); + M_PREPEND(m, sizeof(*ah), M_NOWAIT); if (m == NULL) return; memcpy(mtod(m, struct atm_pseudohdr *), ah, sizeof(*ah)); @@ -502,7 +502,7 @@ ng_atm_rcvdata(hook_p hook, item_p item) /* * Prepend pseudo-hdr. Drivers don't care about the flags. */ - M_PREPEND(m, sizeof(*aph), M_DONTWAIT); + M_PREPEND(m, sizeof(*aph), M_NOWAIT); if (m == NULL) { NG_FREE_M(m); return (ENOMEM); |