From be4afdca2a5b4f0324ddb45bb3f51a9ad4bcbed4 Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Sun, 15 Mar 2009 19:40:42 +0000 Subject: Introduce splsoftassert(), similar to splassert() but for soft interrupt levels. This will allow for platforms where soft interrupt levels do not map to real hardware interrupt levels to have soft ipl values overlapping hard ipl values without breaking spl asserts. --- sys/net/pf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/net/pf.c') diff --git a/sys/net/pf.c b/sys/net/pf.c index 7e79567ceec..67e0445ef95 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.638 2009/03/14 23:44:09 mcbride Exp $ */ +/* $OpenBSD: pf.c,v 1.639 2009/03/15 19:40:41 miod Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -804,7 +804,7 @@ int pf_state_insert(struct pfi_kif *kif, struct pf_state_key *skw, struct pf_state_key *sks, struct pf_state *s) { - splassert(IPL_SOFTNET); + splsoftassert(IPL_SOFTNET); s->kif = kif; @@ -1081,7 +1081,7 @@ pf_src_tree_remove_state(struct pf_state *s) void pf_unlink_state(struct pf_state *cur) { - splassert(IPL_SOFTNET); + splsoftassert(IPL_SOFTNET); if (cur->src.state == PF_TCPS_PROXY_DST) { /* XXX wire key the right one? */ @@ -1111,7 +1111,7 @@ pf_unlink_state(struct pf_state *cur) void pf_free_state(struct pf_state *cur) { - splassert(IPL_SOFTNET); + splsoftassert(IPL_SOFTNET); #if NPFSYNC > 0 if (pfsync_state_in_use(cur)) -- cgit v1.2.3