[Midnightbsd-cvs] src [8931] trunk/sys/dev: switch to malloc flags
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Sep 26 18:58:24 EDT 2016
Revision: 8931
http://svnweb.midnightbsd.org/src/?rev=8931
Author: laffer1
Date: 2016-09-26 18:58:24 -0400 (Mon, 26 Sep 2016)
Log Message:
-----------
switch to malloc flags
Modified Paths:
--------------
trunk/sys/dev/age/if_age.c
trunk/sys/dev/alc/if_alc.c
trunk/sys/dev/ale/if_ale.c
trunk/sys/dev/an/if_an.c
trunk/sys/dev/bce/if_bce.c
trunk/sys/dev/bfe/if_bfe.c
trunk/sys/dev/bge/if_bge.c
trunk/sys/dev/bm/if_bm.c
trunk/sys/dev/bxe/if_bxe.c
trunk/sys/dev/cm/smc90cx6.c
trunk/sys/dev/cp/if_cp.c
trunk/sys/dev/cs/if_cs.c
trunk/sys/dev/ctau/if_ct.c
trunk/sys/dev/cx/if_cx.c
trunk/sys/dev/ed/if_ed.c
trunk/sys/dev/en/midway.c
trunk/sys/dev/ep/if_ep.c
trunk/sys/dev/et/if_et.c
trunk/sys/dev/ex/if_ex.c
trunk/sys/dev/fatm/if_fatm.c
trunk/sys/dev/fe/if_fe.c
trunk/sys/dev/firewire/fwohci.c
trunk/sys/dev/firewire/if_fwe.c
trunk/sys/dev/firewire/if_fwip.c
trunk/sys/dev/hatm/if_hatm_intr.c
trunk/sys/dev/hatm/if_hatm_tx.c
trunk/sys/dev/ie/if_ie.c
trunk/sys/dev/ipw/if_ipw.c
trunk/sys/dev/iwi/if_iwi.c
trunk/sys/dev/iwn/if_iwn.c
trunk/sys/dev/ixgb/if_ixgb.c
trunk/sys/dev/jme/if_jme.c
trunk/sys/dev/le/lance.c
trunk/sys/dev/lmc/if_lmc.c
trunk/sys/dev/malo/if_malo.c
trunk/sys/dev/mn/if_mn.c
trunk/sys/dev/mwl/if_mwl.c
trunk/sys/dev/mxge/if_mxge.c
trunk/sys/dev/nfe/if_nfe.c
trunk/sys/dev/nve/if_nve.c
trunk/sys/dev/nxge/if_nxge.c
trunk/sys/dev/patm/if_patm_intr.c
trunk/sys/dev/patm/if_patm_rx.c
trunk/sys/dev/patm/if_patm_tx.c
trunk/sys/dev/pcn/if_pcn.c
trunk/sys/dev/pdq/pdq_freebsd.h
trunk/sys/dev/pdq/pdq_ifsubr.c
trunk/sys/dev/pdq/pdqvar.h
trunk/sys/dev/qlxgb/qla_os.c
trunk/sys/dev/rt/if_rt.c
trunk/sys/dev/sbni/if_sbni.c
trunk/sys/dev/sf/if_sf.c
trunk/sys/dev/sfxge/sfxge_dma.c
trunk/sys/dev/sfxge/sfxge_tx.c
trunk/sys/dev/sge/if_sge.c
trunk/sys/dev/smc/if_smc.c
trunk/sys/dev/sn/if_sn.c
trunk/sys/dev/tx/if_tx.c
trunk/sys/dev/txp/if_txp.c
Modified: trunk/sys/dev/age/if_age.c
===================================================================
--- trunk/sys/dev/age/if_age.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/age/if_age.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1524,7 +1524,7 @@
if (M_WRITABLE(m) == 0) {
/* Get a writable copy. */
- m = m_dup(*m_head, M_DONTWAIT);
+ m = m_dup(*m_head, M_NOWAIT);
/* Release original mbufs. */
m_freem(*m_head);
if (m == NULL) {
@@ -1602,7 +1602,7 @@
error = bus_dmamap_load_mbuf_sg(sc->age_cdata.age_tx_tag, map,
*m_head, txsegs, &nsegs, 0);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, AGE_MAXTXSEGS);
+ m = m_collapse(*m_head, M_NOWAIT, AGE_MAXTXSEGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
@@ -3096,7 +3096,7 @@
AGE_LOCK_ASSERT(sc);
- 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: trunk/sys/dev/alc/if_alc.c
===================================================================
--- trunk/sys/dev/alc/if_alc.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/alc/if_alc.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -2047,7 +2047,7 @@
if (M_WRITABLE(m) == 0) {
/* Get a writable copy. */
- m = m_dup(*m_head, M_DONTWAIT);
+ m = m_dup(*m_head, M_NOWAIT);
/* Release original mbufs. */
m_freem(*m_head);
if (m == NULL) {
@@ -2125,7 +2125,7 @@
error = bus_dmamap_load_mbuf_sg(sc->alc_cdata.alc_tx_tag, map,
*m_head, txsegs, &nsegs, 0);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, ALC_MAXTXSEGS);
+ m = m_collapse(*m_head, M_NOWAIT, ALC_MAXTXSEGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
@@ -2803,7 +2803,7 @@
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 = RX_BUF_SIZE_MAX;
@@ -2923,7 +2923,7 @@
* header from the mbuf chain. This can save lots of CPU
* cycles for jumbo frame.
*/
- MGETHDR(n, M_DONTWAIT, MT_DATA);
+ MGETHDR(n, M_NOWAIT, MT_DATA);
if (n == NULL) {
ifp->if_iqdrops++;
m_freem(m);
Modified: trunk/sys/dev/ale/if_ale.c
===================================================================
--- trunk/sys/dev/ale/if_ale.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/ale/if_ale.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1640,7 +1640,7 @@
if (M_WRITABLE(m) == 0) {
/* Get a writable copy. */
- m = m_dup(*m_head, M_DONTWAIT);
+ m = m_dup(*m_head, M_NOWAIT);
/* Release original mbufs. */
m_freem(*m_head);
if (m == NULL) {
@@ -1657,7 +1657,7 @@
if ((sc->ale_flags & ALE_FLAG_TXCSUM_BUG) != 0 &&
(m->m_pkthdr.csum_flags & ALE_CSUM_FEATURES) != 0 &&
(mtod(m, intptr_t) & 3) != 0) {
- m = m_defrag(*m_head, M_DONTWAIT);
+ m = m_defrag(*m_head, M_NOWAIT);
if (m == NULL) {
*m_head = NULL;
return (ENOBUFS);
@@ -1742,7 +1742,7 @@
error = bus_dmamap_load_mbuf_sg(sc->ale_cdata.ale_tx_tag, map,
*m_head, txsegs, &nsegs, 0);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, ALE_MAXTXSEGS);
+ m = m_collapse(*m_head, M_NOWAIT, ALE_MAXTXSEGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
Modified: trunk/sys/dev/an/if_an.c
===================================================================
--- trunk/sys/dev/an/if_an.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/an/if_an.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/dev/an/if_an.c,v 1.2 2008/12/02 02:24:31 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul at ctr.columbia.edu>. All rights reserved.
@@ -947,12 +947,12 @@
/* dump raw 802.11 packet to bpf and skip ip stack */
BPF_TAP(ifp, bpf_buf, len);
} else {
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
ifp->if_ierrors++;
return;
}
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if (!(m->m_flags & M_EXT)) {
m_freem(m);
ifp->if_ierrors++;
@@ -1038,12 +1038,12 @@
if (an_rx_desc.an_done && !an_rx_desc.an_valid) {
buf = sc->an_rx_buffer[count].an_dma_vaddr;
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
ifp->if_ierrors++;
return;
}
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if (!(m->m_flags & M_EXT)) {
m_freem(m);
ifp->if_ierrors++;
Modified: trunk/sys/dev/bce/if_bce.c
===================================================================
--- trunk/sys/dev/bce/if_bce.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/bce/if_bce.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -5418,9 +5418,9 @@
/* This is a new mbuf allocation. */
if (bce_hdr_split == TRUE)
- MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+ MGETHDR(m_new, M_NOWAIT, MT_DATA);
else
- m_new = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR,
+ m_new = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR,
sc->rx_bd_mbuf_alloc_size);
if (m_new == NULL) {
@@ -5540,7 +5540,7 @@
goto bce_get_pg_buf_exit);
/* This is a new mbuf allocation. */
- m_new = m_getcl(M_DONTWAIT, MT_DATA, 0);
+ m_new = m_getcl(M_NOWAIT, MT_DATA, 0);
if (m_new == NULL) {
sc->mbuf_alloc_failed_count++;
rc = ENOBUFS;
@@ -7301,7 +7301,7 @@
/* Controller may modify mbuf chains. */
if (M_WRITABLE(*m_head) == 0) {
- m = m_dup(*m_head, M_DONTWAIT);
+ m = m_dup(*m_head, M_NOWAIT);
m_freem(*m_head);
if (m == NULL) {
sc->mbuf_alloc_failed_count++;
@@ -7467,7 +7467,7 @@
sc->mbuf_frag_count++;
/* Try to defrag the mbuf. */
- m0 = m_collapse(*m_head, M_DONTWAIT, BCE_MAX_SEGMENTS);
+ m0 = m_collapse(*m_head, M_NOWAIT, BCE_MAX_SEGMENTS);
if (m0 == NULL) {
/* Defrag was unsuccessful */
m_freem(*m_head);
Modified: trunk/sys/dev/bfe/if_bfe.c
===================================================================
--- trunk/sys/dev/bfe/if_bfe.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/bfe/if_bfe.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -792,7 +792,7 @@
u_int32_t ctrl;
int nsegs;
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
m->m_len = m->m_pkthdr.len = MCLBYTES;
if (bus_dmamap_load_mbuf_sg(sc->bfe_rxmbuf_tag, sc->bfe_rx_sparemap,
@@ -1520,7 +1520,7 @@
error = bus_dmamap_load_mbuf_sg(sc->bfe_txmbuf_tag, r->bfe_map, *m_head,
txsegs, &nsegs, 0);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, BFE_MAXTXSEGS);
+ m = m_collapse(*m_head, M_NOWAIT, BFE_MAXTXSEGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
Modified: trunk/sys/dev/bge/if_bge.c
===================================================================
--- trunk/sys/dev/bge/if_bge.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/bge/if_bge.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1312,12 +1312,12 @@
if (sc->bge_flags & BGE_FLAG_JUMBO_STD &&
(sc->bge_ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN +
ETHER_VLAN_ENCAP_LEN > (MCLBYTES - ETHER_ALIGN))) {
- m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUM9BYTES);
+ m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUM9BYTES);
if (m == NULL)
return (ENOBUFS);
m->m_len = m->m_pkthdr.len = MJUM9BYTES;
} else {
- 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;
@@ -1368,11 +1368,11 @@
struct mbuf *m;
int error, nsegs;
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
return (ENOBUFS);
- m_cljget(m, M_DONTWAIT, MJUM9BYTES);
+ m_cljget(m, M_NOWAIT, MJUM9BYTES);
if (!(m->m_flags & M_EXT)) {
m_freem(m);
return (ENOBUFS);
@@ -4971,7 +4971,7 @@
/* Allocate new empty mbuf, pad it. Compact later. */
struct mbuf *n;
- MGET(n, M_DONTWAIT, MT_DATA);
+ MGET(n, M_NOWAIT, MT_DATA);
if (n == NULL)
return (ENOBUFS);
n->m_len = 0;
@@ -5013,7 +5013,7 @@
}
if (found > 1) {
- n = m_defrag(m, M_DONTWAIT);
+ n = m_defrag(m, M_NOWAIT);
if (n == NULL)
m_freem(m);
} else
@@ -5033,7 +5033,7 @@
if (M_WRITABLE(m) == 0) {
/* Get a writable copy. */
- n = m_dup(m, M_DONTWAIT);
+ n = m_dup(m, M_NOWAIT);
m_freem(m);
if (n == NULL)
return (NULL);
@@ -5154,9 +5154,9 @@
* DMA read operation.
*/
if (sc->bge_forced_collapse == 1)
- m = m_defrag(m, M_DONTWAIT);
+ m = m_defrag(m, M_NOWAIT);
else
- m = m_collapse(m, M_DONTWAIT,
+ m = m_collapse(m, M_NOWAIT,
sc->bge_forced_collapse);
if (m == NULL)
m = *m_head;
@@ -5168,7 +5168,7 @@
error = bus_dmamap_load_mbuf_sg(sc->bge_cdata.bge_tx_mtag, map, m, segs,
&nsegs, BUS_DMA_NOWAIT);
if (error == EFBIG) {
- m = m_collapse(m, M_DONTWAIT, BGE_NSEG_NEW);
+ m = m_collapse(m, M_NOWAIT, BGE_NSEG_NEW);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
Modified: trunk/sys/dev/bm/if_bm.c
===================================================================
--- trunk/sys/dev/bm/if_bm.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/bm/if_bm.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -540,7 +540,7 @@
ifp = sc->sc_ifp;
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
return;
@@ -794,7 +794,7 @@
*m_head, segs, &nsegs, BUS_DMA_NOWAIT);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, nsegs);
+ m = m_collapse(*m_head, M_NOWAIT, nsegs);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
@@ -1239,7 +1239,7 @@
bus_dma_segment_t segs[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 = m->m_ext.ext_size;
Modified: trunk/sys/dev/bxe/if_bxe.c
===================================================================
--- trunk/sys/dev/bxe/if_bxe.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/bxe/if_bxe.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -3752,7 +3752,7 @@
if (fp != NULL) {
fp->br = buf_ring_alloc(BXE_BR_SIZE,
- M_DEVBUF, M_DONTWAIT, &fp->mtx);
+ M_DEVBUF, M_NOWAIT, &fp->mtx);
if (fp->br == NULL) {
rc = ENOMEM;
goto bxe_alloc_buf_rings_exit;
@@ -8955,7 +8955,7 @@
} else if (error == EFBIG) {
/* Possibly recoverable with defragmentation. */
fp->mbuf_defrag_attempts++;
- m0 = m_defrag(*m_head, M_DONTWAIT);
+ m0 = m_defrag(*m_head, M_NOWAIT);
if (m0 == NULL) {
fp->mbuf_defrag_failures++;
rc = ENOBUFS;
@@ -10462,7 +10462,7 @@
#endif
/* Allocate the new TPA mbuf. */
- m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, sc->mbuf_alloc_size);
+ m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, sc->mbuf_alloc_size);
if (__predict_false(m == NULL)) {
fp->mbuf_tpa_alloc_failed++;
rc = ENOBUFS;
@@ -10656,7 +10656,7 @@
#endif
/* Allocate a new SGE mbuf. */
- m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, SGE_PAGE_SIZE);
+ m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, SGE_PAGE_SIZE);
if (__predict_false(m == NULL)) {
fp->mbuf_sge_alloc_failed++;
rc = ENOMEM;
@@ -10846,7 +10846,7 @@
#endif
/* Allocate the new RX BD mbuf. */
- m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, sc->mbuf_alloc_size);
+ m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, sc->mbuf_alloc_size);
if (__predict_false(m == NULL)) {
fp->mbuf_rx_bd_alloc_failed++;
rc = ENOBUFS;
Modified: trunk/sys/dev/cm/smc90cx6.c
===================================================================
--- trunk/sys/dev/cm/smc90cx6.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/cm/smc90cx6.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/dev/cm/smc90cx6.c,v 1.2 2008/12/02 02:24:38 laffer1 Exp $ */
+/* $MidnightBSD$ */
/* $NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */
#include <sys/cdefs.h>
@@ -503,7 +503,7 @@
buffer = sc->sc_rx_act ^ 1;
/* Allocate header mbuf */
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == 0) {
/*
@@ -540,7 +540,7 @@
*/
if ((len + 2 + 2) > MHLEN) {
/* attach an mbuf cluster */
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
/* Insist on getting a cluster */
if ((m->m_flags & M_EXT) == 0) {
Modified: trunk/sys/dev/cp/if_cp.c
===================================================================
--- trunk/sys/dev/cp/if_cp.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/cp/if_cp.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/dev/cp/if_cp.c,v 1.2 2008/12/02 02:24:39 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Cronyx-Tau-PCI adapter driver for FreeBSD.
* Supports PPP/HDLC, Cisco/HDLC and FrameRelay protocol in synchronous mode,
@@ -204,10 +204,10 @@
{
struct mbuf *m;
- MGETHDR (m, M_DONTWAIT, MT_DATA);
+ MGETHDR (m, M_NOWAIT, MT_DATA);
if (! m)
return 0;
- MCLGET (m, M_DONTWAIT);
+ MCLGET (m, M_NOWAIT);
if (! (m->m_flags & M_EXT)) {
m_freem (m);
return 0;
Modified: trunk/sys/dev/cs/if_cs.c
===================================================================
--- trunk/sys/dev/cs/if_cs.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/cs/if_cs.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/dev/cs/if_cs.c,v 1.2 2008/12/02 02:24:39 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997,1998 Maxim Bolotin and Oleg Sharoiko.
* All rights reserved.
@@ -727,12 +727,12 @@
return (-1);
}
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m==NULL)
return (-1);
if (length > MHLEN) {
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if (!(m->m_flags & M_EXT)) {
m_freem(m);
return (-1);
Modified: trunk/sys/dev/ctau/if_ct.c
===================================================================
--- trunk/sys/dev/ctau/if_ct.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/ctau/if_ct.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/dev/ctau/if_ct.c,v 1.2 2008/12/02 02:24:40 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Cronyx-Tau adapter driver for FreeBSD.
* Supports PPP/HDLC and Cisco/HDLC protocol in synchronous mode,
@@ -206,10 +206,10 @@
{
struct mbuf *m;
- MGETHDR (m, M_DONTWAIT, MT_DATA);
+ MGETHDR (m, M_NOWAIT, MT_DATA);
if (! m)
return 0;
- MCLGET (m, M_DONTWAIT);
+ MCLGET (m, M_NOWAIT);
if (! (m->m_flags & M_EXT)) {
m_freem (m);
return 0;
Modified: trunk/sys/dev/cx/if_cx.c
===================================================================
--- trunk/sys/dev/cx/if_cx.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/cx/if_cx.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -252,13 +252,13 @@
{
struct mbuf *m, *o, *p;
- MGETHDR (m, M_DONTWAIT, MT_DATA);
+ MGETHDR (m, M_NOWAIT, MT_DATA);
if (! m)
return 0;
if (len >= MINCLSIZE)
- MCLGET (m, M_DONTWAIT);
+ MCLGET (m, M_NOWAIT);
m->m_pkthdr.len = len;
m->m_len = 0;
@@ -271,13 +271,13 @@
if (! n) {
/* Allocate new mbuf. */
o = p;
- MGET (p, M_DONTWAIT, MT_DATA);
+ MGET (p, M_NOWAIT, MT_DATA);
if (! p) {
m_freem (m);
return 0;
}
if (len >= MINCLSIZE)
- MCLGET (p, M_DONTWAIT);
+ MCLGET (p, M_NOWAIT);
p->m_len = 0;
o->m_next = p;
Modified: trunk/sys/dev/ed/if_ed.c
===================================================================
--- trunk/sys/dev/ed/if_ed.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/ed/if_ed.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1268,7 +1268,7 @@
struct mbuf *m;
/* Allocate a header mbuf */
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
return;
m->m_pkthdr.rcvif = ifp;
@@ -1282,7 +1282,7 @@
*/
if ((len + 2) > MHLEN) {
/* Attach an mbuf cluster */
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
/* Insist on getting a cluster */
if ((m->m_flags & M_EXT) == 0) {
Modified: trunk/sys/dev/en/midway.c
===================================================================
--- trunk/sys/dev/en/midway.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/en/midway.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -837,15 +837,15 @@
{
struct mbuf *new;
- MGET(new, M_WAIT, MT_DATA);
+ MGET(new, M_WAITOK, MT_DATA);
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);
@@ -1925,7 +1925,7 @@
* words at the begin.
*/
/* called from interrupt context */
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
return (NULL);
@@ -1940,7 +1940,7 @@
totlen -= m->m_len;
/* called from interrupt context */
- tmp = m_getm(m, totlen, M_DONTWAIT, MT_DATA);
+ tmp = m_getm(m, totlen, M_NOWAIT, MT_DATA);
if (tmp == NULL) {
m_free(m);
return (NULL);
@@ -2924,7 +2924,7 @@
&en_utopia_methods);
utopia_init_media(&sc->utopia);
- MGET(sc->padbuf, M_WAIT, MT_DATA);
+ MGET(sc->padbuf, M_WAITOK, MT_DATA);
bzero(sc->padbuf->m_data, MLEN);
if (bus_dma_tag_create(bus_get_dma_tag(sc->dev), 1, 0,
Modified: trunk/sys/dev/ep/if_ep.c
===================================================================
--- trunk/sys/dev/ep/if_ep.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/ep/if_ep.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -747,11 +747,11 @@
rx_fifo = rx_fifo2 = status & RX_BYTES_MASK;
if (EP_FTST(sc, F_RX_FIRST)) {
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (!m)
goto out;
if (rx_fifo >= MINCLSIZE)
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
sc->top = sc->mcur = top = m;
#define EROUND ((sizeof(struct ether_header) + 3) & ~3)
#define EOFF (EROUND - sizeof(struct ether_header))
@@ -775,11 +775,11 @@
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, M_NOWAIT, MT_DATA);
if (!m)
goto out;
if (rx_fifo >= MINCLSIZE)
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
m->m_len = 0;
mcur->m_next = m;
lenthisone = min(rx_fifo, M_TRAILINGSPACE(m));
Modified: trunk/sys/dev/et/if_et.c
===================================================================
--- trunk/sys/dev/et/if_et.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/et/if_et.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -2169,7 +2169,7 @@
error = bus_dmamap_load_mbuf_sg(sc->sc_tx_tag, map, *m0, segs, &nsegs,
0);
if (error == EFBIG) {
- m = m_collapse(*m0, M_DONTWAIT, ET_NSEG_MAX);
+ m = m_collapse(*m0, M_NOWAIT, ET_NSEG_MAX);
if (m == NULL) {
m_freem(*m0);
*m0 = NULL;
@@ -2331,7 +2331,7 @@
int nsegs;
MPASS(buf_idx < ET_RX_NDESC);
- 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;
@@ -2390,7 +2390,7 @@
int nsegs;
MPASS(buf_idx < ET_RX_NDESC);
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
return (ENOBUFS);
m->m_len = m->m_pkthdr.len = MHLEN;
Modified: trunk/sys/dev/ex/if_ex.c
===================================================================
--- trunk/sys/dev/ex/if_ex.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/ex/if_ex.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -734,7 +734,7 @@
QQQ = pkt_len = CSR_READ_2(sc, IO_PORT_REG);
if (rx_status & RCV_OK_bit) {
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
ipkt = m;
if (ipkt == NULL) {
ifp->if_iqdrops++;
@@ -745,7 +745,7 @@
while (pkt_len > 0) {
if (pkt_len >= MINCLSIZE) {
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if (m->m_flags & M_EXT) {
m->m_len = MCLBYTES;
} else {
@@ -770,7 +770,7 @@
pkt_len -= m->m_len;
if (pkt_len > 0) {
- MGET(m->m_next, M_DONTWAIT, MT_DATA);
+ MGET(m->m_next, M_NOWAIT, MT_DATA);
if (m->m_next == NULL) {
m_freem(ipkt);
ifp->if_iqdrops++;
Modified: trunk/sys/dev/fatm/if_fatm.c
===================================================================
--- trunk/sys/dev/fatm/if_fatm.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/fatm/if_fatm.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1098,7 +1098,7 @@
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;
@@ -1188,7 +1188,7 @@
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;
@@ -1767,7 +1767,7 @@
{
struct mbuf *new;
- MGET(new, M_DONTWAIT, MT_DATA);
+ MGET(new, M_NOWAIT, MT_DATA);
if (new == NULL)
return (NULL);
@@ -1774,10 +1774,10 @@
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);
Modified: trunk/sys/dev/fe/if_fe.c
===================================================================
--- trunk/sys/dev/fe/if_fe.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/fe/if_fe.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1870,13 +1870,13 @@
*/
/* Allocate an mbuf with packet header info. */
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, 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, M_NOWAIT);
if (!(m->m_flags & M_EXT)) {
m_freem(m);
return -1;
Modified: trunk/sys/dev/firewire/fwohci.c
===================================================================
--- trunk/sys/dev/firewire/fwohci.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/firewire/fwohci.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -977,7 +977,7 @@
if (firewire_debug)
device_printf(sc->fc.dev, "EFBIG.\n");
- m0 = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m0 = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m0 != NULL) {
m_copydata(xfer->mbuf, 0,
xfer->mbuf->m_pkthdr.len,
Modified: trunk/sys/dev/firewire/if_fwe.c
===================================================================
--- trunk/sys/dev/firewire/if_fwe.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/firewire/if_fwe.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -358,7 +358,7 @@
STAILQ_INIT(&xferq->stdma);
xferq->stproc = NULL;
for (i = 0; i < xferq->bnchunk; i ++) {
- m = m_getcl(M_WAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR);
xferq->bulkxfer[i].mbuf = m;
m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
STAILQ_INSERT_TAIL(&xferq->stfree,
@@ -607,7 +607,7 @@
#endif
/* keep ip packet alignment for alpha */
- M_PREPEND(m, ETHER_ALIGN, M_DONTWAIT);
+ M_PREPEND(m, ETHER_ALIGN, M_NOWAIT);
fp = &xfer->send.hdr;
*(uint32_t *)&xfer->send.hdr = *(int32_t *)&fwe->pkt_hdr;
fp->mode.stream.len = m->m_pkthdr.len;
@@ -658,7 +658,7 @@
m = sxfer->mbuf;
/* insert new rbuf */
- sxfer->mbuf = m0 = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ sxfer->mbuf = m0 = m_getcl(M_NOWAIT, 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);
Modified: trunk/sys/dev/firewire/if_fwip.c
===================================================================
--- trunk/sys/dev/firewire/if_fwip.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/firewire/if_fwip.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -333,7 +333,7 @@
STAILQ_INIT(&xferq->stdma);
xferq->stproc = NULL;
for (i = 0; i < xferq->bnchunk; i ++) {
- m = m_getcl(M_WAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR);
xferq->bulkxfer[i].mbuf = m;
m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
STAILQ_INSERT_TAIL(&xferq->stfree,
@@ -349,7 +349,7 @@
xfer = fw_xfer_alloc(M_FWIP);
if (xfer == NULL)
break;
- m = m_getcl(M_WAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR);
xfer->recv.payload = mtod(m, uint32_t *);
xfer->recv.pay_len = MCLBYTES;
xfer->hand = fwip_unicast_input;
@@ -657,7 +657,7 @@
*/
uint32_t *p;
- M_PREPEND(m, 2*sizeof(uint32_t), M_DONTWAIT);
+ M_PREPEND(m, 2*sizeof(uint32_t), M_NOWAIT);
p = mtod(m, uint32_t *);
fp->mode.stream.len = m->m_pkthdr.len;
fp->mode.stream.chtag = broadcast_channel;
@@ -778,7 +778,7 @@
m = sxfer->mbuf;
/* insert new rbuf */
- sxfer->mbuf = m0 = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ sxfer->mbuf = m0 = m_getcl(M_NOWAIT, 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);
@@ -871,7 +871,7 @@
* We have finished with a unicast xfer. Allocate a new
* cluster and stick it on the back of the input queue.
*/
- m = m_getcl(M_WAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR);
xfer->mbuf = m;
xfer->recv.payload = mtod(m, uint32_t *);
xfer->recv.pay_len = MCLBYTES;
Modified: trunk/sys/dev/hatm/if_hatm_intr.c
===================================================================
--- trunk/sys/dev/hatm/if_hatm_intr.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/hatm/if_hatm_intr.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -330,7 +330,7 @@
if (large) {
/* allocate the MBUF */
- if ((m = m_getcl(M_DONTWAIT, MT_DATA,
+ if ((m = m_getcl(M_NOWAIT, MT_DATA,
M_PKTHDR)) == NULL) {
if_printf(sc->ifp,
"no mbuf clusters\n");
@@ -437,7 +437,7 @@
DBG(sc, RX, ("RX group=%u handle=%x page=%u chunk=%u", group, handle,
pageno, chunkno));
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (group == 0) {
struct mbuf0_chunk *c0;
Modified: trunk/sys/dev/hatm/if_hatm_tx.c
===================================================================
--- trunk/sys/dev/hatm/if_hatm_tx.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/hatm/if_hatm_tx.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -466,7 +466,7 @@
if (error == EFBIG) {
/* try to defragment the packet */
sc->istats.defrag++;
- m = m_defrag(m, M_DONTWAIT);
+ m = m_defrag(m, M_NOWAIT);
if (m == NULL) {
tpd->mbuf = NULL;
hatm_free_txmbuf(sc);
Modified: trunk/sys/dev/ie/if_ie.c
===================================================================
--- trunk/sys/dev/ie/if_ie.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/ie/if_ie.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -696,7 +696,7 @@
return (-1);
}
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (!m) {
ie_drop_packet_buffer(sc);
/* XXXX if_ierrors++; */
@@ -725,7 +725,7 @@
* single mbuf which may or may not be big enough. Got that?
*/
if (top) {
- MGET(m, M_DONTWAIT, MT_DATA);
+ MGET(m, M_NOWAIT, MT_DATA);
if (!m) {
m_freem(top);
ie_drop_packet_buffer(sc);
@@ -734,7 +734,7 @@
m->m_len = MLEN;
}
if (resid >= MINCLSIZE) {
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if (m->m_flags & M_EXT)
m->m_len = min(resid, MCLBYTES);
} else {
Modified: trunk/sys/dev/ipw/if_ipw.c
===================================================================
--- trunk/sys/dev/ipw/if_ipw.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/ipw/if_ipw.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -709,7 +709,7 @@
sbuf = &sc->rx_sbuf_list[i];
sbd->bd = &sc->rbd_list[i];
- sbuf->m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ sbuf->m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (sbuf->m == NULL) {
device_printf(sc->sc_dev,
"could not allocate rx mbuf\n");
@@ -1207,7 +1207,7 @@
* drop the received packet and reuse the old mbuf. In the unlikely
* case that the old mbuf can't be reloaded either, explicitly panic.
*/
- mnew = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ mnew = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (mnew == NULL) {
ifp->if_ierrors++;
return;
@@ -1651,7 +1651,7 @@
return error;
}
if (error != 0) {
- mnew = m_defrag(m0, M_DONTWAIT);
+ mnew = m_defrag(m0, M_NOWAIT);
if (mnew == NULL) {
device_printf(sc->sc_dev,
"could not defragment mbuf\n");
Modified: trunk/sys/dev/iwi/if_iwi.c
===================================================================
--- trunk/sys/dev/iwi/if_iwi.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/iwi/if_iwi.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -787,7 +787,7 @@
goto fail;
}
- data->m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ data->m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (data->m == NULL) {
device_printf(sc->sc_dev,
"could not allocate rx mbuf\n");
@@ -1235,7 +1235,7 @@
* drop the received packet and reuse the old mbuf. In the unlikely
* case that the old mbuf can't be reloaded either, explicitly panic.
*/
- mnew = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ mnew = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (mnew == NULL) {
ifp->if_ierrors++;
return;
@@ -1883,7 +1883,7 @@
return error;
}
if (error != 0) {
- mnew = m_defrag(m0, M_DONTWAIT);
+ mnew = m_defrag(m0, M_NOWAIT);
if (mnew == NULL) {
device_printf(sc->sc_dev,
"could not defragment mbuf\n");
Modified: trunk/sys/dev/iwn/if_iwn.c
===================================================================
--- trunk/sys/dev/iwn/if_iwn.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/iwn/if_iwn.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1375,7 +1375,7 @@
goto fail;
}
- data->m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR,
+ data->m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR,
IWN_RBUF_SIZE);
if (data->m == NULL) {
device_printf(sc->sc_dev,
@@ -2332,7 +2332,7 @@
return;
}
- m1 = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, IWN_RBUF_SIZE);
+ m1 = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, IWN_RBUF_SIZE);
if (m1 == NULL) {
DPRINTF(sc, IWN_DEBUG_ANY, "%s: no mbuf to restock ring\n",
__func__);
@@ -3537,7 +3537,7 @@
return error;
}
/* Too many DMA segments, linearize mbuf. */
- m1 = m_collapse(m, M_DONTWAIT, IWN_MAX_SCATTER);
+ m1 = m_collapse(m, M_NOWAIT, IWN_MAX_SCATTER);
if (m1 == NULL) {
device_printf(sc->sc_dev,
"%s: could not defrag mbuf\n", __func__);
@@ -3741,7 +3741,7 @@
return error;
}
/* Too many DMA segments, linearize mbuf. */
- m1 = m_collapse(m, M_DONTWAIT, IWN_MAX_SCATTER);
+ m1 = m_collapse(m, M_NOWAIT, IWN_MAX_SCATTER);
if (m1 == NULL) {
device_printf(sc->sc_dev,
"%s: could not defrag mbuf\n", __func__);
@@ -3974,7 +3974,7 @@
/* Command is too large to fit in a descriptor. */
if (totlen > MCLBYTES)
return EINVAL;
- m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
+ m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
if (m == NULL)
return ENOMEM;
cmd = mtod(m, struct iwn_tx_cmd *);
Modified: trunk/sys/dev/ixgb/if_ixgb.c
===================================================================
--- trunk/sys/dev/ixgb/if_ixgb.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/ixgb/if_ixgb.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1791,7 +1791,7 @@
if (mp == NULL) {
- mp = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ mp = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (mp == NULL) {
adapter->mbuf_alloc_failed++;
Modified: trunk/sys/dev/jme/if_jme.c
===================================================================
--- trunk/sys/dev/jme/if_jme.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/jme/if_jme.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1712,7 +1712,7 @@
if (M_WRITABLE(*m_head) == 0) {
/* Get a writable copy. */
- m = m_dup(*m_head, M_DONTWAIT);
+ m = m_dup(*m_head, M_NOWAIT);
m_freem(*m_head);
if (m == NULL) {
*m_head = NULL;
@@ -1774,7 +1774,7 @@
error = bus_dmamap_load_mbuf_sg(sc->jme_cdata.jme_tx_tag,
txd->tx_dmamap, *m_head, txsegs, &nsegs, 0);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, JME_MAXTXSEGS);
+ m = m_collapse(*m_head, M_NOWAIT, JME_MAXTXSEGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
@@ -3181,7 +3181,7 @@
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);
/*
Modified: trunk/sys/dev/le/lance.c
===================================================================
--- trunk/sys/dev/le/lance.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/le/lance.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -394,7 +394,7 @@
return (NULL);
}
- MGETHDR(m0, M_DONTWAIT, MT_DATA);
+ MGETHDR(m0, M_NOWAIT, MT_DATA);
if (m0 == NULL)
return (NULL);
m0->m_pkthdr.rcvif = ifp;
@@ -404,7 +404,7 @@
while (totlen > 0) {
if (totlen >= MINCLSIZE) {
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if ((m->m_flags & M_EXT) == 0)
goto bad;
len = MCLBYTES;
@@ -423,7 +423,7 @@
totlen -= len;
if (totlen > 0) {
- MGET(newm, M_DONTWAIT, MT_DATA);
+ MGET(newm, M_NOWAIT, MT_DATA);
if (newm == 0)
goto bad;
len = MLEN;
Modified: trunk/sys/dev/lmc/if_lmc.c
===================================================================
--- trunk/sys/dev/lmc/if_lmc.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/lmc/if_lmc.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -2916,7 +2916,7 @@
/* Optimization: copy a small pkt into a small mbuf. */
if (first_mbuf->m_pkthdr.len <= COPY_BREAK)
{
- MGETHDR(new_mbuf, M_DONTWAIT, MT_DATA);
+ MGETHDR(new_mbuf, M_NOWAIT, MT_DATA);
if (new_mbuf != NULL)
{
new_mbuf->m_pkthdr.rcvif = first_mbuf->m_pkthdr.rcvif;
@@ -3016,7 +3016,7 @@
return 0; /* ring is full; nothing to do */
/* Allocate a small mbuf and attach an mbuf cluster. */
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
{
sc->status.cntrs.rxdma++;
@@ -3024,7 +3024,7 @@
printf("%s: rxintr_setup: MGETHDR() failed\n", NAME_UNIT);
return 0;
}
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if ((m->m_flags & M_EXT) == 0)
{
m_freem(m);
Modified: trunk/sys/dev/malo/if_malo.c
===================================================================
--- trunk/sys/dev/malo/if_malo.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/malo/if_malo.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -854,7 +854,7 @@
*/
if (error == EFBIG) { /* too many desc's, linearize */
sc->malo_stats.mst_tx_linear++;
- m = m_defrag(m0, M_DONTWAIT);
+ m = m_defrag(m0, M_NOWAIT);
if (m == NULL) {
m_freem(m0);
sc->malo_stats.mst_tx_nombuf++;
@@ -1396,7 +1396,7 @@
int error;
/* XXX don't need mbuf, just dma buffer */
- m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
+ m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE);
if (m == NULL) {
sc->malo_stats.mst_rx_nombuf++; /* XXX */
return NULL;
Modified: trunk/sys/dev/mn/if_mn.c
===================================================================
--- trunk/sys/dev/mn/if_mn.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/mn/if_mn.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -693,7 +693,7 @@
/* 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, M_WAITOK, MT_DATA);
m->m_pkthdr.len = 0;
dp->m = m;
dp->flags = 0xc0000000 + (1 << 16);
@@ -708,8 +708,8 @@
dp = mn_alloc_desc();
m = NULL;
- MGETHDR(m, M_WAIT, MT_DATA);
- MCLGET(m, M_WAIT);
+ MGETHDR(m, M_WAITOK, MT_DATA);
+ MCLGET(m, M_WAITOK);
dp->m = m;
dp->data = vtophys(m->m_data);
dp->flags = 0x40000000;
@@ -722,8 +722,8 @@
dp2 = dp;
dp = mn_alloc_desc();
m = NULL;
- MGETHDR(m, M_WAIT, MT_DATA);
- MCLGET(m, M_WAIT);
+ MGETHDR(m, M_WAITOK, MT_DATA);
+ MCLGET(m, M_WAITOK);
dp->m = m;
dp->data = vtophys(m->m_data);
dp->flags = 0x00000000;
@@ -1160,12 +1160,12 @@
/* Replenish desc + mbuf supplies */
if (!m) {
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
mn_free_desc(dp);
return; /* ENOBUFS */
}
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if((m->m_flags & M_EXT) == 0) {
mn_free_desc(dp);
m_freem(m);
Modified: trunk/sys/dev/mwl/if_mwl.c
===================================================================
--- trunk/sys/dev/mwl/if_mwl.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/mwl/if_mwl.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -2803,7 +2803,7 @@
* be a net loss. The tradeoff might be system
* dependent (cache architecture is important).
*/
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
DPRINTF(sc, MWL_DEBUG_ANY,
"%s: no rx mbuf\n", __func__);
@@ -3080,9 +3080,9 @@
if (error == EFBIG) { /* too many desc's, linearize */
sc->sc_stats.mst_tx_linear++;
#if MWL_TXDESC > 1
- m = m_collapse(m0, M_DONTWAIT, MWL_TXDESC);
+ m = m_collapse(m0, M_NOWAIT, MWL_TXDESC);
#else
- m = m_defrag(m0, M_DONTWAIT);
+ m = m_defrag(m0, M_NOWAIT);
#endif
if (m == NULL) {
m_freem(m0);
Modified: trunk/sys/dev/mxge/if_mxge.c
===================================================================
--- trunk/sys/dev/mxge/if_mxge.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/mxge/if_mxge.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -2047,7 +2047,7 @@
{
struct ether_vlan_header *evl;
- M_PREPEND(m, ETHER_VLAN_ENCAP_LEN, M_DONTWAIT);
+ M_PREPEND(m, ETHER_VLAN_ENCAP_LEN, M_NOWAIT);
if (__predict_false(m == NULL))
return NULL;
if (m->m_len < sizeof(*evl)) {
@@ -2418,7 +2418,7 @@
mxge_rx_ring_t *rx = &ss->rx_small;
int cnt, err;
- m = m_gethdr(M_DONTWAIT, MT_DATA);
+ m = m_gethdr(M_NOWAIT, MT_DATA);
if (m == NULL) {
rx->alloc_fail++;
err = ENOBUFS;
@@ -2451,7 +2451,7 @@
mxge_rx_ring_t *rx = &ss->rx_big;
int cnt, err, i;
- m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, rx->cl_size);
+ m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, rx->cl_size);
if (m == NULL) {
rx->alloc_fail++;
err = ENOBUFS;
Modified: trunk/sys/dev/nfe/if_nfe.c
===================================================================
--- trunk/sys/dev/nfe/if_nfe.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/nfe/if_nfe.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1975,7 +1975,7 @@
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);
@@ -2031,7 +2031,7 @@
bus_dmamap_t map;
int nsegs;
- m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUM9BYTES);
+ m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUM9BYTES);
if (m == NULL)
return (ENOBUFS);
if ((m->m_flags & M_EXT) == 0) {
@@ -2400,7 +2400,7 @@
error = bus_dmamap_load_mbuf_sg(sc->txq.tx_data_tag, map, *m_head, segs,
&nsegs, BUS_DMA_NOWAIT);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, NFE_MAX_SCATTER);
+ m = m_collapse(*m_head, M_NOWAIT, NFE_MAX_SCATTER);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
Modified: trunk/sys/dev/nve/if_nve.c
===================================================================
--- trunk/sys/dev/nve/if_nve.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/nve/if_nve.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -765,7 +765,7 @@
struct nve_rx_desc *desc = sc->rx_desc + i;
struct nve_map_buffer *buf = &desc->buf;
- buf->mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ buf->mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (buf->mbuf == NULL) {
device_printf(sc->dev, "couldn't allocate mbuf\n");
nve_free_rings(sc);
@@ -919,7 +919,7 @@
* cluster
*/
if (error) {
- m = m_defrag(m0, M_DONTWAIT);
+ m = m_defrag(m0, M_NOWAIT);
if (m == NULL) {
m_freem(m0);
sc->tx_errors++;
@@ -1481,7 +1481,7 @@
buf = &desc->buf;
if (buf->mbuf == NULL) {
- buf->mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ buf->mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (buf->mbuf == NULL) {
device_printf(sc->dev, "failed to allocate memory\n");
goto fail;
Modified: trunk/sys/dev/nxge/if_nxge.c
===================================================================
--- trunk/sys/dev/nxge/if_nxge.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/nxge/if_nxge.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -3024,7 +3024,7 @@
}
if(count >= max_fragments) {
- m_buf = m_defrag(m_head, M_DONTWAIT);
+ m_buf = m_defrag(m_head, M_NOWAIT);
if(m_buf != NULL) m_head = m_buf;
XGE_DRV_STATS(tx_defrag);
}
@@ -3132,7 +3132,7 @@
if(buffer_size <= MCLBYTES) {
cluster_size = MCLBYTES;
- mp = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ mp = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
}
else {
cluster_size = MJUMPAGESIZE;
@@ -3140,7 +3140,7 @@
(buffer_size > MJUMPAGESIZE)) {
cluster_size = MJUM9BYTES;
}
- mp = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, cluster_size);
+ mp = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, cluster_size);
}
if(!mp) {
xge_trace(XGE_ERR, "Out of memory to allocate mbuf");
Modified: trunk/sys/dev/patm/if_patm_intr.c
===================================================================
--- trunk/sys/dev/patm/if_patm_intr.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/patm/if_patm_intr.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -324,7 +324,7 @@
struct mbuf *m;
struct lmbuf *b;
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL)
return (NULL);
m->m_data += LMBUF_OFFSET;
Modified: trunk/sys/dev/patm/if_patm_rx.c
===================================================================
--- trunk/sys/dev/patm/if_patm_rx.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/patm/if_patm_rx.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -396,9 +396,9 @@
return ((struct mbuf *)buf);
if (hdr)
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
else
- MGET(m, M_DONTWAIT, MT_DATA);
+ MGET(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
patm_rcv_free(sc, buf, h);
return (NULL);
@@ -458,7 +458,7 @@
}
}
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
sc->stats.raw_no_buf++;
return;
Modified: trunk/sys/dev/patm/if_patm_tx.c
===================================================================
--- trunk/sys/dev/patm/if_patm_tx.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/patm/if_patm_tx.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -438,7 +438,7 @@
return (m0);
}
}
- MGET(m, M_DONTWAIT, MT_DATA);
+ MGET(m, M_NOWAIT, MT_DATA);
if (m == 0) {
m_freem(m0);
sc->ifp->if_oerrors++;
@@ -532,7 +532,7 @@
error = bus_dmamap_load_mbuf(sc->tx_tag, map->map, m,
patm_load_txbuf, &a, BUS_DMA_NOWAIT);
if (error == EFBIG) {
- if ((m = m_defrag(m, M_DONTWAIT)) == NULL) {
+ if ((m = m_defrag(m, M_NOWAIT)) == NULL) {
sc->ifp->if_oerrors++;
continue;
}
Modified: trunk/sys/dev/pcn/if_pcn.c
===================================================================
--- trunk/sys/dev/pcn/if_pcn.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/pcn/if_pcn.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -798,11 +798,11 @@
c = &sc->pcn_ldata->pcn_rx_list[idx];
if (m == NULL) {
- MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+ MGETHDR(m_new, M_NOWAIT, MT_DATA);
if (m_new == NULL)
return(ENOBUFS);
- MCLGET(m_new, M_DONTWAIT);
+ MCLGET(m_new, M_NOWAIT);
if (!(m_new->m_flags & M_EXT)) {
m_freem(m_new);
return(ENOBUFS);
Modified: trunk/sys/dev/pdq/pdq_freebsd.h
===================================================================
--- trunk/sys/dev/pdq/pdq_freebsd.h 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/pdq/pdq_freebsd.h 2016-09-26 22:58:24 UTC (rev 8931)
@@ -187,9 +187,9 @@
#define PDQ_OS_DATABUF_ALLOC(pdq, b) do { \
PDQ_OS_DATABUF_T *x_m0; \
- MGETHDR(x_m0, M_DONTWAIT, MT_DATA); \
+ MGETHDR(x_m0, M_NOWAIT, MT_DATA); \
if (x_m0 != NULL) { \
- MCLGET(x_m0, M_DONTWAIT); \
+ MCLGET(x_m0, M_NOWAIT); \
if ((x_m0->m_flags & M_EXT) == 0) { \
m_free(x_m0); \
(b) = NULL; \
Modified: trunk/sys/dev/pdq/pdq_ifsubr.c
===================================================================
--- trunk/sys/dev/pdq/pdq_ifsubr.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/pdq/pdq_ifsubr.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -742,12 +742,12 @@
struct mbuf *m;
bus_dmamap_t map;
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
printf("%s: can't alloc small buf\n", sc->sc_dev.dv_xname);
return NULL;
}
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if ((m->m_flags & M_EXT) == 0) {
printf("%s: can't alloc cluster\n", sc->sc_dev.dv_xname);
m_free(m);
Modified: trunk/sys/dev/pdq/pdqvar.h
===================================================================
--- trunk/sys/dev/pdq/pdqvar.h 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/pdq/pdqvar.h 2016-09-26 22:58:24 UTC (rev 8931)
@@ -214,9 +214,9 @@
#ifndef PDQ_OS_DATABUF_ALLOC
#define PDQ_OS_DATABUF_ALLOC(pdq, b) do { \
PDQ_OS_DATABUF_T *x_m0; \
- MGETHDR(x_m0, M_DONTWAIT, MT_DATA); \
+ MGETHDR(x_m0, M_NOWAIT, MT_DATA); \
if (x_m0 != NULL) { \
- MCLGET(x_m0, M_DONTWAIT); \
+ MCLGET(x_m0, M_NOWAIT); \
if ((x_m0->m_flags & M_EXT) == 0) { \
m_free(x_m0); \
(b) = NULL; \
Modified: trunk/sys/dev/qlxgb/qla_os.c
===================================================================
--- trunk/sys/dev/qlxgb/qla_os.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/qlxgb/qla_os.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1064,7 +1064,7 @@
QL_DPRINT8((ha->pci_dev, "%s: EFBIG [%d]\n", __func__,
m_head->m_pkthdr.len));
- m = m_defrag(m_head, M_DONTWAIT);
+ m = m_defrag(m_head, M_NOWAIT);
if (m == NULL) {
ha->err_tx_defrag++;
m_freem(m_head);
@@ -1406,7 +1406,7 @@
if (mp == NULL) {
if (!jumbo) {
- mp = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ mp = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (mp == NULL) {
ha->err_m_getcl++;
@@ -1417,7 +1417,7 @@
}
mp->m_len = mp->m_pkthdr.len = MCLBYTES;
} else {
- mp = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR,
+ mp = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR,
MJUM9BYTES);
if (mp == NULL) {
ha->err_m_getjcl++;
Modified: trunk/sys/dev/rt/if_rt.c
===================================================================
--- trunk/sys/dev/rt/if_rt.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/rt/if_rt.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -893,7 +893,7 @@
"mbuf: ndmasegs=%d, len=%d, error=%d\n",
ndmasegs, m->m_pkthdr.len, error);
- m_d = m_collapse(m, M_DONTWAIT, 16);
+ m_d = m_collapse(m, M_NOWAIT, 16);
if (m_d == NULL) {
m_freem(m);
m = NULL;
@@ -1638,7 +1638,7 @@
nframes++;
- mnew = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR,
+ mnew = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR,
MJUMPAGESIZE);
if (mnew == NULL) {
sc->rx_mbuf_alloc_errors++;
@@ -2010,7 +2010,7 @@
goto fail;
}
- data->m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR,
+ data->m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR,
MJUMPAGESIZE);
if (data->m == NULL) {
device_printf(sc->dev, "could not allocate Rx mbuf\n");
Modified: trunk/sys/dev/sbni/if_sbni.c
===================================================================
--- trunk/sys/dev/sbni/if_sbni.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/sbni/if_sbni.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -863,7 +863,7 @@
{
struct mbuf *m;
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
if_printf(sc->ifp, "cannot allocate header mbuf\n");
return (0);
@@ -877,7 +877,7 @@
*/
if (ETHER_MAX_LEN + 2 > MHLEN) {
/* Attach an mbuf cluster */
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if ((m->m_flags & M_EXT) == 0) {
m_freem(m);
return (0);
Modified: trunk/sys/dev/sf/if_sf.c
===================================================================
--- trunk/sys/dev/sf/if_sf.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/sf/if_sf.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1455,7 +1455,7 @@
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;
@@ -2173,7 +2173,7 @@
error = bus_dmamap_load_mbuf_sg(sc->sf_cdata.sf_tx_tag, map,
*m_head, txsegs, &nsegs, BUS_DMA_NOWAIT);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, SF_MAXTXSEGS);
+ m = m_collapse(*m_head, M_NOWAIT, SF_MAXTXSEGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
Modified: trunk/sys/dev/sfxge/sfxge_dma.c
===================================================================
--- trunk/sys/dev/sfxge/sfxge_dma.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/sfxge/sfxge_dma.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -97,7 +97,7 @@
goto err_out;
} else if (err == EFBIG || seg_count >= maxsegs) {
if (!defragged) {
- m = m_defrag(*mp, M_DONTWAIT);
+ m = m_defrag(*mp, M_NOWAIT);
if (m == NULL) {
err = ENOBUFS;
goto err_out;
Modified: trunk/sys/dev/sfxge/sfxge_tx.c
===================================================================
--- trunk/sys/dev/sfxge/sfxge_tx.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/sfxge/sfxge_tx.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -262,7 +262,7 @@
mbuf, dma_seg, &n_dma_seg, 0);
if (rc == EFBIG) {
/* Try again. */
- struct mbuf *new_mbuf = m_collapse(mbuf, M_DONTWAIT,
+ struct mbuf *new_mbuf = m_collapse(mbuf, M_NOWAIT,
SFXGE_TX_MAPPING_MAX_SEG);
if (new_mbuf == NULL)
goto reject;
Modified: trunk/sys/dev/sge/if_sge.c
===================================================================
--- trunk/sys/dev/sge/if_sge.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/sge/if_sge.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1083,7 +1083,7 @@
SGE_LOCK_ASSERT(sc);
cd = &sc->sge_cdata;
- 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;
@@ -1407,7 +1407,7 @@
if (M_WRITABLE(*m_head) == 0) {
/* Get a writable copy. */
- m = m_dup(*m_head, M_DONTWAIT);
+ m = m_dup(*m_head, M_NOWAIT);
m_freem(*m_head);
if (m == NULL) {
*m_head = NULL;
@@ -1464,7 +1464,7 @@
error = bus_dmamap_load_mbuf_sg(sc->sge_cdata.sge_txmbuf_tag,
txd->tx_dmamap, *m_head, txsegs, &nsegs, 0);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, SGE_MAXTXSEGS);
+ m = m_collapse(*m_head, M_NOWAIT, SGE_MAXTXSEGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
Modified: trunk/sys/dev/smc/if_smc.c
===================================================================
--- trunk/sys/dev/smc/if_smc.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/smc/if_smc.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -688,11 +688,11 @@
/*
* Grab an mbuf and attach a cluster.
*/
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
break;
}
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if ((m->m_flags & M_EXT) == 0) {
m_freem(m);
break;
Modified: trunk/sys/dev/sn/if_sn.c
===================================================================
--- trunk/sys/dev/sn/if_sn.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/sn/if_sn.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1057,7 +1057,7 @@
/*
* Allocate a header mbuf from the kernel.
*/
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
goto out;
@@ -1067,7 +1067,7 @@
/*
* Attach an mbuf cluster
*/
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
/*
* Insist on getting a cluster
Modified: trunk/sys/dev/tx/if_tx.c
===================================================================
--- trunk/sys/dev/tx/if_tx.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/tx/if_tx.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/dev/tx/if_tx.c,v 1.4 2009/11/28 22:44:33 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Semen Ustimenko (semenu at FreeBSD.org)
* All rights reserved.
@@ -683,7 +683,7 @@
* recopy packet to a newly allocated mbuf cluster.
*/
if (error) {
- m = m_defrag(m0, M_DONTWAIT);
+ m = m_defrag(m0, M_NOWAIT);
if (m == NULL) {
m_freem(m0);
ifp->if_oerrors++;
@@ -762,7 +762,7 @@
m = buf->mbuf;
/* Try to get an mbuf cluster. */
- buf->mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ buf->mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (buf->mbuf == NULL) {
buf->mbuf = m;
desc->status = 0x8000;
@@ -1496,7 +1496,7 @@
if ((desc->status & 0x8000) || (buf->mbuf != NULL))
return (EBUSY);
- MGETHDR(m0, M_DONTWAIT, MT_DATA);
+ MGETHDR(m0, M_NOWAIT, MT_DATA);
if (m0 == NULL)
return (ENOBUFS);
@@ -1645,7 +1645,7 @@
return (EFAULT);
}
- buf->mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ buf->mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (buf->mbuf == NULL) {
epic_free_rings(sc);
return (ENOBUFS);
Modified: trunk/sys/dev/txp/if_txp.c
===================================================================
--- trunk/sys/dev/txp/if_txp.c 2016-09-26 22:58:02 UTC (rev 8930)
+++ trunk/sys/dev/txp/if_txp.c 2016-09-26 22:58:24 UTC (rev 8931)
@@ -1015,7 +1015,7 @@
break;
rbd = sc->sc_rxbufs + prod;
bcopy((u_long *)&rbd->rb_vaddrlo, &sd, sizeof(sd));
- sd->sd_mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ sd->sd_mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (sd->sd_mbuf == NULL)
break;
sd->sd_mbuf->m_pkthdr.len = sd->sd_mbuf->m_len = MCLBYTES;
@@ -1792,7 +1792,7 @@
bcopy(&sd, (u_long *)&rbd->rb_vaddrlo, sizeof(sd));
KASSERT(sd->sd_mbuf == NULL,
("%s : Rx buffer ring corrupted", __func__));
- sd->sd_mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ sd->sd_mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (sd->sd_mbuf == NULL)
return (ENOMEM);
sd->sd_mbuf->m_pkthdr.len = sd->sd_mbuf->m_len = MCLBYTES;
@@ -2105,7 +2105,7 @@
error = bus_dmamap_load_mbuf_sg(sc->sc_cdata.txp_tx_tag, sd->sd_map,
*m_head, txsegs, &nsegs, 0);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, TXP_MAXTXSEGS);
+ m = m_collapse(*m_head, M_NOWAIT, TXP_MAXTXSEGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
More information about the Midnightbsd-cvs
mailing list