Replaced the misleading uses of a historical artefact M_TRYWAIT with M_WAIT.

Removed dead code that assumed that M_TRYWAIT can return NULL; it's not true
since the advent of MBUMA.

Reviewed by:	arch

There are ongoing disputes as to whether we want to switch to directly using
UMA flags M_WAITOK/M_NOWAIT for mbuf(9) allocation.

6 files changed, 11 insertions, 38 deletions

diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index eef3241..7de49049 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -386,13 +386,10 @@ bpf_movein(struct uio *uio, int linktype, struct ifnet *ifp, struct mbuf **mp,
 	if ((unsigned)len > MCLBYTES)
 		return (EIO);
 
-	if (len > MHLEN) {
-		m = m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR);
-	} else {
-		MGETHDR(m, M_TRYWAIT, MT_DATA);
-	}
-	if (m == NULL)
-		return (ENOBUFS);
+	if (len > MHLEN)
+		m = m_getcl(M_WAIT, MT_DATA, M_PKTHDR);
+	else
+		MGETHDR(m, M_WAIT, MT_DATA);
 	m->m_pkthdr.len = m->m_len = len;
 	m->m_pkthdr.rcvif = NULL;
 	*mp = m;
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c
index 19c1687..cf12fab 100644
--- a/sys/net/if_ef.c
+++ b/sys/net/if_ef.c
@@ -415,11 +415,7 @@ ef_output(struct ifnet *ifp, struct mbuf **mp, struct sockaddr *dst, short *tp,
 		type = htons(m->m_pkthdr.len);
 		break;
 	    case ETHER_FT_8022:
-		M_PREPEND(m, ETHER_HDR_LEN + 3, M_TRYWAIT);
-		if (m == NULL) {
-			*mp = NULL;
-			return ENOBUFS;
-		}
+		M_PREPEND(m, ETHER_HDR_LEN + 3, M_WAIT);
 		/*
 		 * Ensure that ethernet header and next three bytes
 		 * will fit into single mbuf
@@ -438,11 +434,7 @@ ef_output(struct ifnet *ifp, struct mbuf **mp, struct sockaddr *dst, short *tp,
 		*hlen += 3;
 		break;
 	    case ETHER_FT_SNAP:
-		M_PREPEND(m, 8, M_TRYWAIT);
-		if (m == NULL) {
-			*mp = NULL;
-			return ENOBUFS;
-		}
+		M_PREPEND(m, 8, M_WAIT);
 		type = htons(m->m_pkthdr.len);
 		cp = mtod(m, u_char *);
 		bcopy("\xAA\xAA\x03\x00\x00\x00\x81\x37", cp, 8);
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 7152eac..c4e7b62 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -204,9 +204,7 @@ fddi_output(ifp, m, dst, rt0)
 	    if (aa->aa_flags & AFA_PHASE2) {
 		struct llc llc;
 
-		M_PREPEND(m, LLC_SNAPFRAMELEN, M_TRYWAIT);
-		if (m == 0)
-			senderr(ENOBUFS);
+		M_PREPEND(m, LLC_SNAPFRAMELEN, M_WAIT);
 		llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP;
 		llc.llc_control = LLC_UI;
 		bcopy(at_org_code, llc.llc_snap.org_code, sizeof(at_org_code));
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index 7abf585..dd50923 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -336,9 +336,7 @@ iso88025_output(ifp, m, dst, rt0)
 		bcopy((caddr_t)&(satoipx_addr(dst).x_host), (caddr_t)edst,
 		      ISO88025_ADDR_LEN);
 
-		M_PREPEND(m, 3, M_TRYWAIT);
-		if (m == 0)
-			senderr(ENOBUFS);
+		M_PREPEND(m, 3, M_WAIT);
 		m = m_pullup(m, 3);
 		if (m == 0)
 			senderr(ENOBUFS);
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 3e33970..801d3a7 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -298,20 +298,8 @@ slcreate(void)
 		return (NULL);
 	}
 
-	m = m_gethdr(M_TRYWAIT, MT_DATA);
-	if (m != NULL) {
-		MCLGET(m, M_TRYWAIT);
-		if ((m->m_flags & M_EXT) == 0) {
-			m_free(m);
-			m = NULL;
-		}
-	}
-
-	if (m == NULL) {
-		printf("sl: can't allocate buffer\n");
-		free(sc, M_SL);
-		return (NULL);
-	}
+	m = m_gethdr(M_WAIT, MT_DATA);
+	MCLGET(m, M_WAIT);
 
 	sc->sc_ep = mtod(m, u_char *) + SLBUFSIZE;
 	sc->sc_mbuf = m;
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 705db61..dd41180 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -141,7 +141,7 @@ raw_bind(so, nam)
 	if (ifnet == 0)
 		return (EADDRNOTAVAIL);
 	rp = sotorawcb(so);
-	nam = m_copym(nam, 0, M_COPYALL, M_TRYWAIT);
+	nam = m_copym(nam, 0, M_COPYALL, M_WAIT);
 	rp->rcb_laddr = mtod(nam, struct sockaddr *);
 	return (0);
 }