diff options
| author | glebius <glebius@FreeBSD.org> | 2012-12-04 09:32:43 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2012-12-04 09:32:43 +0000 |
| commit | a69aaa772119d359e38760dd0e931bed9afb88bf (patch) | |
| tree | 30c414dead3eba042cad7b6cbb32d1c9cba96149 /sys/dev/txp | |
| parent | 75a08a975ae27f7cf7af6db9f5ee6e87136be40d (diff) | |
| download | FreeBSD-src-a69aaa772119d359e38760dd0e931bed9afb88bf.zip FreeBSD-src-a69aaa772119d359e38760dd0e931bed9afb88bf.tar.gz | |
Mechanically substitute flags from historic mbuf allocator with
malloc(9) flags in sys/dev.
Diffstat (limited to 'sys/dev/txp')
| -rw-r--r-- | sys/dev/txp/if_txp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c index e51489f..bc6f016 100644 --- a/sys/dev/txp/if_txp.c +++ b/sys/dev/txp/if_txp.c @@ -1015,7 +1015,7 @@ txp_rxbuf_reclaim(struct txp_softc *sc) 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 @@ txp_rxring_fill(struct txp_softc *sc) 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 @@ txp_encap(struct txp_softc *sc, struct txp_tx_ring *r, struct mbuf **m_head) 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; |
