From cb46bc11558a2bd1a3e4acffedd055d99de6e5df Mon Sep 17 00:00:00 2001 From: luigi Date: Tue, 4 Dec 2001 02:30:53 +0000 Subject: Remove error messages on mbuf allocation failures, now this is done more safely in kern/subr_mbuf.c Two-days'-delay-thanks-to: @home shutting down service --- sys/dev/dc/if_dc.c | 12 ++---------- sys/pci/if_dc.c | 12 ++---------- sys/pci/if_sis.c | 7 +------ 3 files changed, 5 insertions(+), 26 deletions(-) (limited to 'sys') diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index 4506fe8..05d2ff6 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -2272,16 +2272,11 @@ static int dc_newbuf(sc, i, m) if (m == NULL) { MGETHDR(m_new, M_DONTWAIT, MT_DATA); - if (m_new == NULL) { - printf("dc%d: no memory for rx list " - "-- packet dropped!\n", sc->dc_unit); + if (m_new == NULL) return(ENOBUFS); - } MCLGET(m_new, M_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { - printf("dc%d: no memory for rx list " - "-- packet dropped!\n", sc->dc_unit); m_freem(m_new); return(ENOBUFS); } @@ -2949,15 +2944,12 @@ static int dc_coal(sc, m_head) m = *m_head; MGETHDR(m_new, M_DONTWAIT, MT_DATA); - if (m_new == NULL) { - printf("dc%d: no memory for tx list", sc->dc_unit); + if (m_new == NULL) return(ENOBUFS); - } if (m->m_pkthdr.len > MHLEN) { MCLGET(m_new, M_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); - printf("dc%d: no memory for tx list", sc->dc_unit); return(ENOBUFS); } } diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c index 4506fe8..05d2ff6 100644 --- a/sys/pci/if_dc.c +++ b/sys/pci/if_dc.c @@ -2272,16 +2272,11 @@ static int dc_newbuf(sc, i, m) if (m == NULL) { MGETHDR(m_new, M_DONTWAIT, MT_DATA); - if (m_new == NULL) { - printf("dc%d: no memory for rx list " - "-- packet dropped!\n", sc->dc_unit); + if (m_new == NULL) return(ENOBUFS); - } MCLGET(m_new, M_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { - printf("dc%d: no memory for rx list " - "-- packet dropped!\n", sc->dc_unit); m_freem(m_new); return(ENOBUFS); } @@ -2949,15 +2944,12 @@ static int dc_coal(sc, m_head) m = *m_head; MGETHDR(m_new, M_DONTWAIT, MT_DATA); - if (m_new == NULL) { - printf("dc%d: no memory for tx list", sc->dc_unit); + if (m_new == NULL) return(ENOBUFS); - } if (m->m_pkthdr.len > MHLEN) { MCLGET(m_new, M_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); - printf("dc%d: no memory for tx list", sc->dc_unit); return(ENOBUFS); } } diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c index c4ac140..b123fa9 100644 --- a/sys/pci/if_sis.c +++ b/sys/pci/if_sis.c @@ -1217,16 +1217,11 @@ static int sis_newbuf(sc, c, m) if (m == NULL) { MGETHDR(m_new, M_DONTWAIT, MT_DATA); - if (m_new == NULL) { - printf("sis%d: no memory for rx list " - "-- packet dropped!\n", sc->sis_unit); + if (m_new == NULL) return(ENOBUFS); - } MCLGET(m_new, M_DONTWAIT); if (!(m_new->m_flags & M_EXT)) { - printf("sis%d: no memory for rx list " - "-- packet dropped!\n", sc->sis_unit); m_freem(m_new); return(ENOBUFS); } -- cgit v1.1