do not whine if we cannot get mbufs. the countless printfd makes the machine

crawl under mbuf starvation, making the situationmuch worse, and don't make
sense in the first place.
ok tdeval@ millert@ beck@ deraadt@

8 files changed, 16 insertions, 71 deletions

diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index ee75a1066f4..e77eabc935e 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bge.c,v 1.23 2004/02/27 16:03:06 niklas Exp $	*/
+/*	$OpenBSD: if_bge.c,v 1.24 2004/04/09 21:52:16 henning Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2001
@@ -764,8 +764,6 @@ bge_newbuf_jumbo(sc, i, m)
 		buf = bge_jalloc(sc);
 		if (buf == NULL) {
 			m_freem(m_new);
-			printf("%s: jumbo allocation failed "
-			    "-- packet dropped!\n", sc->bge_dev.dv_xname);
 			return(ENOBUFS);
 		}
 
diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c
index 3f872bb31c9..2a745455bc4 100644
--- a/sys/dev/pci/if_lge.c
+++ b/sys/dev/pci/if_lge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lge.c,v 1.13 2003/10/06 06:43:12 david Exp $	*/
+/*	$OpenBSD: if_lge.c,v 1.14 2004/04/09 21:52:17 henning Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -764,18 +764,12 @@ int lge_newbuf(sc, c, m)
 	if (m == NULL) {
 		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
-			printf("%s: no memory for rx list "
-			       "-- packet dropped!\n", sc->sc_dv.dv_xname);
 			return(ENOBUFS);
 		}
 
 		/* Allocate the jumbo buffer */
 		buf = lge_jalloc(sc);
 		if (buf == NULL) {
-#ifdef LGE_VERBOSE
-			printf("%s: jumbo allocation failed "
-			       "-- packet dropped!\n", sc->sc_dv.dv_xname);
-#endif
 			m_freem(m_new);
 			return(ENOBUFS);
 		}
@@ -1002,9 +996,6 @@ void lge_rxeof(sc, cnt)
 			    ifp, NULL);
 			lge_newbuf(sc, &LGE_RXTAIL(sc), m);
 			if (m0 == NULL) {
-				printf("%s: no receive buffers "
-				       "available -- packet dropped!\n",
-				       sc->sc_dv.dv_xname);
 				ifp->if_ierrors++;
 				continue;
 			}
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index 31ae9666c44..c0142d0f2a6 100644
--- a/sys/dev/pci/if_nge.c
+++ b/sys/dev/pci/if_nge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nge.c,v 1.26 2003/08/06 21:08:07 millert Exp $	*/
+/*	$OpenBSD: if_nge.c,v 1.27 2004/04/09 21:52:17 henning Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -1108,19 +1108,12 @@ nge_newbuf(sc, c, m)
 
 	if (m == NULL) {
 		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
-		if (m_new == NULL) {
-			printf("%s: no memory for rx list "
-			       "-- packet dropped!\n", sc->sc_dv.dv_xname);
+		if (m_new == NULL)
 			return(ENOBUFS);
-		}
 
 		/* Allocate the jumbo buffer */
 		buf = nge_jalloc(sc);
 		if (buf == NULL) {
-#ifdef NGE_VERBOSE
-			printf("%s: jumbo allocation failed "
-			       "-- packet dropped!\n", sc->sc_dv.dv_xname);
-#endif
 			m_freem(m_new);
 			return(ENOBUFS);
 		}
@@ -1355,9 +1348,6 @@ nge_rxeof(sc)
 			    ETHER_ALIGN, ifp, NULL);
 			nge_newbuf(sc, cur_rx, m);
 			if (m0 == NULL) {
-				printf("%s: no receive buffers "
-				    "available -- packet dropped!\n",
-				    sc->sc_dv.dv_xname);
 				ifp->if_ierrors++;
 				continue;
 			}
