Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.

Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.

6 files changed, 14 insertions, 14 deletions

diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c
index 35aa27d..6d2be1a 100644
--- a/sys/netipx/ipx.c
+++ b/sys/netipx/ipx.c
@@ -130,7 +130,7 @@ ipx_control(so, cmd, data, ifp, td)
 		if (ia == NULL) {
 			oia = (struct ipx_ifaddr *)
 				malloc(sizeof(*ia), M_IFADDR,
-				M_WAITOK | M_ZERO);
+				M_ZERO);
 			if (oia == NULL)
 				return (ENOBUFS);
 			if ((ia = ipx_ifaddr) != NULL) {
diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c
index 3410a41..b3d95d2 100644
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@@ -483,7 +483,7 @@ struct ifnet *ifp;
 		if (m0 != NULL) {
 			register struct ipx *ipx;
 
-			M_PREPEND(m0, sizeof(*ipx), M_DONTWAIT);
+			M_PREPEND(m0, sizeof(*ipx), M_NOWAIT);
 			if (m0 == NULL)
 				continue;
 			ipx = mtod(m0, struct ipx *);
diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c
index 6f5d74c..59e769b 100644
--- a/sys/netipx/ipx_ip.c
+++ b/sys/netipx/ipx_ip.c
@@ -175,7 +175,7 @@ ipxip_input(m, hlen)
 		if (ipxip_lastin != NULL) {
 			m_freem(ipxip_lastin);
 		}
-		ipxip_lastin = m_copym(m, 0, (int)M_COPYALL, M_DONTWAIT);
+		ipxip_lastin = m_copym(m, 0, (int)M_COPYALL, M_NOWAIT);
 	}
 	/*
 	 * Get IP and IPX header together in first mbuf.
@@ -256,7 +256,7 @@ ipxipoutput(ifp, m, dst, rt)
 	/* following clause not necessary on vax */
 	if (3 & (intptr_t)m->m_data) {
 		/* force longword alignment of ip hdr */
-		struct mbuf *m0 = m_gethdr(MT_HEADER, M_DONTWAIT);
+		struct mbuf *m0 = m_gethdr(MT_HEADER, M_NOWAIT);
 		if (m0 == NULL) {
 			m_freem(m);
 			return (ENOBUFS);
@@ -269,7 +269,7 @@ ipxipoutput(ifp, m, dst, rt)
 		m->m_flags &= ~M_PKTHDR;
 		m = m0;
 	} else {
-		M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct ip), M_NOWAIT);
 		if (m == NULL)
 			return (ENOBUFS);
 	}
diff --git a/sys/netipx/ipx_outputfl.c b/sys/netipx/ipx_outputfl.c
index 9f608dd..0436847 100644
--- a/sys/netipx/ipx_outputfl.c
+++ b/sys/netipx/ipx_outputfl.c
@@ -244,7 +244,7 @@ ipx_output_type20(m)
 			if(ipx->ipx_sum != 0xffff)
 				ipx->ipx_sum = ipx_cksum(m, ntohs(ipx->ipx_len));
 
-			m1 = m_copym(m, 0, M_COPYALL, M_DONTWAIT);
+			m1 = m_copym(m, 0, M_COPYALL, M_NOWAIT);
 			if(m1) {
 				error = (*ifp->if_output)(ifp, m1,
 					(struct sockaddr *)&dst, NULL);
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c
index f0c803a..bf05808 100644
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@@ -218,7 +218,7 @@ ipx_output(ipxp, m0)
 			(m->m_len + m->m_data < &m->m_dat[MLEN])) {
 			mtod(m, char*)[m->m_len++] = 0;
 		} else {
-			struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
+			struct mbuf *m1 = m_get(M_NOWAIT, MT_DATA);
 
 			if (m1 == NULL) {
 				m_freem(m0);
@@ -239,7 +239,7 @@ ipx_output(ipxp, m0)
 	if (ipxp->ipxp_flags & IPXP_RAWOUT) {
 		ipx = mtod(m, struct ipx *);
 	} else {
-		M_PREPEND(m, sizeof(struct ipx), M_DONTWAIT);
+		M_PREPEND(m, sizeof(struct ipx), M_NOWAIT);
 		if (m == NULL)
 			return (ENOBUFS);
 		ipx = mtod(m, struct ipx *);
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index 189d741..92402c8 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -579,7 +579,7 @@ present:
 				spx_newchecks[4]++;
 				if (dt != cb->s_rhdr.spx_dt) {
 					struct mbuf *mm =
-					   m_getclr(M_DONTWAIT, MT_CONTROL);
+					   m_getclr(M_NOWAIT, MT_CONTROL);
 					spx_newchecks[0]++;
 					if (mm != NULL) {
 						u_short *s =
@@ -755,7 +755,7 @@ spx_output(cb, m0)
 					 * from usrreq(), so it is OK to
 					 * block.
 					 */
-					m = m_copym(m0, 0, mtu, M_TRYWAIT);
+					m = m_copym(m0, 0, mtu, 0);
 					if (cb->s_flags & SF_NEWCALL) {
 					    struct mbuf *mm = m;
 					    spx_newchecks[7]++;
@@ -785,7 +785,7 @@ spx_output(cb, m0)
 			if (M_TRAILINGSPACE(m) >= 1)
 				m->m_len++;
 			else {
-				struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
+				struct mbuf *m1 = m_get(M_NOWAIT, MT_DATA);
 
 				if (m1 == NULL) {
 					m_freem(m0);
@@ -796,7 +796,7 @@ spx_output(cb, m0)
 				m->m_next = m1;
 			}
 		}
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
+		m = m_gethdr(M_NOWAIT, MT_HEADER);
 		if (m == NULL) {
 			m_freem(m0);
 			return (ENOBUFS);
@@ -1009,7 +1009,7 @@ send:
 			spxstat.spxs_sndprobe++;
 		if (cb->s_flags & SF_ACKNOW)
 			spxstat.spxs_sndacks++;
-		m = m_gethdr(M_DONTWAIT, MT_HEADER);
+		m = m_gethdr(M_NOWAIT, MT_HEADER);
 		if (m == NULL)
 			return (ENOBUFS);
 		/*
@@ -1342,7 +1342,7 @@ spx_attach(so, proto, td)
 	}
 	sb = &so->so_snd;
 
-	mm = m_getclr(M_DONTWAIT, MT_HEADER);
+	mm = m_getclr(M_NOWAIT, MT_HEADER);
 	if (mm == NULL) {
 		FREE(cb, M_PCB);
 		error = ENOBUFS;