Module Name: src
Committed By: knakahara
Date: Mon Dec 17 04:14:40 UTC 2018
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Fix txqueue assignment. Pointed out by [email protected], thanks.
E.g. When ncpu is six and nqueue is four, the sequence error occurs.
XXX pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.605 -r1.606 src/sys/dev/pci/if_wm.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/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.605 src/sys/dev/pci/if_wm.c:1.606
--- src/sys/dev/pci/if_wm.c:1.605 Sat Dec 15 05:40:10 2018
+++ src/sys/dev/pci/if_wm.c Mon Dec 17 04:14:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.605 2018/12/15 05:40:10 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.606 2018/12/17 04:14:40 knakahara 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.605 2018/12/15 05:40:10 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.606 2018/12/17 04:14:40 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -7298,7 +7298,7 @@ wm_select_txqueue(struct ifnet *ifp, str
* 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;
}
/*
