Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/net Fix pktq_enqueue for rump
details: https://anonhg.NetBSD.org/src/rev/8cadabe3f09d
branches: trunk
changeset: 797060:8cadabe3f09d
user: ozaki-r <ozaki-r%NetBSD.org@localhost>
date: Fri Jul 04 01:50:22 2014 +0000
description:
Fix pktq_enqueue for rump
Add _RUMP_NATIVE_ABI to the macro condition for i386 and x86_64 because
_RUMPKERNEL is not defined for them. See sys/rump/Makefile.rump.
Found by ATF
diffstat:
sys/net/pktqueue.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (27 lines):
diff -r ac98f48b7854 -r 8cadabe3f09d sys/net/pktqueue.c
--- a/sys/net/pktqueue.c Thu Jul 03 20:48:19 2014 +0000
+++ b/sys/net/pktqueue.c Fri Jul 04 01:50:22 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pktqueue.c,v 1.7 2014/07/02 07:30:37 ozaki-r Exp $ */
+/* $NetBSD: pktqueue.c,v 1.8 2014/07/04 01:50:22 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.7 2014/07/02 07:30:37 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pktqueue.c,v 1.8 2014/07/04 01:50:22 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -208,7 +208,7 @@
bool
pktq_enqueue(pktqueue_t *pq, struct mbuf *m, const u_int hash __unused)
{
-#ifdef _RUMPKERNEL
+#if defined(_RUMPKERNEL) || defined(_RUMP_NATIVE_ABI)
const unsigned cpuid = curcpu()->ci_index;
#else
const unsigned cpuid = hash % ncpu;
Home |
Main Index |
Thread Index |
Old Index