diff options
Diffstat (limited to 'sys/dev')
47 files changed, 112 insertions, 112 deletions
diff --git a/sys/dev/fdt/if_dwge.c b/sys/dev/fdt/if_dwge.c index bbdd481058e..23c6f87ebd1 100644 --- a/sys/dev/fdt/if_dwge.c +++ b/sys/dev/fdt/if_dwge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dwge.c,v 1.6 2020/09/13 01:54:05 jmatthew Exp $ */ +/* $OpenBSD: if_dwge.c,v 1.7 2020/12/12 11:48:52 jan Exp $ */ /* * Copyright (c) 2008, 2019 Mark Kettenis <kettenis@openbsd.org> * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se> @@ -1283,7 +1283,7 @@ dwge_alloc_mbuf(struct dwge_softc *sc, bus_dmamap_t map) { struct mbuf *m = NULL; - m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (!m) return (NULL); m->m_len = m->m_pkthdr.len = MCLBYTES; diff --git a/sys/dev/fdt/if_dwxe.c b/sys/dev/fdt/if_dwxe.c index e4895a9a044..c692826cba6 100644 --- a/sys/dev/fdt/if_dwxe.c +++ b/sys/dev/fdt/if_dwxe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dwxe.c,v 1.17 2020/07/10 13:26:36 patrick Exp $ */ +/* $OpenBSD: if_dwxe.c,v 1.18 2020/12/12 11:48:52 jan Exp $ */ /* * Copyright (c) 2008 Mark Kettenis * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se> @@ -1342,7 +1342,7 @@ dwxe_alloc_mbuf(struct dwxe_softc *sc, bus_dmamap_t map) { struct mbuf *m = NULL; - m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (!m) return (NULL); m->m_len = m->m_pkthdr.len = MCLBYTES; diff --git a/sys/dev/fdt/if_fec.c b/sys/dev/fdt/if_fec.c index d870a633f94..100416f3ac1 100644 --- a/sys/dev/fdt/if_fec.c +++ b/sys/dev/fdt/if_fec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fec.c,v 1.10 2020/07/10 13:26:36 patrick Exp $ */ +/* $OpenBSD: if_fec.c,v 1.11 2020/12/12 11:48:52 jan Exp $ */ /* * Copyright (c) 2012-2013,2019 Patrick Wildt <patrick@blueri.se> * @@ -1298,7 +1298,7 @@ fec_alloc_mbuf(struct fec_softc *sc, bus_dmamap_t map) { struct mbuf *m = NULL; - m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (!m) return (NULL); m->m_len = m->m_pkthdr.len = MCLBYTES; diff --git a/sys/dev/fdt/if_mvneta.c b/sys/dev/fdt/if_mvneta.c index e301b9c30de..a4c8c56b5ce 100644 --- a/sys/dev/fdt/if_mvneta.c +++ b/sys/dev/fdt/if_mvneta.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mvneta.c,v 1.15 2020/12/06 16:50:01 kettenis Exp $ */ +/* $OpenBSD: if_mvneta.c,v 1.16 2020/12/12 11:48:52 jan Exp $ */ /* $NetBSD: if_mvneta.c,v 1.41 2015/04/15 10:15:40 hsuenaga Exp $ */ /* * Copyright (c) 2007, 2008, 2013 KIYOHARA Takashi @@ -1654,7 +1654,7 @@ mvneta_alloc_mbuf(struct mvneta_softc *sc, bus_dmamap_t map) { struct mbuf *m = NULL; - m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (!m) return (NULL); m->m_len = m->m_pkthdr.len = MCLBYTES; diff --git a/sys/dev/fdt/if_mvpp.c b/sys/dev/fdt/if_mvpp.c index c205317fea4..dbf59d31757 100644 --- a/sys/dev/fdt/if_mvpp.c +++ b/sys/dev/fdt/if_mvpp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mvpp.c,v 1.43 2020/12/07 09:14:09 kettenis Exp $ */ +/* $OpenBSD: if_mvpp.c,v 1.44 2020/12/12 11:48:52 jan Exp $ */ /* * Copyright (c) 2008, 2019 Mark Kettenis <kettenis@openbsd.org> * Copyright (c) 2017, 2020 Patrick Wildt <patrick@blueri.se> @@ -3124,7 +3124,7 @@ mvpp2_alloc_mbuf(struct mvpp2_softc *sc, bus_dmamap_t map) { struct mbuf *m = NULL; - m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (!m) return (NULL); m->m_len = m->m_pkthdr.len = MCLBYTES; diff --git a/sys/dev/ic/ar5008.c b/sys/dev/ic/ar5008.c index 506df14e59c..3c11b4c004b 100644 --- a/sys/dev/ic/ar5008.c +++ b/sys/dev/ic/ar5008.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5008.c,v 1.63 2020/11/11 22:45:09 stsp Exp $ */ +/* $OpenBSD: ar5008.c,v 1.64 2020/12/12 11:48:52 jan Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -625,9 +625,9 @@ ar5008_rx_alloc(struct athn_softc *sc) goto fail; } /* - * Assumes MCLGETI returns cache-line-size aligned buffers. + * Assumes MCLGETL returns cache-line-size aligned buffers. */ - bf->bf_m = MCLGETI(NULL, M_DONTWAIT, NULL, ATHN_RXBUFSZ); + bf->bf_m = MCLGETL(NULL, M_DONTWAIT, ATHN_RXBUFSZ); if (bf->bf_m == NULL) { printf("%s: could not allocate Rx mbuf\n", sc->sc_dev.dv_xname); @@ -935,7 +935,7 @@ ar5008_rx_process(struct athn_softc *sc, struct mbuf_list *ml) } /* Allocate a new Rx buffer. */ - m1 = MCLGETI(NULL, M_DONTWAIT, NULL, ATHN_RXBUFSZ); + m1 = MCLGETL(NULL, M_DONTWAIT, ATHN_RXBUFSZ); if (__predict_false(m1 == NULL)) { ic->ic_stats.is_rx_nombuf++; ifp->if_ierrors++; diff --git a/sys/dev/ic/ar9003.c b/sys/dev/ic/ar9003.c index 71e00a29678..14a7f15c8a7 100644 --- a/sys/dev/ic/ar9003.c +++ b/sys/dev/ic/ar9003.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar9003.c,v 1.51 2020/10/11 07:05:28 mpi Exp $ */ +/* $OpenBSD: ar9003.c,v 1.52 2020/12/12 11:48:52 jan Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -743,9 +743,9 @@ ar9003_rx_alloc(struct athn_softc *sc, int qid, int count) goto fail; } /* - * Assumes MCLGETI returns cache-line-size aligned buffers. + * Assumes MCLGETL returns cache-line-size aligned buffers. */ - bf->bf_m = MCLGETI(NULL, M_DONTWAIT, NULL, ATHN_RXBUFSZ); + bf->bf_m = MCLGETL(NULL, M_DONTWAIT, ATHN_RXBUFSZ); if (bf->bf_m == NULL) { printf("%s: could not allocate Rx mbuf\n", sc->sc_dev.dv_xname); @@ -970,7 +970,7 @@ ar9003_rx_process(struct athn_softc *sc, int qid, struct mbuf_list *ml) } /* Allocate a new Rx buffer. */ - m1 = MCLGETI(NULL, M_DONTWAIT, NULL, ATHN_RXBUFSZ); + m1 = MCLGETL(NULL, M_DONTWAIT, ATHN_RXBUFSZ); if (__predict_false(m1 == NULL)) { ic->ic_stats.is_rx_nombuf++; ifp->if_ierrors++; @@ -2629,7 +2629,7 @@ ar9003_paprd_tx_tone(struct athn_softc *sc) int error; /* Build a Null (no data) frame of TONE_LEN bytes. */ - m = MCLGETI(NULL, M_DONTWAIT, NULL, TONE_LEN); + m = MCLGETL(NULL, M_DONTWAIT, TONE_LEN); if (m == NULL) return (ENOBUFS); memset(mtod(m, caddr_t), 0, TONE_LEN); diff --git a/sys/dev/ic/bcmgenet.c b/sys/dev/ic/bcmgenet.c index c9b21f7768b..923df40bdfc 100644 --- a/sys/dev/ic/bcmgenet.c +++ b/sys/dev/ic/bcmgenet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcmgenet.c,v 1.3 2020/07/10 13:26:37 patrick Exp $ */ +/* $OpenBSD: bcmgenet.c,v 1.4 2020/12/12 11:48:52 jan Exp $ */ /* $NetBSD: bcmgenet.c,v 1.3 2020/02/27 17:30:07 jmcneill Exp $ */ /*- @@ -300,7 +300,7 @@ genet_alloc_mbufcl(struct genet_softc *sc) { struct mbuf *m; - m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (m != NULL) m->m_pkthdr.len = m->m_len = m->m_ext.ext_size; diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c index 5cab63c21c7..46a920d2b3a 100644 --- a/sys/dev/ic/elink3.c +++ b/sys/dev/ic/elink3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elink3.c,v 1.97 2020/07/10 13:26:37 patrick Exp $ */ +/* $OpenBSD: elink3.c,v 1.98 2020/12/12 11:48:52 jan Exp $ */ /* $NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $ */ /* @@ -1343,7 +1343,7 @@ epget(struct ep_softc *sc, int totlen) m = sc->mb[sc->next_mb]; sc->mb[sc->next_mb] = NULL; if (m == NULL) { - m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); /* If the queue is no longer full, refill. */ if (!timeout_pending(&sc->sc_epmbuffill_tmo)) timeout_add(&sc->sc_epmbuffill_tmo, 1); @@ -1609,7 +1609,7 @@ epmbuffill(void *v) s = splnet(); for (i = 0; i < MAX_MBS; i++) { if (sc->mb[i] == NULL) { - sc->mb[i] = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + sc->mb[i] = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (sc->mb[i] == NULL) break; } diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c index 0cd66dbfd63..cce22d35ff8 100644 --- a/sys/dev/ic/gem.c +++ b/sys/dev/ic/gem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gem.c,v 1.125 2020/07/10 13:26:37 patrick Exp $ */ +/* $OpenBSD: gem.c,v 1.126 2020/12/12 11:48:52 jan Exp $ */ /* $NetBSD: gem.c,v 1.1 2001/09/16 00:11:43 eeh Exp $ */ /* @@ -1057,7 +1057,7 @@ gem_add_rxbuf(struct gem_softc *sc, int idx) struct mbuf *m; int error; - m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (!m) return (ENOBUFS); m->m_len = m->m_pkthdr.len = MCLBYTES; diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c index fd536dadd0d..732d33eedc2 100644 --- a/sys/dev/ic/hme.c +++ b/sys/dev/ic/hme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hme.c,v 1.82 2020/06/22 02:27:04 dlg Exp $ */ +/* $OpenBSD: hme.c,v 1.83 2020/12/12 11:48:52 jan Exp $ */ /* $NetBSD: hme.c,v 1.21 2001/07/07 15:59:37 thorpej Exp $ */ /*- @@ -1284,7 +1284,7 @@ hme_newbuf(struct hme_softc *sc, struct hme_sxd *d) * until we're sure everything is a success. */ - m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (!m) return (ENOBUFS); diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c index 78eb8e07843..403c12715c0 100644 --- a/sys/dev/ic/re.c +++ b/sys/dev/ic/re.c @@ -1,4 +1,4 @@ -/* $OpenBSD: re.c,v 1.207 2020/08/26 03:29:06 visa Exp $ */ +/* $OpenBSD: re.c,v 1.208 2020/12/12 11:48:52 jan Exp $ */ /* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -1125,7 +1125,7 @@ re_newbuf(struct rl_softc *sc) u_int32_t cmdstat; int error, idx; - m = MCLGETI(NULL, M_DONTWAIT, NULL, RL_FRAMELEN(sc->rl_max_mtu)); + m = MCLGETL(NULL, M_DONTWAIT, RL_FRAMELEN(sc->rl_max_mtu)); if (!m) return (ENOBUFS); diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c index 60c14b5eb53..3178226c0b6 100644 --- a/sys/dev/ic/rt2860.c +++ b/sys/dev/ic/rt2860.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2860.c,v 1.100 2020/10/11 07:05:28 mpi Exp $ */ +/* $OpenBSD: rt2860.c,v 1.101 2020/12/12 11:48:52 jan Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -685,7 +685,7 @@ rt2860_alloc_rx_ring(struct rt2860_softc *sc, struct rt2860_rx_ring *ring) goto fail; } - data->m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + data->m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (data->m == NULL) { printf("%s: could not allocate Rx mbuf\n", sc->sc_dev.dv_xname); @@ -1304,7 +1304,7 @@ rt2860_rx_intr(struct rt2860_softc *sc) goto skip; } - m1 = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m1 = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (__predict_false(m1 == NULL)) { ifp->if_ierrors++; goto skip; diff --git a/sys/dev/ic/ti.c b/sys/dev/ic/ti.c index da779ef51ce..4e682d00b11 100644 --- a/sys/dev/ic/ti.c +++ b/sys/dev/ic/ti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ti.c,v 1.27 2020/07/10 13:26:37 patrick Exp $ */ +/* $OpenBSD: ti.c,v 1.28 2020/12/12 11:48:52 jan Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -576,7 +576,7 @@ ti_newbuf_std(struct ti_softc *sc, int i, struct mbuf *m, sc->ti_cdata.ti_rx_std_map[i] = dmamap; if (m == NULL) { - m_new = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m_new = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (m_new == NULL) return (ENOBUFS); @@ -695,7 +695,7 @@ ti_newbuf_jumbo(struct ti_softc *sc, int i, struct mbuf *m, bus_dmamap_unload(sc->sc_dmatag, dmamap); if (m == NULL) { - m_new = MCLGETI(NULL, M_DONTWAIT, NULL, TI_JUMBO_FRAMELEN); + m_new = MCLGETL(NULL, M_DONTWAIT, TI_JUMBO_FRAMELEN); if (m_new == NULL) return (ENOBUFS); diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c index 463d1a0297f..8543e354454 100644 --- a/sys/dev/ic/xl.c +++ b/sys/dev/ic/xl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xl.c,v 1.135 2020/07/10 13:26:37 patrick Exp $ */ +/* $OpenBSD: xl.c,v 1.136 2020/12/12 11:48:52 jan Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -1081,7 +1081,7 @@ xl_newbuf(struct xl_softc *sc, struct xl_chain_onefrag *c) struct mbuf *m_new = NULL; bus_dmamap_t map; - m_new = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m_new = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (!m_new) return (ENOBUFS); diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 7cc69d902b9..5c114d63774 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.392 2020/07/26 17:44:15 kettenis Exp $ */ +/* $OpenBSD: if_bge.c,v 1.393 2020/12/12 11:48:52 jan Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -1113,7 +1113,7 @@ bge_newbuf(struct bge_softc *sc, int i) struct mbuf *m; int error; - m = MCLGETI(NULL, M_DONTWAIT, NULL, sc->bge_rx_std_len); + m = MCLGETL(NULL, M_DONTWAIT, sc->bge_rx_std_len); if (!m) return (ENOBUFS); m->m_len = m->m_pkthdr.len = sc->bge_rx_std_len; @@ -1162,7 +1162,7 @@ bge_newbuf_jumbo(struct bge_softc *sc, int i) struct mbuf *m; int error; - m = MCLGETI(NULL, M_DONTWAIT, NULL, BGE_JLEN); + m = MCLGETL(NULL, M_DONTWAIT, BGE_JLEN); if (!m) return (ENOBUFS); m->m_len = m->m_pkthdr.len = BGE_JUMBO_FRAMELEN; diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c index 771735cb308..cd3fa35a3c6 100644 --- a/sys/dev/pci/if_bnx.c +++ b/sys/dev/pci/if_bnx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bnx.c,v 1.129 2020/07/10 13:26:37 patrick Exp $ */ +/* $OpenBSD: if_bnx.c,v 1.130 2020/12/12 11:48:52 jan Exp $ */ /*- * Copyright (c) 2006 Broadcom Corporation @@ -3671,7 +3671,7 @@ bnx_get_buf(struct bnx_softc *sc, u_int16_t *prod, *prod_bseq); /* This is a new mbuf allocation. */ - m = MCLGETI(NULL, M_DONTWAIT, NULL, BNX_MAX_JUMBO_MRU); + m = MCLGETL(NULL, M_DONTWAIT, BNX_MAX_JUMBO_MRU); if (!m) return (0); m->m_len = m->m_pkthdr.len = BNX_MAX_JUMBO_MRU; diff --git a/sys/dev/pci/if_bnxt.c b/sys/dev/pci/if_bnxt.c index e2126dbea23..4d3731b72c3 100644 --- a/sys/dev/pci/if_bnxt.c +++ b/sys/dev/pci/if_bnxt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bnxt.c,v 1.27 2020/10/14 06:40:21 jmatthew Exp $ */ +/* $OpenBSD: if_bnxt.c,v 1.28 2020/12/12 11:48:53 jan Exp $ */ /*- * Broadcom NetXtreme-C/E network driver. * @@ -1879,7 +1879,7 @@ bnxt_rx_fill_slots(struct bnxt_softc *sc, struct bnxt_ring *ring, void *ring_mem p = *prod; for (fills = 0; fills < nslots; fills++) { bs = &slots[p]; - m = MCLGETI(NULL, M_DONTWAIT, NULL, bufsize); + m = MCLGETL(NULL, M_DONTWAIT, bufsize); if (m == NULL) break; diff --git a/sys/dev/pci/if_bwfm_pci.c b/sys/dev/pci/if_bwfm_pci.c index b930011656c..42cc85a9a4f 100644 --- a/sys/dev/pci/if_bwfm_pci.c +++ b/sys/dev/pci/if_bwfm_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bwfm_pci.c,v 1.37 2020/06/22 02:31:32 dlg Exp $ */ +/* $OpenBSD: if_bwfm_pci.c,v 1.38 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 2010-2016 Broadcom Corporation * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se> @@ -963,7 +963,7 @@ bwfm_pci_fill_rx_ioctl_ring(struct bwfm_pci_softc *sc, struct if_rxring *rxring, req = bwfm_pci_ring_write_reserve(sc, &sc->sc_ctrl_submit); if (req == NULL) break; - m = MCLGETI(NULL, M_DONTWAIT, NULL, MSGBUF_MAX_PKT_SIZE); + m = MCLGETL(NULL, M_DONTWAIT, MSGBUF_MAX_PKT_SIZE); if (m == NULL) { bwfm_pci_ring_write_cancel(sc, &sc->sc_ctrl_submit, 1); break; @@ -1003,7 +1003,7 @@ bwfm_pci_fill_rx_buf_ring(struct bwfm_pci_softc *sc) req = bwfm_pci_ring_write_reserve(sc, &sc->sc_rxpost_submit); if (req == NULL) break; - m = MCLGETI(NULL, M_DONTWAIT, NULL, MSGBUF_MAX_PKT_SIZE); + m = MCLGETL(NULL, M_DONTWAIT, MSGBUF_MAX_PKT_SIZE); if (m == NULL) { bwfm_pci_ring_write_cancel(sc, &sc->sc_rxpost_submit, 1); break; @@ -1959,7 +1959,7 @@ bwfm_pci_msgbuf_query_dcmd(struct bwfm_softc *bwfm, int ifidx, int s; buflen = min(*len, BWFM_DMA_H2D_IOCTL_BUF_LEN); - m = MCLGETI(NULL, M_DONTWAIT, NULL, buflen); + m = MCLGETL(NULL, M_DONTWAIT, buflen); if (m == NULL) return 1; m->m_len = m->m_pkthdr.len = buflen; diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index ae0524756bf..12ebff467a3 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.356 2020/07/12 05:21:34 dlg Exp $ */ +/* $OpenBSD: if_em.c,v 1.357 2020/12/12 11:48:53 jan Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -2515,7 +2515,7 @@ em_get_buf(struct em_queue *que, int i) KASSERT(pkt->pkt_m == NULL); - m = MCLGETI(NULL, M_DONTWAIT, NULL, EM_MCLBYTES); + m = MCLGETL(NULL, M_DONTWAIT, EM_MCLBYTES); if (m == NULL) { sc->mbuf_cluster_failed++; return (ENOBUFS); diff --git a/sys/dev/pci/if_iavf.c b/sys/dev/pci/if_iavf.c index fc2fb49a6ae..f0197bb5f35 100644 --- a/sys/dev/pci/if_iavf.c +++ b/sys/dev/pci/if_iavf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iavf.c,v 1.9 2020/07/10 13:26:38 patrick Exp $ */ +/* $OpenBSD: if_iavf.c,v 1.10 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 2013-2015, Intel Corporation @@ -2067,7 +2067,7 @@ iavf_rxfill(struct iavf_softc *sc, struct iavf_rx_ring *rxr) do { rxm = &rxr->rxr_maps[prod]; - m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES + ETHER_ALIGN); + m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES + ETHER_ALIGN); if (m == NULL) break; m->m_data += (m->m_ext.ext_size - (MCLBYTES + ETHER_ALIGN)); diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index 495aa47166e..f5deebe6fd5 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.316 2020/12/07 20:09:24 tobhe Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.317 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh <info@genua.de> @@ -3790,7 +3790,7 @@ iwm_rx_addbuf(struct iwm_softc *sc, int size, int idx) if (size <= MCLBYTES) { MCLGET(m, M_DONTWAIT); } else { - MCLGETI(m, M_DONTWAIT, NULL, IWM_RBUF_SIZE); + MCLGETL(m, M_DONTWAIT, IWM_RBUF_SIZE); } if ((m->m_flags & M_EXT) == 0) { m_freem(m); @@ -4560,7 +4560,7 @@ iwm_send_cmd(struct iwm_softc *sc, struct iwm_host_cmd *hcmd) err = EINVAL; goto out; } - m = MCLGETI(NULL, M_DONTWAIT, NULL, totlen); + m = MCLGETL(NULL, M_DONTWAIT, totlen); if (m == NULL) { printf("%s: could not get fw cmd mbuf (%zd bytes)\n", DEVNAME(sc), totlen); diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index e54f0aefabd..a7b7249d46e 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.243 2020/11/12 15:16:18 krw Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.244 2020/12/12 11:48:53 jan Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -1201,7 +1201,7 @@ iwn_alloc_rx_ring(struct iwn_softc *sc, struct iwn_rx_ring *ring) goto fail; } - data->m = MCLGETI(NULL, M_DONTWAIT, NULL, IWN_RBUF_SIZE); + data->m = MCLGETL(NULL, M_DONTWAIT, IWN_RBUF_SIZE); if (data->m == NULL) { printf("%s: could not allocate RX mbuf\n", sc->sc_dev.dv_xname); @@ -2058,7 +2058,7 @@ iwn_rx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc, return; } - m1 = MCLGETI(NULL, M_DONTWAIT, NULL, IWN_RBUF_SIZE); + m1 = MCLGETL(NULL, M_DONTWAIT, IWN_RBUF_SIZE); if (m1 == NULL) { ic->ic_stats.is_rx_nombuf++; ifp->if_ierrors++; diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c index 09ffce6713a..2a668d0bd2f 100644 --- a/sys/dev/pci/if_iwx.c +++ b/sys/dev/pci/if_iwx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwx.c,v 1.47 2020/12/07 20:12:04 tobhe Exp $ */ +/* $OpenBSD: if_iwx.c,v 1.48 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh <info@genua.de> @@ -3171,7 +3171,7 @@ iwx_rx_addbuf(struct iwx_softc *sc, int size, int idx) if (size <= MCLBYTES) { MCLGET(m, M_DONTWAIT); } else { - MCLGETI(m, M_DONTWAIT, NULL, IWX_RBUF_SIZE); + MCLGETL(m, M_DONTWAIT, IWX_RBUF_SIZE); } if ((m->m_flags & M_EXT) == 0) { m_freem(m); @@ -3820,7 +3820,7 @@ iwx_send_cmd(struct iwx_softc *sc, struct iwx_host_cmd *hcmd) err = EINVAL; goto out; } - m = MCLGETI(NULL, M_DONTWAIT, NULL, totlen); + m = MCLGETL(NULL, M_DONTWAIT, totlen); if (m == NULL) { printf("%s: could not get fw cmd mbuf (%zd bytes)\n", DEVNAME(sc), totlen); diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c index 4661e92483e..08079146bfc 100644 --- a/sys/dev/pci/if_ix.c +++ b/sys/dev/pci/if_ix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ix.c,v 1.176 2020/12/09 05:39:42 dlg Exp $ */ +/* $OpenBSD: if_ix.c,v 1.177 2020/12/12 11:48:53 jan Exp $ */ /****************************************************************************** @@ -2666,7 +2666,7 @@ ixgbe_get_buf(struct rx_ring *rxr, int i) } /* needed in any case so prealocate since this one will fail for sure */ - mp = MCLGETI(NULL, M_DONTWAIT, NULL, sc->rx_mbuf_sz); + mp = MCLGETL(NULL, M_DONTWAIT, sc->rx_mbuf_sz); if (!mp) return (ENOBUFS); diff --git a/sys/dev/pci/if_ixl.c b/sys/dev/pci/if_ixl.c index df2f2644c14..d6e80b64bf7 100644 --- a/sys/dev/pci/if_ixl.c +++ b/sys/dev/pci/if_ixl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ixl.c,v 1.69 2020/11/02 00:25:49 dlg Exp $ */ +/* $OpenBSD: if_ixl.c,v 1.70 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 2013-2015, Intel Corporation @@ -3234,7 +3234,7 @@ ixl_rxfill(struct ixl_softc *sc, struct ixl_rx_ring *rxr) do { rxm = &rxr->rxr_maps[prod]; - m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES + ETHER_ALIGN); + m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES + ETHER_ALIGN); if (m == NULL) break; m->m_data += (m->m_ext.ext_size - (MCLBYTES + ETHER_ALIGN)); diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c index fa90aee736d..05cfecf4855 100644 --- a/sys/dev/pci/if_lge.c +++ b/sys/dev/pci/if_lge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lge.c,v 1.75 2020/07/10 13:26:38 patrick Exp $ */ +/* $OpenBSD: if_lge.c,v 1.76 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -626,7 +626,7 @@ lge_newbuf(struct lge_softc *sc, struct lge_rx_desc *c, struct mbuf *m) struct mbuf *m_new = NULL; if (m == NULL) { - m_new = MCLGETI(NULL, M_DONTWAIT, NULL, LGE_JLEN); + m_new = MCLGETL(NULL, M_DONTWAIT, LGE_JLEN); if (m_new == NULL) return (ENOBUFS); } else { diff --git a/sys/dev/pci/if_mcx.c b/sys/dev/pci/if_mcx.c index b888734769d..2384eb659a0 100644 --- a/sys/dev/pci/if_mcx.c +++ b/sys/dev/pci/if_mcx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mcx.c,v 1.75 2020/11/06 02:50:02 jmatthew Exp $ */ +/* $OpenBSD: if_mcx.c,v 1.76 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 2017 David Gwynne <dlg@openbsd.org> @@ -6413,7 +6413,7 @@ mcx_rx_fill_slots(struct mcx_softc *sc, struct mcx_rx *rx, rqe = ring; for (fills = 0; fills < nslots; fills++) { ms = &slots[slot]; - m = MCLGETI(NULL, M_DONTWAIT, NULL, sc->sc_rxbufsz); + m = MCLGETL(NULL, M_DONTWAIT, sc->sc_rxbufsz); if (m == NULL) break; diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 371d3b5b920..70b21670b7e 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_msk.c,v 1.135 2020/07/10 13:26:38 patrick Exp $ */ +/* $OpenBSD: if_msk.c,v 1.136 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -474,7 +474,7 @@ msk_newbuf(struct sk_if_softc *sc_if) uint32_t hiaddr; unsigned int pktlen = sc_if->sk_pktlen + ETHER_ALIGN; - m = MCLGETI(NULL, M_DONTWAIT, NULL, pktlen); + m = MCLGETL(NULL, M_DONTWAIT, pktlen); if (m == NULL) return (0); m->m_len = m->m_pkthdr.len = pktlen; diff --git a/sys/dev/pci/if_myx.c b/sys/dev/pci/if_myx.c index 1e9924c0e99..0ec62880fe3 100644 --- a/sys/dev/pci/if_myx.c +++ b/sys/dev/pci/if_myx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_myx.c,v 1.112 2020/11/27 00:13:15 kevlo Exp $ */ +/* $OpenBSD: if_myx.c,v 1.113 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org> @@ -1969,7 +1969,7 @@ myx_mcl_small(void) { struct mbuf *m; - m = MCLGETI(NULL, M_DONTWAIT, NULL, MYX_RXSMALL_SIZE); + m = MCLGETL(NULL, M_DONTWAIT, MYX_RXSMALL_SIZE); if (m == NULL) return (NULL); diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c index e34ffc219a5..b79461f67f2 100644 --- a/sys/dev/pci/if_nfe.c +++ b/sys/dev/pci/if_nfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nfe.c,v 1.122 2020/07/10 13:26:38 patrick Exp $ */ +/* $OpenBSD: if_nfe.c,v 1.123 2020/12/12 11:48:53 jan Exp $ */ /*- * Copyright (c) 2006, 2007 Damien Bergamini <damien.bergamini@free.fr> @@ -697,7 +697,7 @@ nfe_rxeof(struct nfe_softc *sc) * old mbuf. In the unlikely case that the old mbuf can't be * reloaded either, explicitly panic. */ - mnew = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + mnew = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (mnew == NULL) { ifp->if_ierrors++; goto skip; @@ -1210,7 +1210,7 @@ nfe_alloc_rx_ring(struct nfe_softc *sc, struct nfe_rx_ring *ring) for (i = 0; i < NFE_RX_RING_COUNT; i++) { data = &sc->rxq.data[i]; - data->m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + data->m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (data->m == NULL) { printf("%s: could not allocate rx mbuf\n", sc->sc_dev.dv_xname); diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c index 8a6ea7e2301..9a661d36ac5 100644 --- a/sys/dev/pci/if_nge.c +++ b/sys/dev/pci/if_nge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nge.c,v 1.94 2020/07/10 13:26:38 patrick Exp $ */ +/* $OpenBSD: if_nge.c,v 1.95 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -962,7 +962,7 @@ nge_newbuf(struct nge_softc *sc, struct nge_desc *c, struct mbuf *m) struct mbuf *m_new = NULL; if (m == NULL) { - m_new = MCLGETI(NULL, M_DONTWAIT, NULL, NGE_MCLBYTES); + m_new = MCLGETL(NULL, M_DONTWAIT, NGE_MCLBYTES); if (m_new == NULL) return (ENOBUFS); } else { diff --git a/sys/dev/pci/if_oce.c b/sys/dev/pci/if_oce.c index 662e58ae91a..81bf4301f8e 100644 --- a/sys/dev/pci/if_oce.c +++ b/sys/dev/pci/if_oce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_oce.c,v 1.103 2020/07/10 13:26:38 patrick Exp $ */ +/* $OpenBSD: if_oce.c,v 1.104 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 2012 Mike Belopuhov @@ -1761,7 +1761,7 @@ oce_get_buf(struct oce_rq *rq) if ((pkt = oce_pkt_get(&rq->pkt_free)) == NULL) return (0); - pkt->mbuf = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + pkt->mbuf = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (pkt->mbuf == NULL) { oce_pkt_put(&rq->pkt_free, pkt); return (0); diff --git a/sys/dev/pci/if_rge.c b/sys/dev/pci/if_rge.c index 9bcec24efc6..9bc4d50b26e 100644 --- a/sys/dev/pci/if_rge.c +++ b/sys/dev/pci/if_rge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rge.c,v 1.8 2020/10/31 07:50:41 kevlo Exp $ */ +/* $OpenBSD: if_rge.c,v 1.9 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 2019, 2020 Kevin Lo <kevlo@openbsd.org> @@ -1043,7 +1043,7 @@ rge_newbuf(struct rge_softc *sc) bus_dmamap_t rxmap; int idx; - m = MCLGETI(NULL, M_DONTWAIT, NULL, RGE_JUMBO_FRAMELEN); + m = MCLGETL(NULL, M_DONTWAIT, RGE_JUMBO_FRAMELEN); if (m == NULL) return (ENOBUFS); diff --git a/sys/dev/pci/if_rtwn.c b/sys/dev/pci/if_rtwn.c index 16340494d45..f72d0be8b22 100644 --- a/sys/dev/pci/if_rtwn.c +++ b/sys/dev/pci/if_rtwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rtwn.c,v 1.36 2019/09/12 12:55:07 stsp Exp $ */ +/* $OpenBSD: if_rtwn.c,v 1.37 2020/12/12 11:48:53 jan Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -545,7 +545,7 @@ rtwn_alloc_rx_list(struct rtwn_pci_softc *sc) goto fail; } - rx_data->m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + rx_data->m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (rx_data->m == NULL) { printf("%s: could not allocate rx mbuf\n", sc->sc_dev.dv_xname); @@ -887,7 +887,7 @@ rtwn_rx_frame(struct rtwn_pci_softc *sc, struct r92c_rx_desc_pci *rx_desc, DPRINTFN(5, ("Rx frame len=%d rate=%d infosz=%d shift=%d rssi=%d\n", pktlen, rate, infosz, shift, rssi)); - m1 = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m1 = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (m1 == NULL) { ifp->if_ierrors++; return; diff --git a/sys/dev/pci/if_se.c b/sys/dev/pci/if_se.c index 73b94d1934b..5e94fef994a 100644 --- a/sys/dev/pci/if_se.c +++ b/sys/dev/pci/if_se.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_se.c,v 1.21 2020/07/10 13:26:38 patrick Exp $ */ +/* $OpenBSD: if_se.c,v 1.22 2020/12/12 11:48:53 jan Exp $ */ /*- * Copyright (c) 2009, 2010 Christopher Zimmermann <madroach@zakweb.de> @@ -847,11 +847,11 @@ se_newbuf(struct se_softc *sc, uint i) struct mbuf *m; int rc; - m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (m == NULL) { #ifdef SE_DEBUG if (ifp->if_flags & IFF_DEBUG) - printf("%s: MCLGETI failed\n", ifp->if_xname); + printf("%s: MCLGETL failed\n", ifp->if_xname); #endif return ENOBUFS; } diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c index 0a5bf238870..a89938b54f2 100644 --- a/sys/dev/pci/if_sis.c +++ b/sys/dev/pci/if_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sis.c,v 1.138 2020/07/16 00:52:33 kevlo Exp $ */ +/* $OpenBSD: if_sis.c,v 1.139 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -1323,7 +1323,7 @@ sis_newbuf(struct sis_softc *sc, struct sis_desc *c) if (c == NULL) return (EINVAL); - m_new = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m_new = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (!m_new) return (ENOBUFS); diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index e7992d296ec..8b90fed0c65 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.191 2020/07/10 13:26:38 patrick Exp $ */ +/* $OpenBSD: if_sk.c,v 1.192 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -622,7 +622,7 @@ sk_newbuf(struct sk_if_softc *sc_if) int error; uint64_t dva; - m = MCLGETI(NULL, M_DONTWAIT, NULL, SK_JLEN); + m = MCLGETL(NULL, M_DONTWAIT, SK_JLEN); if (m == NULL) return (ENOBUFS); diff --git a/sys/dev/pci/if_vic.c b/sys/dev/pci/if_vic.c index 80d6a1df298..3cdb2f0213f 100644 --- a/sys/dev/pci/if_vic.c +++ b/sys/dev/pci/if_vic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vic.c,v 1.101 2020/07/10 13:26:38 patrick Exp $ */ +/* $OpenBSD: if_vic.c,v 1.102 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 2006 Reyk Floeter <reyk@openbsd.org> @@ -1311,7 +1311,7 @@ vic_alloc_mbuf(struct vic_softc *sc, bus_dmamap_t map, u_int pktlen) { struct mbuf *m = NULL; - m = MCLGETI(NULL, M_DONTWAIT, NULL, pktlen); + m = MCLGETL(NULL, M_DONTWAIT, pktlen); if (!m) return (NULL); m->m_data += ETHER_ALIGN; diff --git a/sys/dev/pci/if_vmx.c b/sys/dev/pci/if_vmx.c index f2dc04193b3..8d69006f072 100644 --- a/sys/dev/pci/if_vmx.c +++ b/sys/dev/pci/if_vmx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vmx.c,v 1.64 2020/07/10 13:26:38 patrick Exp $ */ +/* $OpenBSD: if_vmx.c,v 1.65 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 2013 Tsubai Masanari @@ -652,7 +652,7 @@ vmxnet3_rxfill(struct vmxnet3_rxring *ring) for (slots = if_rxr_get(&ring->rxr, NRXDESC); slots > 0; slots--) { KASSERT(ring->m[prod] == NULL); - m = MCLGETI(NULL, M_DONTWAIT, NULL, JUMBO_LEN); + m = MCLGETL(NULL, M_DONTWAIT, JUMBO_LEN); if (m == NULL) break; diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index c9aa6b9bce5..a35445bb858 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.156 2020/07/10 13:26:38 patrick Exp $ */ +/* $OpenBSD: if_vr.c,v 1.157 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 1997, 1998 @@ -1699,7 +1699,7 @@ vr_alloc_mbuf(struct vr_softc *sc, struct vr_chain_onefrag *r) if (r == NULL) return (EINVAL); - m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (!m) return (ENOBUFS); diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index f5a4faac978..9bb01dea924 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.154 2020/10/11 07:05:28 mpi Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.155 2020/12/12 11:48:53 jan Exp $ */ /*- * Copyright (c) 2006-2008 @@ -674,7 +674,7 @@ wpi_alloc_rx_ring(struct wpi_softc *sc, struct wpi_rx_ring *ring) goto fail; } - data->m = MCLGETI(NULL, M_DONTWAIT, NULL, WPI_RBUF_SIZE); + data->m = MCLGETL(NULL, M_DONTWAIT, WPI_RBUF_SIZE); if (data->m == NULL) { printf("%s: could not allocate RX mbuf\n", sc->sc_dev.dv_xname); @@ -1216,7 +1216,7 @@ wpi_rx_done(struct wpi_softc *sc, struct wpi_rx_desc *desc, return; } - m1 = MCLGETI(NULL, M_DONTWAIT, NULL, WPI_RBUF_SIZE); + m1 = MCLGETL(NULL, M_DONTWAIT, WPI_RBUF_SIZE); if (m1 == NULL) { ic->ic_stats.is_rx_nombuf++; ifp->if_ierrors++; diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c index 8f27541617c..bc42742f618 100644 --- a/sys/dev/pci/if_xge.c +++ b/sys/dev/pci/if_xge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xge.c,v 1.79 2020/07/10 13:26:40 patrick Exp $ */ +/* $OpenBSD: if_xge.c,v 1.80 2020/12/12 11:48:53 jan Exp $ */ /* $NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $ */ /* @@ -1340,7 +1340,7 @@ xge_add_rxbuf(struct xge_softc *sc, int id) MGETHDR(m[0], M_DONTWAIT, MT_DATA); if (m[0] == NULL) return (ENOBUFS); - MCLGETI(m[0], M_DONTWAIT, NULL, XGE_MAX_FRAMELEN + ETHER_ALIGN); + MCLGETL(m[0], M_DONTWAIT, XGE_MAX_FRAMELEN + ETHER_ALIGN); if ((m[0]->m_flags & M_EXT) == 0) { m_freem(m[0]); return (ENOBUFS); diff --git a/sys/dev/pv/if_hvn.c b/sys/dev/pv/if_hvn.c index d497f0bf631..f12e2f935ca 100644 --- a/sys/dev/pv/if_hvn.c +++ b/sys/dev/pv/if_hvn.c @@ -1481,7 +1481,7 @@ hvn_devget(struct hvn_softc *sc, caddr_t buf, uint32_t len) if (len + ETHER_ALIGN <= MHLEN) MGETHDR(m, M_NOWAIT, MT_DATA); else - m = MCLGETI(NULL, M_NOWAIT, NULL, len + ETHER_ALIGN); + m = MCLGETL(NULL, M_NOWAIT, len + ETHER_ALIGN); if (m == NULL) return (NULL); m->m_len = m->m_pkthdr.len = len; diff --git a/sys/dev/pv/if_vio.c b/sys/dev/pv/if_vio.c index 4b5e36a6eb3..57f24591791 100644 --- a/sys/dev/pv/if_vio.c +++ b/sys/dev/pv/if_vio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vio.c,v 1.18 2020/07/10 13:26:40 patrick Exp $ */ +/* $OpenBSD: if_vio.c,v 1.19 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 2012 Stefan Fritsch, Alexander Fiveg. @@ -904,7 +904,7 @@ vio_add_rx_mbuf(struct vio_softc *sc, int i) struct mbuf *m; int r; - m = MCLGETI(NULL, M_DONTWAIT, NULL, MCLBYTES); + m = MCLGETL(NULL, M_DONTWAIT, MCLBYTES); if (m == NULL) return ENOBUFS; sc->sc_rx_mbufs[i] = m; diff --git a/sys/dev/pv/if_xnf.c b/sys/dev/pv/if_xnf.c index c7c07193a3f..51078dd0d7e 100644 --- a/sys/dev/pv/if_xnf.c +++ b/sys/dev/pv/if_xnf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xnf.c,v 1.64 2020/07/10 13:26:40 patrick Exp $ */ +/* $OpenBSD: if_xnf.c,v 1.65 2020/12/12 11:48:53 jan Exp $ */ /* * Copyright (c) 2015, 2016 Mike Belopuhov @@ -855,7 +855,7 @@ xnf_rx_ring_fill(struct xnf_softc *sc) id = rxd->rxd_rsp.rxp_id; if (sc->sc_rx_buf[id]) break; - m = MCLGETI(NULL, M_DONTWAIT, NULL, XNF_MCLEN); + m = MCLGETL(NULL, M_DONTWAIT, XNF_MCLEN); if (m == NULL) break; m->m_len = m->m_pkthdr.len = XNF_MCLEN; diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index ae047c6597c..e75546ba901 100644 --- a/sys/dev/usb/if_uath.c +++ b/sys/dev/usb/if_uath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uath.c,v 1.85 2020/07/10 13:22:21 patrick Exp $ */ +/* $OpenBSD: if_uath.c,v 1.86 2020/12/12 11:48:54 jan Exp $ */ /*- * Copyright (c) 2006 @@ -587,7 +587,7 @@ uath_alloc_rx_data_list(struct uath_softc *sc) error = ENOMEM; goto fail; } - MCLGETI(data->m, M_DONTWAIT, NULL, sc->rxbufsz); + MCLGETL(data->m, M_DONTWAIT, sc->rxbufsz); if (!(data->m->m_flags & M_EXT)) { printf("%s: could not allocate rx mbuf cluster\n", sc->sc_dev.dv_xname); @@ -1201,7 +1201,7 @@ uath_data_rxeof(struct usbd_xfer *xfer, void *priv, ifp->if_ierrors++; goto skip; } - MCLGETI(mnew, M_DONTWAIT, NULL, sc->rxbufsz); + MCLGETL(mnew, M_DONTWAIT, sc->rxbufsz); if (!(mnew->m_flags & M_EXT)) { printf("%s: could not allocate rx mbuf cluster\n", sc->sc_dev.dv_xname); |