diff options
| author |   mikeb <mikeb@openbsd.org> | 2012-08-16 09:30:55 +0000 |
|---|---|---|
| committer | mikeb <mikeb@openbsd.org> | 2012-08-16 09:30:55 +0000 |
| commit | 04300e744fd2aff7202c988a7f0e14c2283ad5db (patch) | |
| tree | ff205928eebe4ae1992aba15390a45219a7dede1 /sys/dev | |
| parent | mfii_exec_done clears ccb_cookie, so mfii_exec should test that, not (diff) | |
| download | wireguard-openbsd-04300e744fd2aff7202c988a7f0e14c2283ad5db.tar.xz wireguard-openbsd-04300e744fd2aff7202c988a7f0e14c2283ad5db.zip | |
revert previous; wrong diff
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_em.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index d69e8c7fbfb..473824cbb3a 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.265 2012/08/15 16:30:25 mikeb Exp $ */ +/* $OpenBSD: if_em.c,v 1.266 2012/08/16 09:30:55 mikeb Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -2534,8 +2534,6 @@ em_allocate_receive_structures(struct em_softc *sc) sc->sc_dv.dv_xname); return (ENOMEM); } - printf("%s: allocated rx_buffer_area at %p (for %d)\n", - sc->sc_dv.dv_xname, sc->rx_buffer_area, sc->num_rx_desc); sc->rxtag = sc->osdep.em_pa.pa_dmat; @@ -2721,8 +2719,6 @@ em_free_receive_structures(struct em_softc *sc) } } if (sc->rx_buffer_area != NULL) { - printf("%s: deallocated rx_buffer_area at %p\n", - sc->sc_dv.dv_xname, sc->rx_buffer_area); free(sc->rx_buffer_area, M_DEVBUF); sc->rx_buffer_area = NULL; } @@ -2787,7 +2783,7 @@ int em_rxfill(struct em_softc *sc) { int post = 0; - int i, iter = 0; + int i; i = sc->last_rx_desc_filled; @@ -2795,14 +2791,6 @@ em_rxfill(struct em_softc *sc) if (++i == sc->num_rx_desc) i = 0; - if (&sc->rx_buffer_area[i] == NULL) - panic("%s: rxfill(%d): null pkt at %p[%d], " - "last %d ndescs %d/%d\n", sc->sc_dv.dv_xname, - iter, sc->rx_buffer_area, i, - sc->last_rx_desc_filled, sc->rx_ndescs, - sc->num_rx_desc); - iter++; - if (em_get_buf(sc, i) != 0) break; |