diff --git a/sys/dev/pci/if_sf.c b/sys/dev/pci/if_sf.c
index c245f0a5274..e7bf60bc952 100644
--- a/sys/dev/pci/if_sf.c
+++ b/sys/dev/pci/if_sf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sf.c,v 1.21 2003/06/29 17:19:17 avsm Exp $ */
+/*	$OpenBSD: if_sf.c,v 1.22 2004/04/09 21:52:17 henning Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -819,16 +819,11 @@ int sf_newbuf(sc, c, m)
 
 	if (m == NULL) {
 		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
-		if (m_new == NULL) {
-			printf("%s: no memory for rx list -- "
-			    "packet dropped!\n", sc->sc_dev.dv_xname);
+		if (m_new == NULL)
 			return(ENOBUFS);
-		}
 
 		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
-			printf("%s: no memory for rx list -- "
-			    "packet dropped!\n", sc->sc_dev.dv_xname);
 			m_freem(m_new);
 			return(ENOBUFS);
 		}
diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c
index 6bbe959e9a4..6829c1b85f3 100644
--- a/sys/dev/pci/if_sis.c
+++ b/sys/dev/pci/if_sis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sis.c,v 1.36 2004/01/01 11:44:49 markus Exp $ */
+/*	$OpenBSD: if_sis.c,v 1.37 2004/04/09 21:52:17 henning Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -1249,16 +1249,11 @@ int sis_newbuf(sc, c, m)
 
 	if (m == NULL) {
 		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
-		if (m_new == NULL) {
-			printf("%s: no memory for rx list -- packet dropped!\n",
-			    sc->sc_dev.dv_xname);
+		if (m_new == NULL)
 			return(ENOBUFS);
-		}
 
 		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
-			printf("%s: no memory for rx list -- packet dropped!\n",
-			    sc->sc_dev.dv_xname);
 			m_freem(m_new);
 			return(ENOBUFS);
 		}
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index abcb2d27f58..0a61add7763 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sk.c,v 1.38 2004/03/09 20:39:56 matthieu Exp $	*/
+/*	$OpenBSD: if_sk.c,v 1.39 2004/04/09 21:52:17 henning Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -793,11 +793,8 @@ sk_newbuf(struct sk_if_softc *sc_if, int i, struct mbuf *m,
 
 	if (m == NULL) {
 		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
-		if (m_new == NULL) {
-			printf("%s: no memory for rx list -- "
-			    "packet dropped!\n", sc_if->sk_dev.dv_xname);
+		if (m_new == NULL)
 			return(ENOBUFS);
-		}
 
 		/* Allocate the jumbo buffer */
 		MCLGET(m_new, M_DONTWAIT);
@@ -1692,9 +1689,6 @@ sk_rxeof(struct sk_if_softc *sc_if)
 			    total_len + ETHER_ALIGN, 0, ifp, NULL);
 			sk_newbuf(sc_if, cur, m, dmamap);
 			if (m0 == NULL) {
-				printf("%s: no receive buffers "
-				    "available -- packet dropped!\n",
-				    sc_if->sk_dev.dv_xname);
 				ifp->if_ierrors++;
 				continue;
 			}
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index 6b234452cc3..4c10b2cdada 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ste.c,v 1.20 2003/06/29 17:20:03 avsm Exp $ */
+/*	$OpenBSD: if_ste.c,v 1.21 2004/04/09 21:52:17 henning Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -1017,15 +1017,10 @@ int ste_newbuf(sc, c, m)
 
 	if (m == NULL) {
 		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
-		if (m_new == NULL) {
-			printf("%s: no memory for rx list -- "
-			    "packet dropped\n", sc->sc_dev.dv_xname);
+		if (m_new == NULL)
 			return(ENOBUFS);
-		}
 		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
-			printf("%s: no memory for rx list -- "
-			    "packet dropped\n", sc->sc_dev.dv_xname);
 			m_freem(m_new);
 			return(ENOBUFS);
 		}
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c
index 0ed0ea947eb..6ca8c6ba5c4 100644
--- a/sys/dev/pci/if_ti.c
+++ b/sys/dev/pci/if_ti.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ti.c,v 1.48 2003/12/16 08:20:44 deraadt Exp $	*/
+/*	$OpenBSD: if_ti.c,v 1.49 2004/04/09 21:52:17 henning Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -756,16 +756,11 @@ int ti_newbuf_std(sc, i, m, dmamap)
 
 	if (m == NULL) {
 		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
-		if (m_new == NULL) {
-			printf("%s: mbuf allocation failed "
-			    "-- packet dropped!\n", sc->sc_dv.dv_xname);
+		if (m_new == NULL)
 			return(ENOBUFS);
-		}
 
 		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
-			printf("%s: cluster allocation failed "
-			    "-- packet dropped!\n", sc->sc_dv.dv_xname);
 			m_freem(m_new);
 			return(ENOBUFS);
 		}
@@ -829,11 +824,8 @@ int ti_newbuf_mini(sc, i, m, dmamap)
 
 	if (m == NULL) {
 		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
-		if (m_new == NULL) {
-			printf("%s: mbuf allocation failed "
-			    "-- packet dropped!\n", sc->sc_dv.dv_xname);
+		if (m_new == NULL)
 			return(ENOBUFS);
-		}
 		m_new->m_len = m_new->m_pkthdr.len = MHLEN;
 		m_adj(m_new, ETHER_ALIGN);
 
@@ -875,18 +867,13 @@ int ti_newbuf_jumbo(sc, i, m)
 
 		/* Allocate the mbuf. */
 		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
-		if (m_new == NULL) {
-			printf("%s: mbuf allocation failed "
-			    "-- packet dropped!\n", sc->sc_dv.dv_xname);
+		if (m_new == NULL)
 			return(ENOBUFS);
-		}
 
 		/* Allocate the jumbo buffer */
 		buf = ti_jalloc(sc);
 		if (buf == NULL) {
 			m_freem(m_new);
-			printf("%s: jumbo allocation failed "
-			    "-- packet dropped!\n", sc->sc_dv.dv_xname);
 			return(ENOBUFS);
 		}