[src/trunk]: src/sys/dev/pci/ixgbe Remove "j" or "jumbo" because we always us...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/54251334eab4
branches:  trunk
changeset: 1023132:54251334eab4
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Aug 26 09:03:47 2021 +0000

description:
Remove "j" or "jumbo" because we always use MCLBYTES sized buffer.

diffstat:

 sys/dev/pci/ixgbe/ix_txrx.c |  10 +++++-----
 sys/dev/pci/ixgbe/ixgbe.c   |  12 ++++++------
 sys/dev/pci/ixgbe/ixgbe.h   |   4 ++--
 sys/dev/pci/ixgbe/ixv.c     |  12 ++++++------
 4 files changed, 19 insertions(+), 19 deletions(-)

diffs (157 lines):

diff -r 145c70e800f6 -r 54251334eab4 sys/dev/pci/ixgbe/ix_txrx.c
--- a/sys/dev/pci/ixgbe/ix_txrx.c       Thu Aug 26 08:56:21 2021 +0000
+++ b/sys/dev/pci/ixgbe/ix_txrx.c       Thu Aug 26 09:03:47 2021 +0000
@@ -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 @@
                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 @@
                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 @@
                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).
diff -r 145c70e800f6 -r 54251334eab4 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Thu Aug 26 08:56:21 2021 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Thu Aug 26 09:03:47 2021 +0000
@@ -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 @@
                    "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 @@
                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 @@
                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);
diff -r 145c70e800f6 -r 54251334eab4 sys/dev/pci/ixgbe/ixgbe.h
--- a/sys/dev/pci/ixgbe/ixgbe.h Thu Aug 26 08:56:21 2021 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.h Thu Aug 26 09:03:47 2021 +0000
@@ -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 evcnt            rx_packets;
        struct evcnt            rx_bytes;
        struct evcnt            rx_discarded;
-       struct evcnt            no_jmbuf;
+       struct evcnt            no_mbuf;
        u64                     rsc_num;
 
        /* Flow Director */
diff -r 145c70e800f6 -r 54251334eab4 sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Thu Aug 26 08:56:21 2021 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Thu Aug 26 09:03:47 2021 +0000
@@ -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 @@
                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 @@
                    "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 @@
                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;
        }