Author: glebius
Date: Tue Dec 4 09:32:43 2012
New Revision: 243857
URL: http://svnweb.freebsd.org/changeset/base/243857
Log:
Mechanically substitute flags from historic mbuf allocator with
malloc(9) flags in sys/dev.
Modified:
head/sys/dev/age/if_age.c
head/sys/dev/alc/if_alc.c
head/sys/dev/ale/if_ale.c
head/sys/dev/an/if_an.c
head/sys/dev/ath/if_ath_rx.c
head/sys/dev/ath/if_ath_rx_edma.c
head/sys/dev/ath/if_ath_tx.c
head/sys/dev/bce/if_bce.c
head/sys/dev/bfe/if_bfe.c
head/sys/dev/bge/if_bge.c
head/sys/dev/bm/if_bm.c
head/sys/dev/bwi/if_bwi.c
head/sys/dev/bwn/if_bwn.c
head/sys/dev/bxe/if_bxe.c
head/sys/dev/cas/if_cas.c
head/sys/dev/ce/if_ce.c
head/sys/dev/cm/smc90cx6.c
head/sys/dev/cp/if_cp.c
head/sys/dev/cs/if_cs.c
head/sys/dev/ctau/if_ct.c
head/sys/dev/cx/if_cx.c
head/sys/dev/cxgb/cxgb_main.c
head/sys/dev/cxgb/cxgb_sge.c
head/sys/dev/cxgb/sys/uipc_mvec.c
head/sys/dev/cxgbe/t4_sge.c
head/sys/dev/cxgbe/tom/t4_ddp.c
head/sys/dev/cxgbe/tom/t4_listen.c
head/sys/dev/dc/if_dc.c
head/sys/dev/de/if_de.c
head/sys/dev/e1000/if_em.c
head/sys/dev/e1000/if_igb.c
head/sys/dev/e1000/if_lem.c
head/sys/dev/ed/if_ed.c
head/sys/dev/en/midway.c
head/sys/dev/ep/if_ep.c
head/sys/dev/et/if_et.c
head/sys/dev/ex/if_ex.c
head/sys/dev/fatm/if_fatm.c
head/sys/dev/fe/if_fe.c
head/sys/dev/firewire/fwohci.c
head/sys/dev/firewire/if_fwe.c
head/sys/dev/firewire/if_fwip.c
head/sys/dev/fxp/if_fxp.c
head/sys/dev/gem/if_gem.c
head/sys/dev/gxemul/ether/if_gx.c
head/sys/dev/hatm/if_hatm_intr.c
head/sys/dev/hatm/if_hatm_tx.c
head/sys/dev/hifn/hifn7751.c
head/sys/dev/hme/if_hme.c
head/sys/dev/ie/if_ie.c
head/sys/dev/if_ndis/if_ndis.c
head/sys/dev/ipw/if_ipw.c
head/sys/dev/iwi/if_iwi.c
head/sys/dev/iwn/if_iwn.c
head/sys/dev/ixgb/if_ixgb.c
head/sys/dev/ixgbe/ixgbe.c
head/sys/dev/ixgbe/ixv.c
head/sys/dev/jme/if_jme.c
head/sys/dev/le/lance.c
head/sys/dev/lge/if_lge.c
head/sys/dev/lmc/if_lmc.c
head/sys/dev/malo/if_malo.c
head/sys/dev/mge/if_mge.c
head/sys/dev/mn/if_mn.c
head/sys/dev/msk/if_msk.c
head/sys/dev/mwl/if_mwl.c
head/sys/dev/mxge/if_mxge.c
head/sys/dev/my/if_my.c
head/sys/dev/nfe/if_nfe.c
head/sys/dev/nge/if_nge.c
head/sys/dev/nve/if_nve.c
head/sys/dev/nxge/if_nxge.c
head/sys/dev/oce/oce_if.c
head/sys/dev/patm/if_patm_intr.c
head/sys/dev/patm/if_patm_rx.c
head/sys/dev/patm/if_patm_tx.c
head/sys/dev/pcn/if_pcn.c
head/sys/dev/pdq/pdq_freebsd.h
head/sys/dev/pdq/pdq_ifsubr.c
head/sys/dev/pdq/pdqvar.h
head/sys/dev/qlxgb/qla_os.c
head/sys/dev/ral/rt2560.c
head/sys/dev/ral/rt2661.c
head/sys/dev/ral/rt2860.c
head/sys/dev/re/if_re.c
head/sys/dev/rt/if_rt.c
head/sys/dev/safe/safe.c
head/sys/dev/sbni/if_sbni.c
head/sys/dev/sf/if_sf.c
head/sys/dev/sfxge/sfxge_dma.c
head/sys/dev/sfxge/sfxge_tx.c
head/sys/dev/sge/if_sge.c
head/sys/dev/sis/if_sis.c
head/sys/dev/sk/if_sk.c
head/sys/dev/smc/if_smc.c
head/sys/dev/sn/if_sn.c
head/sys/dev/snc/dp83932.c
head/sys/dev/ste/if_ste.c
head/sys/dev/stge/if_stge.c
head/sys/dev/ti/if_ti.c
head/sys/dev/tl/if_tl.c
head/sys/dev/tsec/if_tsec.c
head/sys/dev/tx/if_tx.c
head/sys/dev/txp/if_txp.c
head/sys/dev/ubsec/ubsec.c
head/sys/dev/usb/misc/udbp.c
head/sys/dev/usb/net/if_axe.c
head/sys/dev/usb/net/if_cdce.c
head/sys/dev/usb/net/if_usie.c
head/sys/dev/usb/net/uhso.c
head/sys/dev/usb/net/usb_ethernet.c
head/sys/dev/usb/wlan/if_rum.c
head/sys/dev/usb/wlan/if_run.c
head/sys/dev/usb/wlan/if_uath.c
head/sys/dev/usb/wlan/if_upgt.c
head/sys/dev/usb/wlan/if_ural.c
head/sys/dev/usb/wlan/if_urtw.c
head/sys/dev/usb/wlan/if_zyd.c
head/sys/dev/vge/if_vge.c
head/sys/dev/virtio/network/if_vtnet.c
head/sys/dev/vr/if_vr.c
head/sys/dev/vte/if_vte.c
head/sys/dev/vx/if_vx.c
head/sys/dev/vxge/vxge.c
head/sys/dev/wb/if_wb.c
head/sys/dev/wi/if_wi.c
head/sys/dev/wl/if_wl.c
head/sys/dev/wpi/if_wpi.c
head/sys/dev/wtap/if_wtap.c
head/sys/dev/wtap/plugins/visibility.c
head/sys/dev/xe/if_xe.c
head/sys/dev/xen/netfront/netfront.c
head/sys/dev/xl/if_xl.c
Modified: head/sys/dev/age/if_age.c
==============================================================================
--- head/sys/dev/age/if_age.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/age/if_age.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -1521,7 +1521,7 @@ age_encap(struct age_softc *sc, struct m
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) {
@@ -1599,7 +1599,7 @@ age_encap(struct age_softc *sc, struct m
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;
@@ -3061,7 +3061,7 @@ age_newbuf(struct age_softc *sc, struct
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: head/sys/dev/alc/if_alc.c
==============================================================================
--- head/sys/dev/alc/if_alc.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/alc/if_alc.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -2047,7 +2047,7 @@ alc_encap(struct alc_softc *sc, struct m
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 @@ alc_encap(struct alc_softc *sc, struct m
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 @@ alc_newbuf(struct alc_softc *sc, struct
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 @@ alc_fixup_rx(struct ifnet *ifp, struct m
* 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: head/sys/dev/ale/if_ale.c
==============================================================================
--- head/sys/dev/ale/if_ale.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/ale/if_ale.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -1640,7 +1640,7 @@ ale_encap(struct ale_softc *sc, struct m
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 @@ ale_encap(struct ale_softc *sc, struct m
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 @@ ale_encap(struct ale_softc *sc, struct m
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: head/sys/dev/an/if_an.c
==============================================================================
--- head/sys/dev/an/if_an.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/an/if_an.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -946,12 +946,12 @@ an_rxeof(struct an_softc *sc)
/* 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++;
@@ -1037,12 +1037,12 @@ an_rxeof(struct an_softc *sc)
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: head/sys/dev/ath/if_ath_rx.c
==============================================================================
--- head/sys/dev/ath/if_ath_rx.c Tue Dec 4 09:02:49 2012
(r243856)
+++ head/sys/dev/ath/if_ath_rx.c Tue Dec 4 09:32:43 2012
(r243857)
@@ -232,7 +232,7 @@ ath_legacy_rxbuf_init(struct ath_softc *
* multiple of the cache line size. Not doing this
* causes weird stuff to happen (for the 5210 at least).
*/
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL) {
DPRINTF(sc, ATH_DEBUG_ANY,
"%s: no mbuf/cluster\n", __func__);
Modified: head/sys/dev/ath/if_ath_rx_edma.c
==============================================================================
--- head/sys/dev/ath/if_ath_rx_edma.c Tue Dec 4 09:02:49 2012
(r243856)
+++ head/sys/dev/ath/if_ath_rx_edma.c Tue Dec 4 09:32:43 2012
(r243857)
@@ -518,7 +518,7 @@ ath_edma_rxbuf_init(struct ath_softc *sc
ATH_RX_LOCK_ASSERT(sc);
- m = m_getm(NULL, sc->sc_edma_bufsize, M_DONTWAIT, MT_DATA);
+ m = m_getm(NULL, sc->sc_edma_bufsize, M_NOWAIT, MT_DATA);
if (! m)
return (ENOBUFS); /* XXX ?*/
Modified: head/sys/dev/ath/if_ath_tx.c
==============================================================================
--- head/sys/dev/ath/if_ath_tx.c Tue Dec 4 09:02:49 2012
(r243856)
+++ head/sys/dev/ath/if_ath_tx.c Tue Dec 4 09:32:43 2012
(r243857)
@@ -325,7 +325,7 @@ ath_tx_dmasetup(struct ath_softc *sc, st
*/
if (bf->bf_nseg > ATH_TXDESC) { /* too many desc's, linearize */
sc->sc_stats.ast_tx_linear++;
- m = m_collapse(m0, M_DONTWAIT, ATH_TXDESC);
+ m = m_collapse(m0, M_NOWAIT, ATH_TXDESC);
if (m == NULL) {
ath_freetx(m0);
sc->sc_stats.ast_tx_nombuf++;
Modified: head/sys/dev/bce/if_bce.c
==============================================================================
--- head/sys/dev/bce/if_bce.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/bce/if_bce.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -5437,9 +5437,9 @@ bce_get_rx_buf(struct bce_softc *sc, str
/* 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) {
@@ -5559,7 +5559,7 @@ bce_get_pg_buf(struct bce_softc *sc, str
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;
@@ -7320,7 +7320,7 @@ bce_tso_setup(struct bce_softc *sc, stru
/* 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++;
@@ -7486,7 +7486,7 @@ bce_tx_encap(struct bce_softc *sc, struc
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: head/sys/dev/bfe/if_bfe.c
==============================================================================
--- head/sys/dev/bfe/if_bfe.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/bfe/if_bfe.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -791,7 +791,7 @@ bfe_list_newbuf(struct bfe_softc *sc, in
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,
@@ -1519,7 +1519,7 @@ bfe_encap(struct bfe_softc *sc, struct m
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: head/sys/dev/bge/if_bge.c
==============================================================================
--- head/sys/dev/bge/if_bge.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/bge/if_bge.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -1312,12 +1312,12 @@ bge_newbuf_std(struct bge_softc *sc, int
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 @@ bge_newbuf_jumbo(struct bge_softc *sc, i
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);
@@ -4946,7 +4946,7 @@ bge_cksum_pad(struct mbuf *m)
/* 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;
@@ -4988,7 +4988,7 @@ bge_check_short_dma(struct mbuf *m)
}
if (found > 1) {
- n = m_defrag(m, M_DONTWAIT);
+ n = m_defrag(m, M_NOWAIT);
if (n == NULL)
m_freem(m);
} else
@@ -5008,7 +5008,7 @@ bge_setup_tso(struct bge_softc *sc, stru
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);
@@ -5125,9 +5125,9 @@ bge_encap(struct bge_softc *sc, struct m
* 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;
@@ -5139,7 +5139,7 @@ bge_encap(struct bge_softc *sc, struct m
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: head/sys/dev/bm/if_bm.c
==============================================================================
--- head/sys/dev/bm/if_bm.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/bm/if_bm.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -539,7 +539,7 @@ bm_dummypacket(struct bm_softc *sc)
ifp = sc->sc_ifp;
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
return;
@@ -793,7 +793,7 @@ bm_encap(struct bm_softc *sc, struct mbu
*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;
@@ -1238,7 +1238,7 @@ bm_add_rxbuf(struct bm_softc *sc, int id
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: head/sys/dev/bwi/if_bwi.c
==============================================================================
--- head/sys/dev/bwi/if_bwi.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/bwi/if_bwi.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -2534,7 +2534,7 @@ bwi_newbuf(struct bwi_softc *sc, int buf
KASSERT(buf_idx < BWI_RX_NDESC, ("buf_idx %d", buf_idx));
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL) {
error = ENOBUFS;
@@ -3015,7 +3015,7 @@ bwi_encap(struct bwi_softc *sc, int idx,
/*
* Setup the embedded TX header
*/
- M_PREPEND(m, sizeof(*hdr), M_DONTWAIT);
+ M_PREPEND(m, sizeof(*hdr), M_NOWAIT);
if (m == NULL) {
if_printf(ifp, "%s: prepend TX header failed\n", __func__);
return ENOBUFS;
@@ -3074,7 +3074,7 @@ bwi_encap(struct bwi_softc *sc, int idx,
if (error) { /* error == EFBIG */
struct mbuf *m_new;
- m_new = m_defrag(m, M_DONTWAIT);
+ m_new = m_defrag(m, M_NOWAIT);
if (m_new == NULL) {
if_printf(ifp, "%s: can't defrag TX buffer\n",
__func__);
@@ -3195,7 +3195,7 @@ bwi_encap_raw(struct bwi_softc *sc, int
/*
* Setup the embedded TX header
*/
- M_PREPEND(m, sizeof(*hdr), M_DONTWAIT);
+ M_PREPEND(m, sizeof(*hdr), M_NOWAIT);
if (m == NULL) {
if_printf(ifp, "%s: prepend TX header failed\n", __func__);
return ENOBUFS;
@@ -3249,7 +3249,7 @@ bwi_encap_raw(struct bwi_softc *sc, int
__func__, error);
goto back;
}
- m_new = m_defrag(m, M_DONTWAIT);
+ m_new = m_defrag(m, M_NOWAIT);
if (m_new == NULL) {
if_printf(ifp, "%s: can't defrag TX buffer\n",
__func__);
Modified: head/sys/dev/bwn/if_bwn.c
==============================================================================
--- head/sys/dev/bwn/if_bwn.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/bwn/if_bwn.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -1428,7 +1428,7 @@ bwn_pio_tx_start(struct bwn_mac *mac, st
/*
* XXX please removes m_defrag(9)
*/
- m_new = m_defrag(m, M_DONTWAIT);
+ m_new = m_defrag(m, M_NOWAIT);
if (m_new == NULL) {
device_printf(sc->sc_dev,
"%s: can't defrag TX buffer\n",
@@ -1544,7 +1544,7 @@ bwn_dma_tx_start(struct bwn_mac *mac, st
if (error) { /* error == EFBIG */
struct mbuf *m_new;
- m_new = m_defrag(m, M_DONTWAIT);
+ m_new = m_defrag(m, M_NOWAIT);
if (m_new == NULL) {
if_printf(ifp, "%s: can't defrag TX buffer\n",
__func__);
@@ -9124,7 +9124,7 @@ ready:
padding = (macstat & BWN_RX_MAC_PADDING) ? 2 : 0;
totlen = len + padding;
KASSERT(totlen <= MCLBYTES, ("too big..\n"));
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL) {
device_printf(sc->sc_dev, "%s: out of memory", __func__);
goto error;
@@ -9183,7 +9183,7 @@ bwn_dma_newbuf(struct bwn_dma_ring *dr,
struct mbuf *m;
int error;
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL) {
error = ENOBUFS;
Modified: head/sys/dev/bxe/if_bxe.c
==============================================================================
--- head/sys/dev/bxe/if_bxe.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/bxe/if_bxe.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -3757,7 +3757,7 @@ bxe_alloc_buf_rings(struct bxe_softc *sc
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;
@@ -8960,7 +8960,7 @@ bxe_tx_encap(struct bxe_fastpath *fp, st
} 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;
@@ -10467,7 +10467,7 @@ bxe_alloc_tpa_mbuf(struct bxe_fastpath *
#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;
@@ -10661,7 +10661,7 @@ bxe_alloc_rx_sge_mbuf(struct bxe_fastpat
#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;
@@ -10851,7 +10851,7 @@ bxe_alloc_rx_bd_mbuf(struct bxe_fastpath
#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: head/sys/dev/cas/if_cas.c
==============================================================================
--- head/sys/dev/cas/if_cas.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/cas/if_cas.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -1192,7 +1192,7 @@ cas_load_txmbuf(struct cas_softc *sc, st
cflags = 0;
if (((*m_head)->m_pkthdr.csum_flags & CAS_CSUM_FEATURES) != 0) {
if (M_WRITABLE(*m_head) == 0) {
- m = m_dup(*m_head, M_DONTWAIT);
+ m = m_dup(*m_head, M_NOWAIT);
m_freem(*m_head);
*m_head = m;
if (m == NULL)
@@ -1215,7 +1215,7 @@ cas_load_txmbuf(struct cas_softc *sc, st
error = bus_dmamap_load_mbuf_sg(sc->sc_tdmatag, txs->txs_dmamap,
*m_head, txsegs, &nsegs, BUS_DMA_NOWAIT);
if (error == EFBIG) {
- m = m_collapse(*m_head, M_DONTWAIT, CAS_NTXSEGS);
+ m = m_collapse(*m_head, M_NOWAIT, CAS_NTXSEGS);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
@@ -1714,7 +1714,7 @@ cas_rint(struct cas_softc *sc)
__func__, idx, off, len);
#endif
rxds = &sc->sc_rxdsoft[idx];
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m != NULL) {
refcount_acquire(&rxds->rxds_refcount);
bus_dmamap_sync(sc->sc_rdmatag,
@@ -1759,7 +1759,7 @@ cas_rint(struct cas_softc *sc)
__func__, idx, off, len);
#endif
rxds = &sc->sc_rxdsoft[idx];
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m != NULL) {
refcount_acquire(&rxds->rxds_refcount);
off += ETHER_ALIGN;
@@ -1796,7 +1796,7 @@ cas_rint(struct cas_softc *sc)
#endif
rxds2 = &sc->sc_rxdsoft[idx2];
if (m != NULL) {
- MGET(m2, M_DONTWAIT, MT_DATA);
+ MGET(m2, M_NOWAIT, MT_DATA);
if (m2 != NULL) {
refcount_acquire(
&rxds2->rxds_refcount);
Modified: head/sys/dev/ce/if_ce.c
==============================================================================
--- head/sys/dev/ce/if_ce.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/ce/if_ce.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -319,10 +319,10 @@ static struct mbuf *makembuf (void *buf,
{
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: head/sys/dev/cm/smc90cx6.c
==============================================================================
--- head/sys/dev/cm/smc90cx6.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/cm/smc90cx6.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -502,7 +502,7 @@ cm_srint_locked(vsc)
buffer = sc->sc_rx_act ^ 1;
/* Allocate header mbuf */
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == 0) {
/*
@@ -539,7 +539,7 @@ cm_srint_locked(vsc)
*/
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: head/sys/dev/cp/if_cp.c
==============================================================================
--- head/sys/dev/cp/if_cp.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/cp/if_cp.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -203,10 +203,10 @@ static struct mbuf *makembuf (void *buf,
{
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: head/sys/dev/cs/if_cs.c
==============================================================================
--- head/sys/dev/cs/if_cs.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/cs/if_cs.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -726,12 +726,12 @@ cs_get_packet(struct cs_softc *sc)
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: head/sys/dev/ctau/if_ct.c
==============================================================================
--- head/sys/dev/ctau/if_ct.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/ctau/if_ct.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -205,10 +205,10 @@ static struct mbuf *makembuf (void *buf,
{
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: head/sys/dev/cx/if_cx.c
==============================================================================
--- head/sys/dev/cx/if_cx.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/cx/if_cx.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -252,13 +252,13 @@ static struct mbuf *makembuf (void *buf,
{
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 @@ static struct mbuf *makembuf (void *buf,
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: head/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- head/sys/dev/cxgb/cxgb_main.c Tue Dec 4 09:02:49 2012
(r243856)
+++ head/sys/dev/cxgb/cxgb_main.c Tue Dec 4 09:32:43 2012
(r243857)
@@ -1442,7 +1442,7 @@ send_pktsched_cmd(struct adapter *adap,
struct mbuf *m;
struct mngt_pktsched_wr *req;
- m = m_gethdr(M_DONTWAIT, MT_DATA);
+ m = m_gethdr(M_NOWAIT, MT_DATA);
if (m) {
req = mtod(m, struct mngt_pktsched_wr *);
req->wr.wrh_hi = htonl(V_WR_OP(FW_WROPCODE_MNGT));
Modified: head/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- head/sys/dev/cxgb/cxgb_sge.c Tue Dec 4 09:02:49 2012
(r243856)
+++ head/sys/dev/cxgb/cxgb_sge.c Tue Dec 4 09:32:43 2012
(r243857)
@@ -2710,7 +2710,7 @@ get_packet(adapter_t *adap, unsigned int
if (recycle_enable && len <= SGE_RX_COPY_THRES &&
sopeop == RSPQ_SOP_EOP) {
- if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL)
+ if ((m = m_gethdr(M_NOWAIT, MT_DATA)) == NULL)
goto skip_recycle;
cl = mtod(m, void *);
memcpy(cl, sd->rxsd_cl, len);
@@ -2866,10 +2866,10 @@ process_responses(adapter_t *adap, struc
printf("async notification\n");
if (mh->mh_head == NULL) {
- mh->mh_head = m_gethdr(M_DONTWAIT, MT_DATA);
+ mh->mh_head = m_gethdr(M_NOWAIT, MT_DATA);
m = mh->mh_head;
} else {
- m = m_gethdr(M_DONTWAIT, MT_DATA);
+ m = m_gethdr(M_NOWAIT, MT_DATA);
}
if (m == NULL)
goto no_mem;
@@ -2882,7 +2882,7 @@ process_responses(adapter_t *adap, struc
rspq->async_notif++;
goto skip;
} else if (flags & F_RSPD_IMM_DATA_VALID) {
- struct mbuf *m = m_gethdr(M_DONTWAIT, MT_DATA);
+ struct mbuf *m = m_gethdr(M_NOWAIT, MT_DATA);
if (m == NULL) {
no_mem:
Modified: head/sys/dev/cxgb/sys/uipc_mvec.c
==============================================================================
--- head/sys/dev/cxgb/sys/uipc_mvec.c Tue Dec 4 09:02:49 2012
(r243856)
+++ head/sys/dev/cxgb/sys/uipc_mvec.c Tue Dec 4 09:32:43 2012
(r243857)
@@ -98,7 +98,7 @@ retry:
printf("mbuf chain too long: %d max allowed %d\n",
seg_count, TX_MAX_SEGS);
if (!defragged) {
- n = m_defrag(*m, M_DONTWAIT);
+ n = m_defrag(*m, M_NOWAIT);
if (n == NULL) {
err = ENOBUFS;
goto err_out;
Modified: head/sys/dev/cxgbe/t4_sge.c
==============================================================================
--- head/sys/dev/cxgbe/t4_sge.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/cxgbe/t4_sge.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -2761,7 +2761,7 @@ start: sgl->nsegs = 0;
rc = bus_dmamap_load_mbuf_sg(txq->tx_tag, txm->map, m, sgl->seg,
&sgl->nsegs, BUS_DMA_NOWAIT);
if (rc == EFBIG && defragged == 0) {
- m = m_defrag(m, M_DONTWAIT);
+ m = m_defrag(m, M_NOWAIT);
if (m == NULL)
return (EFBIG);
Modified: head/sys/dev/cxgbe/tom/t4_ddp.c
==============================================================================
--- head/sys/dev/cxgbe/tom/t4_ddp.c Tue Dec 4 09:02:49 2012
(r243856)
+++ head/sys/dev/cxgbe/tom/t4_ddp.c Tue Dec 4 09:32:43 2012
(r243857)
@@ -1207,7 +1207,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
Modified: head/sys/dev/cxgbe/tom/t4_listen.c
==============================================================================
--- head/sys/dev/cxgbe/tom/t4_listen.c Tue Dec 4 09:02:49 2012
(r243856)
+++ head/sys/dev/cxgbe/tom/t4_listen.c Tue Dec 4 09:32:43 2012
(r243857)
@@ -1164,7 +1164,7 @@ do_pass_accept_req(struct sge_iq *iq, co
* or may not be stashed in the original SYN mbuf passed to us.
* Just copy it over instead of dealing with all possibilities.
*/
- m = m_dup(synqe->syn, M_DONTWAIT);
+ m = m_dup(synqe->syn, M_NOWAIT);
if (m)
m->m_pkthdr.rcvif = ifp;
Modified: head/sys/dev/dc/if_dc.c
==============================================================================
--- head/sys/dev/dc/if_dc.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/dc/if_dc.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -2650,7 +2650,7 @@ dc_newbuf(struct dc_softc *sc, int i)
bus_dma_segment_t segs[1];
int error, nseg;
- 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;
@@ -3387,7 +3387,7 @@ dc_encap(struct dc_softc *sc, struct mbu
defragged = 0;
if (sc->dc_flags & DC_TX_COALESCE &&
((*m_head)->m_next != NULL || sc->dc_flags & DC_TX_ALIGN)) {
- m = m_defrag(*m_head, M_DONTWAIT);
+ m = m_defrag(*m_head, M_NOWAIT);
defragged = 1;
} else {
/*
@@ -3402,7 +3402,7 @@ dc_encap(struct dc_softc *sc, struct mbu
if (i > DC_TX_LIST_CNT / 4 ||
DC_TX_LIST_CNT - i + sc->dc_cdata.dc_tx_cnt <=
DC_TX_LIST_RSVD) {
- m = m_collapse(*m_head, M_DONTWAIT, DC_MAXFRAGS);
+ m = m_collapse(*m_head, M_NOWAIT, DC_MAXFRAGS);
defragged = 1;
}
}
@@ -3419,7 +3419,7 @@ dc_encap(struct dc_softc *sc, struct mbu
error = bus_dmamap_load_mbuf_sg(sc->dc_tx_mtag,
sc->dc_cdata.dc_tx_map[idx], *m_head, segs, &nseg, 0);
if (error == EFBIG) {
- if (defragged != 0 || (m = m_collapse(*m_head, M_DONTWAIT,
+ if (defragged != 0 || (m = m_collapse(*m_head, M_NOWAIT,
DC_MAXFRAGS)) == NULL) {
m_freem(*m_head);
*m_head = NULL;
Modified: head/sys/dev/de/if_de.c
==============================================================================
--- head/sys/dev/de/if_de.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/de/if_de.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -257,7 +257,7 @@ tulip_txprobe(tulip_softc_t * const sc)
* to verify the connectivity.
*/
TULIP_LOCK_ASSERT(sc);
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
return 0;
/*
@@ -3517,7 +3517,7 @@ tulip_rx_intr(tulip_softc_t * const sc)
ms->m_pkthdr.len = total_len;
ms->m_pkthdr.rcvif = ifp;
m0 = ms;
- ms = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ ms = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
#endif
TULIP_UNLOCK(sc);
CTR1(KTR_TULIP, "tulip_rx_intr: passing %p to upper layer", m0);
@@ -3528,7 +3528,7 @@ tulip_rx_intr(tulip_softc_t * const sc)
* If we are priming the TULIP with mbufs, then allocate
* a new cluster for the next descriptor.
*/
- ms = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ ms = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
#ifndef __NO_STRICT_ALIGNMENT
skip_input:
@@ -3970,7 +3970,7 @@ tulip_txput(tulip_softc_t * const sc, st
* to recopy it into one mbuf and then try again. If
* we can't recopy it, try again later.
*/
- m0 = m_defrag(m, M_DONTWAIT);
+ m0 = m_defrag(m, M_NOWAIT);
if (m0 == NULL) {
sc->tulip_flags |= TULIP_WANTTXSTART;
#if defined(TULIP_DEBUG)
Modified: head/sys/dev/e1000/if_em.c
==============================================================================
--- head/sys/dev/e1000/if_em.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/e1000/if_em.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -1831,7 +1831,7 @@ retry:
if (do_tso || (m_head->m_next != NULL &&
m_head->m_pkthdr.csum_flags & CSUM_OFFLOAD)) {
if (M_WRITABLE(*m_headp) == 0) {
- m_head = m_dup(*m_headp, M_DONTWAIT);
+ m_head = m_dup(*m_headp, M_NOWAIT);
m_freem(*m_headp);
if (m_head == NULL) {
*m_headp = NULL;
@@ -1948,7 +1948,7 @@ retry:
if (error == EFBIG && remap) {
struct mbuf *m;
- m = m_defrag(*m_headp, M_DONTWAIT);
+ m = m_defrag(*m_headp, M_NOWAIT);
if (m == NULL) {
adapter->mbuf_alloc_failed++;
m_freem(*m_headp);
@@ -3930,7 +3930,7 @@ em_refresh_mbufs(struct rx_ring *rxr, in
while (j != limit) {
rxbuf = &rxr->rx_buffers[i];
if (rxbuf->m_head == NULL) {
- m = m_getjcl(M_DONTWAIT, MT_DATA,
+ m = m_getjcl(M_NOWAIT, MT_DATA,
M_PKTHDR, adapter->rx_mbuf_sz);
/*
** If we have a temporary resource shortage
@@ -4100,7 +4100,7 @@ em_setup_receive_ring(struct rx_ring *rx
continue;
}
#endif /* DEV_NETMAP */
- rxbuf->m_head = m_getjcl(M_DONTWAIT, MT_DATA,
+ rxbuf->m_head = m_getjcl(M_NOWAIT, MT_DATA,
M_PKTHDR, adapter->rx_mbuf_sz);
if (rxbuf->m_head == NULL) {
error = ENOBUFS;
@@ -4579,7 +4579,7 @@ em_fixup_rx(struct rx_ring *rxr)
bcopy(m->m_data, m->m_data + ETHER_HDR_LEN, m->m_len);
m->m_data += ETHER_HDR_LEN;
} else {
- MGETHDR(n, M_DONTWAIT, MT_DATA);
+ MGETHDR(n, M_NOWAIT, MT_DATA);
if (n != NULL) {
bcopy(m->m_data, n->m_data, ETHER_HDR_LEN);
m->m_data += ETHER_HDR_LEN;
Modified: head/sys/dev/e1000/if_igb.c
==============================================================================
--- head/sys/dev/e1000/if_igb.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/e1000/if_igb.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -1830,7 +1830,7 @@ retry:
if (do_tso || (m_head->m_next != NULL &&
m_head->m_pkthdr.csum_flags & CSUM_OFFLOAD)) {
if (M_WRITABLE(*m_headp) == 0) {
- m_head = m_dup(*m_headp, M_DONTWAIT);
+ m_head = m_dup(*m_headp, M_NOWAIT);
m_freem(*m_headp);
if (m_head == NULL) {
*m_headp = NULL;
@@ -1935,7 +1935,7 @@ retry:
if (error == EFBIG && remap) {
struct mbuf *m;
- m = m_defrag(*m_headp, M_DONTWAIT);
+ m = m_defrag(*m_headp, M_NOWAIT);
if (m == NULL) {
adapter->mbuf_defrag_failed++;
m_freem(*m_headp);
@@ -3983,7 +3983,7 @@ igb_refresh_mbufs(struct rx_ring *rxr, i
if (rxr->hdr_split == FALSE)
goto no_split;
if (rxbuf->m_head == NULL) {
- mh = m_gethdr(M_DONTWAIT, MT_DATA);
+ mh = m_gethdr(M_NOWAIT, MT_DATA);
if (mh == NULL)
goto update;
} else
@@ -4009,7 +4009,7 @@ igb_refresh_mbufs(struct rx_ring *rxr, i
htole64(hseg[0].ds_addr);
no_split:
if (rxbuf->m_pack == NULL) {
- mp = m_getjcl(M_DONTWAIT, MT_DATA,
+ mp = m_getjcl(M_NOWAIT, MT_DATA,
M_PKTHDR, adapter->rx_mbuf_sz);
if (mp == NULL)
goto update;
@@ -4225,7 +4225,7 @@ igb_setup_receive_ring(struct rx_ring *r
goto skip_head;
/* First the header */
- rxbuf->m_head = m_gethdr(M_DONTWAIT, MT_DATA);
+ rxbuf->m_head = m_gethdr(M_NOWAIT, MT_DATA);
if (rxbuf->m_head == NULL) {
error = ENOBUFS;
goto fail;
@@ -4247,7 +4247,7 @@ igb_setup_receive_ring(struct rx_ring *r
skip_head:
/* Now the payload cluster */
- rxbuf->m_pack = m_getjcl(M_DONTWAIT, MT_DATA,
+ rxbuf->m_pack = m_getjcl(M_NOWAIT, MT_DATA,
M_PKTHDR, adapter->rx_mbuf_sz);
if (rxbuf->m_pack == NULL) {
error = ENOBUFS;
Modified: head/sys/dev/e1000/if_lem.c
==============================================================================
--- head/sys/dev/e1000/if_lem.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/e1000/if_lem.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -1566,7 +1566,7 @@ lem_xmit(struct adapter *adapter, struct
if (error == EFBIG) {
struct mbuf *m;
- m = m_defrag(*m_headp, M_DONTWAIT);
+ m = m_defrag(*m_headp, M_NOWAIT);
if (m == NULL) {
adapter->mbuf_alloc_failed++;
m_freem(*m_headp);
@@ -3075,7 +3075,7 @@ lem_get_buf(struct adapter *adapter, int
struct em_buffer *rx_buffer;
int error, nsegs;
- m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
+ m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
if (m == NULL) {
adapter->mbuf_cluster_failed++;
return (ENOBUFS);
@@ -3633,7 +3633,7 @@ lem_fixup_rx(struct adapter *adapter)
bcopy(m->m_data, m->m_data + ETHER_HDR_LEN, m->m_len);
m->m_data += ETHER_HDR_LEN;
} else {
- MGETHDR(n, M_DONTWAIT, MT_DATA);
+ MGETHDR(n, M_NOWAIT, MT_DATA);
if (n != NULL) {
bcopy(m->m_data, n->m_data, ETHER_HDR_LEN);
m->m_data += ETHER_HDR_LEN;
Modified: head/sys/dev/ed/if_ed.c
==============================================================================
--- head/sys/dev/ed/if_ed.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/ed/if_ed.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -1268,7 +1268,7 @@ ed_get_packet(struct ed_softc *sc, bus_s
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 @@ ed_get_packet(struct ed_softc *sc, bus_s
*/
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: head/sys/dev/en/midway.c
==============================================================================
--- head/sys/dev/en/midway.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/en/midway.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -837,15 +837,15 @@ copy_mbuf(struct mbuf *m)
{
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 @@ en_mget(struct en_softc *sc, u_int pktle
* 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 @@ en_mget(struct en_softc *sc, u_int pktle
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_attach(struct en_softc *sc)
&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: head/sys/dev/ep/if_ep.c
==============================================================================
--- head/sys/dev/ep/if_ep.c Tue Dec 4 09:02:49 2012 (r243856)
+++ head/sys/dev/ep/if_ep.c Tue Dec 4 09:32:43 2012 (r243857)
@@ -746,11 +746,11 @@ read_again:
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)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
