diff options
author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/dev/txp | |
parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/dev/txp')
-rw-r--r-- | sys/dev/txp/if_txp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c index 7c4d74d..385c91d 100644 --- a/sys/dev/txp/if_txp.c +++ b/sys/dev/txp/if_txp.c @@ -768,13 +768,13 @@ txp_rx_reclaim(sc, r) */ struct mbuf *mnew; - MGETHDR(mnew, M_DONTWAIT, MT_DATA); + MGETHDR(mnew, M_NOWAIT, MT_DATA); if (mnew == NULL) { m_freem(m); goto next; } if (m->m_len > (MHLEN - 2)) { - MCLGET(mnew, M_DONTWAIT); + MCLGET(mnew, M_NOWAIT); if (!(mnew->m_flags & M_EXT)) { m_freem(mnew); m_freem(m); @@ -847,11 +847,11 @@ txp_rxbuf_reclaim(sc) if (sd->sd_mbuf != NULL) break; - MGETHDR(sd->sd_mbuf, M_DONTWAIT, MT_DATA); + MGETHDR(sd->sd_mbuf, M_NOWAIT, MT_DATA); if (sd->sd_mbuf == NULL) goto err_sd; - MCLGET(sd->sd_mbuf, M_DONTWAIT); + MCLGET(sd->sd_mbuf, M_NOWAIT); if ((sd->sd_mbuf->m_flags & M_EXT) == 0) goto err_mbuf; sd->sd_mbuf->m_pkthdr.rcvif = ifp; @@ -1142,11 +1142,11 @@ txp_rxring_fill(sc) for (i = 0; i < RXBUF_ENTRIES; i++) { sd = sc->sc_rxbufs[i].rb_sd; - MGETHDR(sd->sd_mbuf, M_DONTWAIT, MT_DATA); + MGETHDR(sd->sd_mbuf, M_NOWAIT, MT_DATA); if (sd->sd_mbuf == NULL) return(ENOBUFS); - MCLGET(sd->sd_mbuf, M_DONTWAIT); + MCLGET(sd->sd_mbuf, M_NOWAIT); if ((sd->sd_mbuf->m_flags & M_EXT) == 0) { m_freem(sd->sd_mbuf); return(ENOBUFS); |