CVS commit: src/sys/dev/pci/ixgbe

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Wed Feb  8 09:00:37 UTC 2017

Modified Files:
        src/sys/dev/pci/ixgbe: ixgbe.c ixv.c

Log Message:
 Print CPU number correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.46 -r1.47 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.70 src/sys/dev/pci/ixgbe/ixgbe.c:1.71
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.70	Wed Feb  8 08:13:53 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Wed Feb  8 09:00:37 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.70 2017/02/08 08:13:53 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.71 2017/02/08 09:00:37 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -2736,11 +2736,11 @@ ixgbe_allocate_msix(struct adapter *adap
 #ifdef	RSS
 			aprintf_normal(
 			    ", bound RSS bucket %d to CPU %d",
-			    i, cpu_id);
+			    i, cpu_id % ncpu);
 #else
 			aprint_normal(
 			    ", bound queue %d to cpu %d",
-			    i, cpu_id);
+			    i, cpu_id % ncpu);
 #endif
 #endif /* IXGBE_DEBUG */
 		}
@@ -2784,7 +2784,7 @@ ixgbe_allocate_msix(struct adapter *adap
 	aprint_normal_dev(dev,
 	    "for link, interrupting at %s", intrstr);
 	if (error == 0)
-		aprint_normal(", affinity to cpu %d\n", cpu_id);
+		aprint_normal(", affinity to cpu %d\n", cpu_id % ncpu);
 	else
 		aprint_normal("\n");
 

Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.46 src/sys/dev/pci/ixgbe/ixv.c:1.47
--- src/sys/dev/pci/ixgbe/ixv.c:1.46	Wed Feb  8 08:30:16 2017
+++ src/sys/dev/pci/ixgbe/ixv.c	Wed Feb  8 09:00:37 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.46 2017/02/08 08:30:16 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.47 2017/02/08 09:00:37 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -1421,7 +1421,7 @@ ixv_allocate_msix(struct adapter *adapte
 		    intrstr);
 		if (error == 0)
 			aprint_normal(", bound queue %d to cpu %d\n",
-			    i, cpu_id);
+			    i, cpu_id % ncpu);
 		else
 			aprint_normal("\n");
 
@@ -1464,7 +1464,7 @@ ixv_allocate_msix(struct adapter *adapte
 	aprint_normal_dev(dev,
 	    "for link, interrupting at %s", intrstr);
 	if (error == 0)
-		aprint_normal(", affinity to cpu %d\n", cpu_id);
+		aprint_normal(", affinity to cpu %d\n", cpu_id % ncpu);
 	else
 		aprint_normal("\n");