[src/trunk]: src/sys/net Restore RPS of pktq_enqueue unless _RUMPKERNEL

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/acdf1b94a970
branches:  trunk
changeset: 797030:acdf1b94a970
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Wed Jul 02 07:30:37 2014 +0000

description:
Restore RPS of pktq_enqueue unless _RUMPKERNEL

It's a workaround and would be fixed in rump soon.

ok pooka@

diffstat:

 sys/net/pktqueue.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 0ccf0a2a65f6 -r acdf1b94a970 sys/net/pktqueue.c
--- a/sys/net/pktqueue.c        Wed Jul 02 07:18:32 2014 +0000
+++ b/sys/net/pktqueue.c        Wed Jul 02 07:30:37 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pktqueue.c,v 1.6 2014/06/16 00:40:10 ozaki-r Exp $     */
+/*     $NetBSD: pktqueue.c,v 1.7 2014/07/02 07:30:37 ozaki-r Exp $     */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pktqueue.c,v 1.6 2014/06/16 00:40:10 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pktqueue.c,v 1.7 2014/07/02 07:30:37 ozaki-r Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -208,7 +208,11 @@
 bool
 pktq_enqueue(pktqueue_t *pq, struct mbuf *m, const u_int hash __unused)
 {
-       const unsigned cpuid = curcpu()->ci_index /* hash % ncpu */;
+#ifdef _RUMPKERNEL
+       const unsigned cpuid = curcpu()->ci_index;
+#else
+       const unsigned cpuid = hash % ncpu;
+#endif
 
        KASSERT(kpreempt_disabled());