diff options
| author |   pelikan <pelikan@openbsd.org> | 2015-02-09 11:06:52 +0000 |
|---|---|---|
| committer | pelikan <pelikan@openbsd.org> | 2015-02-09 11:06:52 +0000 |
| commit | 3426f8cfb16ff146818bb3743bb92b02b6348d8a (patch) | |
| tree | e4d3f9ddd3fd2dbca427cfcb4b9ab9931f2f8130 | |
| parent | <tedu> Henning and Miod, please add your names to src/share/dict/propernames (diff) | |
| download | wireguard-openbsd-3426f8cfb16ff146818bb3743bb92b02b6348d8a.tar.xz wireguard-openbsd-3426f8cfb16ff146818bb3743bb92b02b6348d8a.zip | |
fix print/panic messages + remove superfluous if_ibytes addition
ok reyk
| -rw-r--r-- | sys/dev/pci/if_vmx.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/pci/if_vmx.c b/sys/dev/pci/if_vmx.c index f656fcd90cf..21bd8b21c6d 100644 --- a/sys/dev/pci/if_vmx.c +++ b/sys/dev/pci/if_vmx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vmx.c,v 1.22 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_vmx.c,v 1.23 2015/02/09 11:06:52 pelikan Exp $ */ /* * Copyright (c) 2013 Tsubai Masanari @@ -664,7 +664,7 @@ vmxnet3_txintr(struct vmxnet3_softc *sc, struct vmxnet3_txqueue *tq) sop = ring->next; if (ring->m[sop] == NULL) - panic("vmxnet3_txintr"); + panic("%s: NULL ring->m[%u]", __func__, sop); m_freem(ring->m[sop]); ring->m[sop] = NULL; bus_dmamap_unload(sc->sc_dmat, ring->dmap[sop]); @@ -719,7 +719,7 @@ vmxnet3_rxintr(struct vmxnet3_softc *sc, struct vmxnet3_rxqueue *rq) bus_dmamap_unload(sc->sc_dmat, ring->dmap[idx]); if (m == NULL) - panic("NULL mbuf"); + panic("%s: NULL ring->m[%u]", __func__, idx); if (letoh32((rxd->rx_word2 >> VMXNET3_RX_BTYPE_S) & VMXNET3_RX_BTYPE_M) != VMXNET3_BTYPE_HEAD) { @@ -732,13 +732,11 @@ vmxnet3_rxintr(struct vmxnet3_softc *sc, struct vmxnet3_rxqueue *rq) goto skip_buffer; } if (len < VMXNET3_MIN_MTU) { - printf("%s: short packet (%d)\n", ifp->if_xname, len); m_freem(m); goto skip_buffer; } ifp->if_ipackets++; - ifp->if_ibytes += len; vmxnet3_rx_csum(rxcd, m); m->m_pkthdr.rcvif = ifp; |