[src/trunk]: src/sys/dev/pci/ixgbe Add queue number into interrupt name.

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

details:   https://anonhg.NetBSD.org/src/rev/bdcb9870945f
branches:  trunk
changeset: 351236:bdcb9870945f
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Feb 08 04:05:13 2017 +0000

description:
Add queue number into interrupt name.

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c |  8 ++++----
 sys/dev/pci/ixgbe/ixv.c   |  6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r b99726638d17 -r bdcb9870945f sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Wed Feb 08 04:01:44 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Wed Feb 08 04:05:13 2017 +0000
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/if_ix.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixgbe.c,v 1.68 2017/02/08 03:59:12 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.69 2017/02/08 04:05:13 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -507,7 +507,7 @@
 
        ixgbe_set_sysctl_value(adapter, "tx_processing_limit",
            "max number of tx packets to process",
-       &adapter->tx_process_limit, ixgbe_tx_process_limit);
+           &adapter->tx_process_limit, ixgbe_tx_process_limit);
 
        /* Do descriptor calc and sanity checks */
        if (((ixgbe_txd * sizeof(union ixgbe_adv_tx_desc)) % DBA_ALIGN) != 0 ||
@@ -2684,8 +2684,8 @@
 
        kcpuset_create(&affinity, false);
        for (int i = 0; i < adapter->num_queues; i++, vector++, que++, txr++) {
-               snprintf(intr_xname, sizeof(intr_xname), "%s TX/RX",
-                   device_xname(dev));
+               snprintf(intr_xname, sizeof(intr_xname), "%s TXRX%d",
+                   device_xname(dev), i);
                intrstr = pci_intr_string(pc, adapter->osdep.intrs[i], intrbuf,
                    sizeof(intrbuf));
 #ifdef IXG_MPSAFE
diff -r b99726638d17 -r bdcb9870945f sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Wed Feb 08 04:01:44 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Wed Feb 08 04:05:13 2017 +0000
@@ -31,7 +31,7 @@
 
 ******************************************************************************/
 /*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixv.c,v 1.39 2017/02/08 03:59:12 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.40 2017/02/08 04:05:13 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -1362,8 +1362,8 @@
 
        kcpuset_create(&affinity, false);
        for (int i = 0; i < adapter->num_queues; i++, vector++, que++, txr++) {
-               snprintf(intr_xname, sizeof(intr_xname), "%s TX/RX",
-                   device_xname(dev));
+               snprintf(intr_xname, sizeof(intr_xname), "%s TXRX%d",
+                   device_xname(dev), i);
                intrstr = pci_intr_string(pc, adapter->osdep.intrs[i], intrbuf,
                    sizeof(intrbuf));
 #ifdef IXV_MPSAFE