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/tx | |
| 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/tx')
| -rw-r--r-- | sys/dev/tx/if_tx.c | 8 | ||||
| -rw-r--r-- | sys/dev/tx/if_txvar.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c index 189a69e..5a68719 100644 --- a/sys/dev/tx/if_tx.c +++ b/sys/dev/tx/if_tx.c @@ -577,7 +577,7 @@ epic_ifstart(ifp) /* If packet was more than EPIC_MAX_FRAGS parts, */ /* recopy packet to new allocated mbuf cluster */ if( NULL != m ){ - m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); if( NULL == m ){ m_freem(m0); ifp->if_oerrors++; @@ -652,7 +652,7 @@ epic_rx_done(sc) m = buf->mbuf; /* Try to get mbuf cluster */ - buf->mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + buf->mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); if( NULL == buf->mbuf ) { buf->mbuf = m; desc->status = 0x8000; @@ -1415,7 +1415,7 @@ epic_queue_last_packet(sc) if ((desc->status & 0x8000) || (buf->mbuf != NULL)) return (EBUSY); - MGETHDR(m0, M_DONTWAIT, MT_DATA); + MGETHDR(m0, M_NOWAIT, MT_DATA); if (NULL == m0) return (ENOBUFS); @@ -1556,7 +1556,7 @@ epic_init_rings(sc) return EFAULT; } - buf->mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + buf->mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); if( NULL == buf->mbuf ) { epic_free_rings(sc); return ENOBUFS; diff --git a/sys/dev/tx/if_txvar.h b/sys/dev/tx/if_txvar.h index 16dc36d..465727f 100644 --- a/sys/dev/tx/if_txvar.h +++ b/sys/dev/tx/if_txvar.h @@ -134,9 +134,9 @@ struct epic_type { /* Macro to get either mbuf cluster or nothing */ #define EPIC_MGETCLUSTER(m) \ - { MGETHDR((m),M_DONTWAIT,MT_DATA); \ + { MGETHDR((m),M_NOWAIT,MT_DATA); \ if (m) { \ - MCLGET((m),M_DONTWAIT); \ + MCLGET((m),M_NOWAIT); \ if( 0 == ((m)->m_flags & M_EXT) ) { \ m_freem(m); \ (m) = NULL; \ |
