Module Name: src
Committed By: msaitoh
Date: Wed Feb 8 04:05:13 UTC 2017
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c
Log Message:
Add queue number into interrupt name.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.39 -r1.40 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/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.68 src/sys/dev/pci/ixgbe/ixgbe.c:1.69
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.68 Wed Feb 8 03:59:12 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Feb 8 04:05:13 2017
@@ -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_attach(device_t parent, device_t d
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 @@ ixgbe_allocate_msix(struct adapter *adap
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
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.39 src/sys/dev/pci/ixgbe/ixv.c:1.40
--- src/sys/dev/pci/ixgbe/ixv.c:1.39 Wed Feb 8 03:59:12 2017
+++ src/sys/dev/pci/ixgbe/ixv.c Wed Feb 8 04:05:13 2017
@@ -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 @@ ixv_allocate_msix(struct adapter *adapte
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
