Module Name: src Committed By: msaitoh Date: Thu Aug 26 09:03:47 UTC 2021
Modified Files: src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe.c ixgbe.h ixv.c Log Message: Remove "j" or "jumbo" because we always use MCLBYTES sized buffer. To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/sys/dev/pci/ixgbe/ix_txrx.c cvs rdiff -u -r1.289 -r1.290 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.78 -r1.79 src/sys/dev/pci/ixgbe/ixgbe.h cvs rdiff -u -r1.165 -r1.166 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/ixgbe/ix_txrx.c diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.87 src/sys/dev/pci/ixgbe/ix_txrx.c:1.88 --- src/sys/dev/pci/ixgbe/ix_txrx.c:1.87 Wed Aug 25 09:06:02 2021 +++ src/sys/dev/pci/ixgbe/ix_txrx.c Thu Aug 26 09:03:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ix_txrx.c,v 1.87 2021/08/25 09:06:02 msaitoh Exp $ */ +/* $NetBSD: ix_txrx.c,v 1.88 2021/08/26 09:03:47 msaitoh Exp $ */ /****************************************************************************** @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.87 2021/08/25 09:06:02 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.88 2021/08/26 09:03:47 msaitoh Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -1353,7 +1353,7 @@ ixgbe_refresh_mbufs(struct rx_ring *rxr, if (rxbuf->buf == NULL) { mp = ixgbe_getcl(); if (mp == NULL) { - rxr->no_jmbuf.ev_count++; + rxr->no_mbuf.ev_count++; goto update; } mp->m_pkthdr.len = mp->m_len = rxr->mbuf_sz; @@ -1536,7 +1536,7 @@ ixgbe_setup_receive_ring(struct rx_ring rxbuf->flags = 0; rxbuf->buf = ixgbe_getcl(); if (rxbuf->buf == NULL) { - rxr->no_jmbuf.ev_count++; + rxr->no_mbuf.ev_count++; error = ENOBUFS; goto fail; } @@ -1881,7 +1881,7 @@ ixgbe_rxeof(struct ix_queue *que) else newmp = NULL; if (newmp == NULL) { - rxr->no_jmbuf.ev_count++; + rxr->no_mbuf.ev_count++; /* * Descriptor initialization is already done by the * above code (cur->wb.upper.status_error = 0). Index: src/sys/dev/pci/ixgbe/ixgbe.c diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.289 src/sys/dev/pci/ixgbe/ixgbe.c:1.290 --- src/sys/dev/pci/ixgbe/ixgbe.c:1.289 Wed Aug 25 09:06:02 2021 +++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Aug 26 09:03:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.c,v 1.289 2021/08/25 09:06:02 msaitoh Exp $ */ +/* $NetBSD: ixgbe.c,v 1.290 2021/08/26 09:03:47 msaitoh Exp $ */ /****************************************************************************** @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.289 2021/08/25 09:06:02 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.290 2021/08/26 09:03:47 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1971,8 +1971,8 @@ ixgbe_add_hw_stats(struct adapter *adapt "Queue Bytes Received"); evcnt_attach_dynamic(&rxr->rx_copies, EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf, "Copied RX Frames"); - evcnt_attach_dynamic(&rxr->no_jmbuf, EVCNT_TYPE_MISC, - NULL, adapter->queues[i].evnamebuf, "Rx no jumbo mbuf"); + evcnt_attach_dynamic(&rxr->no_mbuf, EVCNT_TYPE_MISC, + NULL, adapter->queues[i].evnamebuf, "Rx no mbuf"); evcnt_attach_dynamic(&rxr->rx_discarded, EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf, "Rx discarded"); #ifdef LRO @@ -2170,7 +2170,7 @@ ixgbe_clear_evcnt(struct adapter *adapte rxr->rx_packets.ev_count = 0; rxr->rx_bytes.ev_count = 0; rxr->rx_copies.ev_count = 0; - rxr->no_jmbuf.ev_count = 0; + rxr->no_mbuf.ev_count = 0; rxr->rx_discarded.ev_count = 0; } stats->ipcs.ev_count = 0; @@ -3774,7 +3774,7 @@ ixgbe_detach(device_t dev, int flags) evcnt_detach(&rxr->rx_packets); evcnt_detach(&rxr->rx_bytes); evcnt_detach(&rxr->rx_copies); - evcnt_detach(&rxr->no_jmbuf); + evcnt_detach(&rxr->no_mbuf); evcnt_detach(&rxr->rx_discarded); } evcnt_detach(&stats->ipcs); Index: src/sys/dev/pci/ixgbe/ixgbe.h diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.78 src/sys/dev/pci/ixgbe/ixgbe.h:1.79 --- src/sys/dev/pci/ixgbe/ixgbe.h:1.78 Wed Aug 25 09:06:02 2021 +++ src/sys/dev/pci/ixgbe/ixgbe.h Thu Aug 26 09:03:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.h,v 1.78 2021/08/25 09:06:02 msaitoh Exp $ */ +/* $NetBSD: ixgbe.h,v 1.79 2021/08/26 09:03:47 msaitoh Exp $ */ /****************************************************************************** SPDX-License-Identifier: BSD-3-Clause @@ -425,7 +425,7 @@ struct rx_ring { struct evcnt rx_packets; struct evcnt rx_bytes; struct evcnt rx_discarded; - struct evcnt no_jmbuf; + struct evcnt no_mbuf; u64 rsc_num; /* Flow Director */ Index: src/sys/dev/pci/ixgbe/ixv.c diff -u src/sys/dev/pci/ixgbe/ixv.c:1.165 src/sys/dev/pci/ixgbe/ixv.c:1.166 --- src/sys/dev/pci/ixgbe/ixv.c:1.165 Wed Aug 25 09:06:02 2021 +++ src/sys/dev/pci/ixgbe/ixv.c Thu Aug 26 09:03:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ixv.c,v 1.165 2021/08/25 09:06:02 msaitoh Exp $ */ +/* $NetBSD: ixv.c,v 1.166 2021/08/26 09:03:47 msaitoh Exp $ */ /****************************************************************************** @@ -35,7 +35,7 @@ /*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 331224 2018-03-19 20:55:05Z erj $*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.165 2021/08/25 09:06:02 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.166 2021/08/26 09:03:47 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -657,7 +657,7 @@ ixv_detach(device_t dev, int flags) evcnt_detach(&rxr->rx_packets); evcnt_detach(&rxr->rx_bytes); evcnt_detach(&rxr->rx_copies); - evcnt_detach(&rxr->no_jmbuf); + evcnt_detach(&rxr->no_mbuf); evcnt_detach(&rxr->rx_discarded); } evcnt_detach(&stats->ipcs); @@ -2742,8 +2742,8 @@ ixv_add_stats_sysctls(struct adapter *ad "Queue Bytes Received"); evcnt_attach_dynamic(&rxr->rx_copies, EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf, "Copied RX Frames"); - evcnt_attach_dynamic(&rxr->no_jmbuf, EVCNT_TYPE_MISC, - NULL, adapter->queues[i].evnamebuf, "Rx no jumbo mbuf"); + evcnt_attach_dynamic(&rxr->no_mbuf, EVCNT_TYPE_MISC, + NULL, adapter->queues[i].evnamebuf, "Rx no mbuf"); evcnt_attach_dynamic(&rxr->rx_discarded, EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf, "Rx discarded"); #ifdef LRO @@ -2840,7 +2840,7 @@ ixv_clear_evcnt(struct adapter *adapter) rxr->rx_packets.ev_count = 0; rxr->rx_bytes.ev_count = 0; rxr->rx_copies.ev_count = 0; - rxr->no_jmbuf.ev_count = 0; + rxr->no_mbuf.ev_count = 0; rxr->rx_discarded.ev_count = 0; }