Mechanically substitute flags from historic mbuf allocator with

malloc(9) flags within sys.

Exceptions:

- sys/contrib not touched
- sys/mbuf.h edited manually

6 files changed, 12 insertions, 12 deletions

diff --git a/sys/arm/at91/if_ate.c b/sys/arm/at91/if_ate.c
index 58062e7..9da2aba 100644
--- a/sys/arm/at91/if_ate.c
+++ b/sys/arm/at91/if_ate.c
@@ -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;
diff --git a/sys/arm/at91/if_macb.c b/sys/arm/at91/if_macb.c
index ac280a1..1a46adc 100644
--- a/sys/arm/at91/if_macb.c
+++ b/sys/arm/at91/if_macb.c
@@ -435,7 +435,7 @@ macb_new_rxbuf(struct macb_softc *sc, int index)
 	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 mbuf **m_head)
 	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;
diff --git a/sys/arm/econa/if_ece.c b/sys/arm/econa/if_ece.c
index 5169101..cafc2f9 100644
--- a/sys/arm/econa/if_ece.c
+++ b/sys/arm/econa/if_ece.c
@@ -714,7 +714,7 @@ ece_new_rxbuf(struct ece_softc *sc, struct rx_desc_info* descinfo)
 
 	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);
diff --git a/sys/arm/lpc/if_lpe.c b/sys/arm/lpc/if_lpe.c
index b7b5a9a..025aa72 100644
--- a/sys/arm/lpc/if_lpe.c
+++ b/sys/arm/lpc/if_lpe.c
@@ -1122,7 +1122,7 @@ lpe_init_rxbuf(struct lpe_softc *sc, int n)
 	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");
diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c
index d671c72..8ed0ce5 100644
--- a/sys/arm/ti/cpsw/if_cpsw.c
+++ b/sys/arm/ti/cpsw/if_cpsw.c
@@ -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;
diff --git a/sys/arm/xscale/ixp425/if_npe.c b/sys/arm/xscale/ixp425/if_npe.c
index 5063ac6..21e3926 100644
--- a/sys/arm/xscale/ixp425/if_npe.c
+++ b/sys/arm/xscale/ixp425/if_npe.c
@@ -1064,7 +1064,7 @@ npe_rxbuf_init(struct npe_softc *sc, struct npebuf *npe, struct mbuf *m)
 	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);