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

Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.

4 files changed, 11 insertions, 11 deletions

diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index 33033d2..e35b4e5 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -255,7 +255,7 @@ i4biprattach(void *dummy)
 
 #ifdef IPR_VJ_USEBUFFER
 		if(!((sc->sc_cbuf =
-		   (u_char *)malloc(I4BIPRMAXMTU+128, M_DEVBUF, M_WAITOK))))
+		   (u_char *)malloc(I4BIPRMAXMTU+128, M_DEVBUF, 0))))
 		{
 			panic("if_ipr.c, ipr_attach: VJ malloc failed");
 		}
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
index c5c3d47..ee698c7 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
@@ -121,7 +121,7 @@ ihfc_ph_data_req(int unit, struct mbuf *m, int freeflag)
 
 	/* "Allow" I-frames (-hp) */
 
-	if (freeflag == MBUF_DONTFREE)	m = m_copypacket(m, M_DONTWAIT);
+	if (freeflag == MBUF_DONTFREE)	m = m_copypacket(m, M_NOWAIT);
 
 	if (!_IF_QFULL(&S_IFQUEUE) && m)
 	{
diff --git a/sys/i4b/layer2/i4b_mbuf.c b/sys/i4b/layer2/i4b_mbuf.c
index 95f234c..c12a9ae 100644
--- a/sys/i4b/layer2/i4b_mbuf.c
+++ b/sys/i4b/layer2/i4b_mbuf.c
@@ -78,7 +78,7 @@ i4b_Dgetmbuf(int len)
 		return(NULL);
 	}
 
-	MGETHDR(m, M_DONTWAIT, MT_I4B_D);	/* get mbuf with pkthdr */
+	MGETHDR(m, M_NOWAIT, MT_I4B_D);	/* get mbuf with pkthdr */
 
 	/* did we actually get the mbuf ? */
 
@@ -94,7 +94,7 @@ i4b_Dgetmbuf(int len)
 
 	if(len >= MHLEN)
 	{
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 
 		if(!(m->m_flags & M_EXT))
 		{
@@ -155,7 +155,7 @@ i4b_Bgetmbuf(int len)
 		return(NULL);
 	}
 
-	MGETHDR(m, M_DONTWAIT, MT_I4B_B);	/* get mbuf with pkthdr */
+	MGETHDR(m, M_NOWAIT, MT_I4B_B);	/* get mbuf with pkthdr */
 
 	/* did we actually get the mbuf ? */
 
@@ -171,7 +171,7 @@ i4b_Bgetmbuf(int len)
 
 	if(len >= MHLEN)
 	{
-		MCLGET(m, M_DONTWAIT);
+		MCLGET(m, M_NOWAIT);
 
 		if(!(m->m_flags & M_EXT))
 		{
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index 1dffc0f..95afcc9 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -646,10 +646,10 @@ i4bioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 			}
 
 			prots = malloc(r->numprotos * sizeof(struct isdn_dr_prot),
-					M_DEVBUF, M_WAITOK);
+					M_DEVBUF, 0);
 
 			prots2 = malloc(r->numprotos * sizeof(struct isdn_dr_prot),
-					M_DEVBUF, M_WAITOK);
+					M_DEVBUF, 0);
 
 			if(!prots || !prots2)
 			{
@@ -661,7 +661,7 @@ i4bioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 
 			for(i = 0; i < r->numprotos; i++)
 			{
-				prots2[i].microcode = malloc(prots[i].bytecount, M_DEVBUF, M_WAITOK);
+				prots2[i].microcode = malloc(prots[i].bytecount, M_DEVBUF, 0);
 				copyin(prots[i].microcode, prots2[i].microcode, prots[i].bytecount);
 				prots2[i].bytecount = prots[i].bytecount; 
 			}
@@ -721,7 +721,7 @@ download_done:
 				    	goto diag_done;
 				}	
 
-				req.in_param = malloc(r->in_param_len, M_DEVBUF, M_WAITOK);
+				req.in_param = malloc(r->in_param_len, M_DEVBUF, 0);
 
 				if(!req.in_param)
 				{
@@ -735,7 +735,7 @@ download_done:
 
 			if(req.out_param_len)
 			{
-				req.out_param = malloc(r->out_param_len, M_DEVBUF, M_WAITOK);
+				req.out_param = malloc(r->out_param_len, M_DEVBUF, 0);
 
 				if(!req.out_param)
 				{