From bf8e8a6e8f0bd9165109f0a258730dd242299815 Mon Sep 17 00:00:00 2001
From: alfred <alfred@FreeBSD.org>
Date: Tue, 21 Jan 2003 08:56:16 +0000
Subject: Remove M_TRYWAIT/M_WAITOK/M_WAIT.  Callers should use 0. Merge
 M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.

---
 sys/dev/de/if_de.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'sys/dev/de')

diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index d186586..9e1e319 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -195,7 +195,7 @@ tulip_txprobe(
      * either is connected so the transmit is the only way
      * to verify the connectivity.
      */
-    MGETHDR(m, M_DONTWAIT, MT_DATA);
+    MGETHDR(m, M_NOWAIT, MT_DATA);
     if (m == NULL)
 	return 0;
     /*
@@ -3545,12 +3545,12 @@ tulip_rx_intr(
 	 */
 	if (accept || ms == NULL) {
 	    struct mbuf *m0;
-	    MGETHDR(m0, M_DONTWAIT, MT_DATA);
+	    MGETHDR(m0, M_NOWAIT, MT_DATA);
 	    if (m0 != NULL) {
 #if defined(TULIP_COPY_RXDATA)
 		if (!accept || total_len >= (MHLEN - 2)) {
 #endif
-		    MCLGET(m0, M_DONTWAIT);
+		    MCLGET(m0, M_NOWAIT);
 		    if ((m0->m_flags & M_EXT) == 0) {
 			m_freem(m0);
 			m0 = NULL;
@@ -4061,10 +4061,10 @@ tulip_mbuf_compress(
 {
     struct mbuf *m0;
 #if MCLBYTES >= ETHERMTU + 18 && !defined(BIG_PACKET)
-    MGETHDR(m0, M_DONTWAIT, MT_DATA);
+    MGETHDR(m0, M_NOWAIT, MT_DATA);
     if (m0 != NULL) {
 	if (m->m_pkthdr.len > MHLEN) {
-	    MCLGET(m0, M_DONTWAIT);
+	    MCLGET(m0, M_NOWAIT);
 	    if ((m0->m_flags & M_EXT) == 0) {
 		m_freem(m);
 		m_freem(m0);
@@ -4081,9 +4081,9 @@ tulip_mbuf_compress(
 
     while (len > 0) {
 	if (mlen == MHLEN) {
-	    MGETHDR(*mp, M_DONTWAIT, MT_DATA);
+	    MGETHDR(*mp, M_NOWAIT, MT_DATA);
 	} else {
-	    MGET(*mp, M_DONTWAIT, MT_DATA);
+	    MGET(*mp, M_NOWAIT, MT_DATA);
 	}
 	if (*mp == NULL) {
 	    m_freem(m0);
@@ -4091,7 +4091,7 @@ tulip_mbuf_compress(
 	    break;
 	}
 	if (len > MLEN) {
-	    MCLGET(*mp, M_DONTWAIT);
+	    MCLGET(*mp, M_NOWAIT);
 	    if (((*mp)->m_flags & M_EXT) == 0) {
 		m_freem(m0);
 		m0 = NULL;
-- 
cgit v1.1