From 51a9336da11a320272843de47f66c121eb9af4fe Mon Sep 17 00:00:00 2001 From: hauke Date: Wed, 11 May 2011 12:22:34 +0000 Subject: [PATCH] Commit the patch from , fixing a "panic: pool 'pfrktable' is IPL_NONE, but called from interrupt context" that occurred on NetBSD/sparc. --- sys/dist/pf/net/pf_table.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dist/pf/net/pf_table.c b/sys/dist/pf/net/pf_table.c index 9348e2384d6e..ee01bd410f1c 100644 --- a/sys/dist/pf/net/pf_table.c +++ b/sys/dist/pf/net/pf_table.c @@ -1,4 +1,4 @@ -/* $NetBSD: pf_table.c,v 1.16 2010/04/12 13:57:38 ahoka Exp $ */ +/* $NetBSD: pf_table.c,v 1.17 2011/05/11 12:22:34 hauke Exp $ */ /* $OpenBSD: pf_table.c,v 1.70 2007/05/23 11:53:45 markus Exp $ */ /* @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pf_table.c,v 1.16 2010/04/12 13:57:38 ahoka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pf_table.c,v 1.17 2011/05/11 12:22:34 hauke Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -200,9 +200,9 @@ pfr_initialize(void) { #ifdef __NetBSD__ pool_init(&pfr_ktable_pl, sizeof(struct pfr_ktable), 0, 0, 0, - "pfrktable", &pool_allocator_nointr, IPL_NONE); + "pfrktable", &pool_allocator_nointr, IPL_NET); pool_init(&pfr_kentry_pl, sizeof(struct pfr_kentry), 0, 0, 0, - "pfrkentry", &pool_allocator_nointr, IPL_NONE); + "pfrkentry", &pool_allocator_nointr, IPL_NET); pool_init(&pfr_kentry_pl2, sizeof(struct pfr_kentry), 0, 0, 0, "pfrkentry2", NULL, IPL_SOFTNET); #else