[src/netbsd-8]: src/sys/dev/pci Pull up following revision(s) (requested by k...

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

details:   https://anonhg.NetBSD.org/src/rev/44874618d9d4
branches:  netbsd-8
changeset: 446773:44874618d9d4
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Dec 18 18:24:09 2018 +0000

description:
Pull up following revision(s) (requested by knakahara in ticket #1138):

        sys/dev/pci/if_wm.c: revision 1.606

Fix txqueue assignment. Pointed out by yamaguchi@n.o, thanks.

E.g. When ncpu is six and nqueue is four, the sequence error occurs.

XXX pullup-8

diffstat:

 sys/dev/pci/if_wm.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 426a5dd9bda6 -r 44874618d9d4 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Tue Dec 18 18:21:38 2018 +0000
+++ b/sys/dev/pci/if_wm.c       Tue Dec 18 18:24:09 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.508.4.27 2018/12/04 11:21:32 martin Exp $  */
+/*     $NetBSD: if_wm.c,v 1.508.4.28 2018/12/18 18:24:09 martin Exp $  */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.27 2018/12/04 11:21:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.28 2018/12/18 18:24:09 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -7211,7 +7211,7 @@
         * TODO:
         * distribute by flowid(RSS has value).
         */
-       return (cpuid + ncpu - sc->sc_affinity_offset) % sc->sc_nqueues;
+       return ((cpuid + ncpu - sc->sc_affinity_offset) % ncpu) % sc->sc_nqueues;
 }
 
 /*