From a69aaa772119d359e38760dd0e931bed9afb88bf Mon Sep 17 00:00:00 2001 From: glebius Date: Tue, 4 Dec 2012 09:32:43 +0000 Subject: Mechanically substitute flags from historic mbuf allocator with malloc(9) flags in sys/dev. --- sys/dev/fatm/if_fatm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sys/dev/fatm') diff --git a/sys/dev/fatm/if_fatm.c b/sys/dev/fatm/if_fatm.c index 8ddda95..9020d22 100644 --- a/sys/dev/fatm/if_fatm.c +++ b/sys/dev/fatm/if_fatm.c @@ -1099,7 +1099,7 @@ fatm_supply_small_buffers(struct fatm_softc *sc) if_printf(sc->ifp, "out of rbufs\n"); break; } - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, M_NOWAIT, MT_DATA); if (m == NULL) { LIST_INSERT_HEAD(&sc->rbuf_free, rb, link); break; @@ -1189,7 +1189,7 @@ fatm_supply_large_buffers(struct fatm_softc *sc) if_printf(sc->ifp, "out of rbufs\n"); break; } - if ((m = m_getcl(M_DONTWAIT, MT_DATA, + if ((m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR)) == NULL) { LIST_INSERT_HEAD(&sc->rbuf_free, rb, link); break; @@ -1768,17 +1768,17 @@ copy_mbuf(struct mbuf *m) { struct mbuf *new; - MGET(new, M_DONTWAIT, MT_DATA); + MGET(new, M_NOWAIT, MT_DATA); if (new == NULL) return (NULL); if (m->m_flags & M_PKTHDR) { M_MOVE_PKTHDR(new, m); if (m->m_len > MHLEN) - MCLGET(new, M_WAIT); + MCLGET(new, M_WAITOK); } else { if (m->m_len > MLEN) - MCLGET(new, M_WAIT); + MCLGET(new, M_WAITOK); } bcopy(m->m_data, new->m_data, m->m_len); -- cgit v1.1