summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authormikeb <mikeb@openbsd.org>2012-11-29 13:23:00 +0000
committermikeb <mikeb@openbsd.org>2012-11-29 13:23:00 +0000
commitd4b0809aaa2155de753abfd4546573e48fdc640c (patch)
treefcd2d8390c5c6c042c1713d859bcf4d37b0847f3 /sys/dev
parentexport ipintrq drops as ifInDiscards; ok reyk (diff)
downloadwireguard-openbsd-d4b0809aaa2155de753abfd4546573e48fdc640c.tar.xz
wireguard-openbsd-d4b0809aaa2155de753abfd4546573e48fdc640c.zip
make ix complile with IX_DEBUG defined, based on the patch from
mxb at alumni ! chalmers ! se. thanks!
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_ix.c11
-rw-r--r--sys/dev/pci/if_ix.h5
2 files changed, 4 insertions, 12 deletions
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c
index 333ef1f2201..40561cb23d3 100644
--- a/sys/dev/pci/if_ix.c
+++ b/sys/dev/pci/if_ix.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ix.c,v 1.75 2012/11/23 04:34:11 brad Exp $ */
+/* $OpenBSD: if_ix.c,v 1.76 2012/11/29 13:23:00 mikeb Exp $ */
/******************************************************************************
@@ -2518,10 +2518,8 @@ ixgbe_get_buf(struct rx_ring *rxr, int i)
/* needed in any case so prealocate since this one will fail for sure */
mp = MCLGETI(NULL, M_DONTWAIT, &sc->arpcom.ac_if, sc->rx_mbuf_sz);
- if (!mp) {
- sc->mbuf_packet_failed++;
+ if (!mp)
return (ENOBUFS);
- }
if (rxr->hdr_split == FALSE)
goto no_split;
@@ -3515,15 +3513,12 @@ ixgbe_print_hw_stats(struct ix_softc * sc)
{
struct ifnet *ifp = &sc->arpcom.ac_if;;
- printf("%s: mbuf alloc failed %lu, mbuf cluster failed %lu, "
- "missed pkts %llu, rx len errs %llu, crc errs %llu, "
+ printf("%s: missed pkts %llu, rx len errs %llu, crc errs %llu, "
"dropped pkts %lu, watchdog timeouts %ld, "
"XON rx %llu, XON tx %llu, XOFF rx %llu, XOFF tx %llu, "
"total pkts rx %llu, good pkts rx %llu, good pkts tx %llu, "
"tso tx %lu\n",
ifp->if_xname,
- sc->mbuf_alloc_failed,
- sc->mbuf_cluster_failed,
(long long)sc->stats.mpc[0],
(long long)sc->stats.roc + (long long)sc->stats.ruc,
(long long)sc->stats.crcerrs,
diff --git a/sys/dev/pci/if_ix.h b/sys/dev/pci/if_ix.h
index f80a54ed38c..9f00301fbe2 100644
--- a/sys/dev/pci/if_ix.h
+++ b/sys/dev/pci/if_ix.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ix.h,v 1.19 2012/10/30 14:00:02 mikeb Exp $ */
+/* $OpenBSD: if_ix.h,v 1.20 2012/11/29 13:23:00 mikeb Exp $ */
/******************************************************************************
@@ -305,9 +305,6 @@ struct ix_softc {
/* Misc stats maintained by the driver */
unsigned long dropped_pkts;
- unsigned long mbuf_defrag_failed;
- unsigned long mbuf_header_failed;
- unsigned long mbuf_packet_failed;
unsigned long no_tx_map_avail;
unsigned long no_tx_dma_setup;
unsigned long watchdog_events;