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.

28 files changed, 87 insertions, 57 deletions

diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h
index 51b2242527f..42f0794e9c2 100644
--- a/sys/arch/alpha/include/intr.h
+++ b/sys/arch/alpha/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.30 2009/03/07 15:31:43 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.31 2009/03/15 19:40:38 miod Exp $ */
 /* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */
 
 /*-
@@ -152,8 +152,10 @@ void splassert_check(int, const char *);
 			splassert_check(__wantipl, __func__);		\
 		}							\
 	} while (0)
+#define	splsoftassert(wantipl)	splassert(IPL_SOFTINT)
 #else
 #define	splassert(wantipl)	do { /* nothing */ } while (0)
+#define	splsoftassert(wantipl)	do { /* nothing */ } while (0)
 #endif
 
 /* IPL-lowering/restoring macros */
diff --git a/sys/arch/amd64/include/intr.h b/sys/arch/amd64/include/intr.h
index 86c63ceb283..f3076a10d35 100644
--- a/sys/arch/amd64/include/intr.h
+++ b/sys/arch/amd64/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.15 2008/12/06 19:59:38 tedu Exp $	*/
+/*	$OpenBSD: intr.h,v 1.16 2009/03/15 19:40:40 miod Exp $	*/
 /*	$NetBSD: intr.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $	*/
 
 /*-
@@ -170,8 +170,10 @@ void splassert_check(int, const char *);
 		splassert_check(__wantipl, __func__);	\
 	}						\
 } while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
 #else
-#define splassert(wantipl) do { /* nada */ } while (0)
+#define splassert(wantipl)	do { /* nada */ } while (0)
+#define splsoftassert(wantipl)	do { /* nada */ } while (0)
 #endif
 
 /*
diff --git a/sys/arch/arm/s3c2xx0/s3c2xx0_intr.h b/sys/arch/arm/s3c2xx0/s3c2xx0_intr.h
index db6bbec75d8..a68d8b97c8a 100644
--- a/sys/arch/arm/s3c2xx0/s3c2xx0_intr.h
+++ b/sys/arch/arm/s3c2xx0/s3c2xx0_intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: s3c2xx0_intr.h,v 1.2 2008/12/08 20:50:20 drahn Exp $ */
+/*	$OpenBSD: s3c2xx0_intr.h,v 1.3 2009/03/15 19:40:40 miod Exp $ */
 /*	$NetBSD: s3c2xx0_intr.h,v 1.13 2008/11/19 06:35:55 matt Exp $ */
 
 /*
@@ -158,8 +158,10 @@ void pxa2x0_splassert_check(int, const char *);
 		pxa2x0_splassert_check(__wantipl, __func__);	\
 	}							\
 } while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
 #else
 #define splassert(wantipl)      do { /* nothing */ } while (0)
+#define splsoftassert(wantipl)      do { /* nothing */ } while (0)
 #endif
 
 
diff --git a/sys/arch/arm/xscale/pxa2x0_intr.h b/sys/arch/arm/xscale/pxa2x0_intr.h
index 589f97763d0..6c6d15fee20 100644
--- a/sys/arch/arm/xscale/pxa2x0_intr.h
+++ b/sys/arch/arm/xscale/pxa2x0_intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxa2x0_intr.h,v 1.11 2007/05/19 15:47:16 miod Exp $ */
+/*	$OpenBSD: pxa2x0_intr.h,v 1.12 2009/03/15 19:40:40 miod Exp $ */
 /*	$NetBSD: pxa2x0_intr.h,v 1.4 2003/07/05 06:53:08 dogcow Exp $ */
 
 /* Derived from i80321_intr.h */
@@ -116,8 +116,10 @@ void pxa2x0_splassert_check(int, const char *);
 		pxa2x0_splassert_check(__wantipl, __func__);	\
 	}							\
 } while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
 #else
 #define	splassert(wantipl)	do { /* nothing */ } while (0)
+#define	splsoftassert(wantipl)	do { /* nothing */ } while (0)
 #endif
 
 #endif /* ! _LOCORE */
diff --git a/sys/arch/armish/include/armish_intr.h b/sys/arch/armish/include/armish_intr.h
index 62477bdaf18..9add69a76d7 100644
--- a/sys/arch/armish/include/armish_intr.h
+++ b/sys/arch/armish/include/armish_intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: armish_intr.h,v 1.4 2007/05/19 15:47:18 miod Exp $ */
+/*	$OpenBSD: armish_intr.h,v 1.5 2009/03/15 19:40:40 miod Exp $ */
 /*	$NetBSD: i80321_intr.h,v 1.4 2003/07/05 06:53:08 dogcow Exp $ */
 
 /*
@@ -108,8 +108,10 @@ void i80321_splassert_check(int, const char *);
 		i80321_splassert_check(__wantipl, __func__);	\
 	}							\
 } while (0)
+#define	splsoftassert(wantipl) splassert(wantipl)
 #else
 #define	splassert(wantipl)	do { /* nothing */ } while (0)
+#define	splsoftassert(wantipl)	do { /* nothing */ } while (0)
 #endif
 
 #endif /* ! _LOCORE */
diff --git a/sys/arch/hppa/include/intr.h b/sys/arch/hppa/include/intr.h
index 7586fc83f00..74efdabd14b 100644
--- a/sys/arch/hppa/include/intr.h
+++ b/sys/arch/hppa/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.24 2008/04/27 14:36:38 kettenis Exp $	*/
+/*	$OpenBSD: intr.h,v 1.25 2009/03/15 19:40:40 miod Exp $	*/
 
 /*
  * Copyright (c) 2002-2004 Michael Shalayeff
@@ -70,8 +70,10 @@ void splassert_check(int, const char *);
 		splassert_check(__wantipl, __func__);	\
 	}						\
 } while (0)
+#define splsoftassert(__wantipl) splassert(__wantipl)
 #else
-#define	splassert(__wantipl)	do { /* nada */ } while (0)
+#define	splassert(__wantipl)		do { /* nada */ } while (0)
+#define	splsoftassert(__wantipl)	do { /* nada */ } while (0)
 #endif /* DIAGNOSTIC */
 
 void	cpu_intr_init(void);
diff --git a/sys/arch/hppa64/include/cpu.h b/sys/arch/hppa64/include/cpu.h
index f7c52306250..f8d7841ee39 100644
--- a/sys/arch/hppa64/include/cpu.h
+++ b/sys/arch/hppa64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.14 2008/10/10 08:36:28 art Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.15 2009/03/15 19:40:40 miod Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -155,8 +155,10 @@ void splassert_check(int, const char *);
 		splassert_check(__wantipl, __func__);	\
 	}						\
 } while (0)
+#define splsoftassert(__wantipl) splassert(__wantipl)
 #else
-#define splassert(__wantipl)	do { /* nada */ } while (0)
+#define splassert(__wantipl)		do { /* nada */ } while (0)
+#define splsoftassert(__wantipl)	do { /* nada */ } while (0)
 #endif /* DIAGNOSTIC */
 
 /* types */
diff --git a/sys/arch/i386/include/intr.h b/sys/arch/i386/include/intr.h
index f549f8f38c0..812af4d74d1 100644
--- a/sys/arch/i386/include/intr.h
+++ b/sys/arch/i386/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.36 2008/09/28 20:43:31 brad Exp $	*/
+/*	$OpenBSD: intr.h,v 1.37 2009/03/15 19:40:40 miod Exp $	*/
 /*	$NetBSD: intr.h,v 1.5 1996/05/13 06:11:28 mycroft Exp $	*/
 
 /*
@@ -77,8 +77,10 @@ void splassert_check(int, const char *);
 		splassert_check(__wantipl, __func__);	\
 	}						\
 } while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
 #else
-#define splassert(wantipl) do { /* nada */ } while (0)
+#define splassert(wantipl)	do { /* nada */ } while (0)
+#define splsoftassert(wantipl)	do { /* nada */ } while (0)
 #endif
 
 /*
diff --git a/sys/arch/landisk/include/intr.h b/sys/arch/landisk/include/intr.h
index 01dbf8d7c3d..6fb05efaccf 100644
--- a/sys/arch/landisk/include/intr.h
+++ b/sys/arch/landisk/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.8 2008/06/26 05:42:11 ray Exp $	*/
+/*	$OpenBSD: intr.h,v 1.9 2009/03/15 19:40:40 miod Exp $	*/
 /*	$NetBSD: intr.h,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -76,8 +76,10 @@ do {									\
 		splassert_check(__wantipl, __func__);			\
 	}								\
 } while (0)
+#define splsoftassert(__wantipl) splassert(__wantipl)
 #else
 #define	splassert(wantipl)	do { /* nothing yet */ } while (0)
+#define	splsoftassert(wantipl)	do { /* nothing yet */ } while (0)
 #endif
 
 void intr_init(void);
diff --git a/sys/arch/m68k/include/psl.h b/sys/arch/m68k/include/psl.h
index 309f470622b..f27c0ef0d8b 100644
--- a/sys/arch/m68k/include/psl.h
+++ b/sys/arch/m68k/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.7 2007/11/09 17:28:29 miod Exp $	*/
+/*	$OpenBSD: psl.h,v 1.8 2009/03/15 19:40:40 miod Exp $	*/
 /*	$NetBSD: psl.h,v 1.5 1994/10/26 07:50:50 cgd Exp $	*/
 
 /*
@@ -87,8 +87,10 @@ do {									\
 		splassert_check(__wantipl, __func__);			\
 	}								\
 } while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
 #else
 #define	splassert(wantipl)	do { /* nothing */ } while (0)
+#define	splsoftassert(wantipl)	do { /* nothing */ } while (0)
 #endif
 
 /*
diff --git a/sys/arch/m88k/include/intr.h b/sys/arch/m88k/include/intr.h
index 1ee0ea48731..1853e9372ca 100644
--- a/sys/arch/m88k/include/intr.h
+++ b/sys/arch/m88k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.9 2007/11/17 05:32:05 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.10 2009/03/15 19:40:40 miod Exp $	*/
 /*
  * Copyright (C) 2000 Steve Murphree, Jr.
  * All rights reserved.
@@ -50,8 +50,10 @@ void splassert_check(int, const char *);
 		splassert_check(__wantipl, __func__);	\
 	}						\
 } while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
 #else
 #define	splassert(wantipl)	do { /* nothing */ } while (0)
+#define	splsoftassert(wantipl)	do { /* nothing */ } while (0)
 #endif
 
 #endif /* _LOCORE */
diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h
index c7bd5410c40..d2f85d51aaf 100644
--- a/sys/arch/powerpc/include/intr.h
+++ b/sys/arch/powerpc/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.38 2008/11/21 17:35:52 deraadt Exp $ */
+/*	$OpenBSD: intr.h,v 1.39 2009/03/15 19:40:40 miod Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA.
@@ -77,6 +77,7 @@ extern int imask[IPL_NUM];
 
 /* SPL asserts */
 #define	splassert(wantipl)	/* nothing */
+#define	splsoftassert(wantipl)	/* nothing */
 
 #define	set_sint(p)	atomic_setbits_int(&curcpu()->ci_ipending, p)
 
diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h
index 14a0d2870c5..aa41ab264e7 100644
--- a/sys/arch/sgi/include/intr.h
+++ b/sys/arch/sgi/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.20 2007/12/06 12:34:39 jsing Exp $ */
+/*	$OpenBSD: intr.h,v 1.21 2009/03/15 19:40:40 miod Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -104,6 +104,7 @@
 void	splinit(void);
 
 #define	splassert(X)
+#define	splsoftassert(X)
 
 /*
  *  Schedule prioritys for base interrupts (CPU)
diff --git a/sys/arch/sparc/include/psl.h b/sys/arch/sparc/include/psl.h
index 1cd1b561797..cb9fc9022f4 100644
--- a/sys/arch/sparc/include/psl.h
+++ b/sys/arch/sparc/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.23 2007/05/16 19:37:06 thib Exp $	*/
+/*	$OpenBSD: psl.h,v 1.24 2009/03/15 19:40:40 miod Exp $	*/
 /*	$NetBSD: psl.h,v 1.12 1997/03/10 21:49:11 pk Exp $ */
 
 /*
@@ -173,8 +173,10 @@ void splassert_check(int, const char *);
 		splassert_check(__wantipl, __func__);	\
 	}						\
 } while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
 #else
-#define splassert(wantipl) do { /* nada */ } while (0)
+#define splassert(wantipl)	do { /* nada */ } while (0)
+#define splsoftassert(wantipl)	do { /* nada */ } while (0)
 #endif
 
 /*
diff --git a/sys/arch/sparc64/include/psl.h b/sys/arch/sparc64/include/psl.h
index d477b9c0caa..a84cea7791e 100644
--- a/sys/arch/sparc64/include/psl.h
+++ b/sys/arch/sparc64/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.25 2008/07/05 20:53:33 kettenis Exp $	*/
+/*	$OpenBSD: psl.h,v 1.26 2009/03/15 19:40:40 miod Exp $	*/
 /*	$NetBSD: psl.h,v 1.20 2001/04/13 23:30:05 thorpej Exp $ */
 
 /*
@@ -249,8 +249,10 @@ void splassert_check(int, const char *);
 		splassert_check(__wantipl, __func__);	\
 	}						\
 } while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
 #else
-#define splassert(wantipl) do { /* nada */ } while (0)
+#define splassert(wantipl)	do { /* nada */ } while (0)
+#define splsoftassert(wantipl)	do { /* nada */ } while (0)
 #endif
 
 /*
diff --git a/sys/arch/vax/include/intr.h b/sys/arch/vax/include/intr.h
index 5f225fdaf9e..cc135ccf42f 100644
--- a/sys/arch/vax/include/intr.h
+++ b/sys/arch/vax/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.9 2008/08/18 23:08:55 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.10 2009/03/15 19:40:40 miod Exp $	*/
 /* 	$NetBSD: intr.h,v 1.1 1998/08/18 23:55:00 matt Exp $	*/
 
 /*
@@ -115,8 +115,10 @@ void splassert_check(int, const char *);
 		splassert_check(__wantipl, __func__);	\
 	}						\
 } while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
 #else
 #define	splassert(wantipl)	do { /* nothing */ } while (0)
+#define	splsoftassert(wantipl)	do { /* nothing */ } while (0)
 #endif
 
 #endif	/* _VAX_INTR_H */
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 7d31306f26d..9841a6396e0 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_socket.c,v 1.75 2009/02/22 07:47:22 otto Exp $	*/
+/*	$OpenBSD: uipc_socket.c,v 1.76 2009/03/15 19:40:41 miod Exp $	*/
 /*	$NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $	*/
 
 /*
@@ -175,7 +175,7 @@ solisten(struct socket *so, int backlog)
 void
 sofree(struct socket *so)
 {
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 
 	if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0)
 		return;
@@ -258,7 +258,7 @@ discard:
 int
 soabort(struct socket *so)
 {
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 
 	return (*so->so_proto->pr_usrreq)(so, PRU_ABORT, NULL, NULL, NULL,
 	   curproc);
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index b7d1097b0ee..7d7f876b486 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_socket2.c,v 1.46 2009/01/13 13:36:12 blambert Exp $	*/
+/*	$OpenBSD: uipc_socket2.c,v 1.47 2009/03/15 19:40:41 miod Exp $	*/
 /*	$NetBSD: uipc_socket2.c,v 1.11 1996/02/04 02:17:55 christos Exp $	*/
 
 /*
@@ -156,7 +156,7 @@ sonewconn(struct socket *head, int connstatus)
 	extern u_long unpst_sendspace, unpst_recvspace;
 	u_long snd_sb_hiwat, rcv_sb_hiwat;
 
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 
 	if (mclpools[0].pr_nout > mclpools[0].pr_hardlimit * 95 / 100)
 		return ((struct socket *)0);
diff --git a/sys/net/if.c b/sys/net/if.c
index 3fc02fc5a0f..a7425d395c2 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.188 2009/02/24 21:14:12 claudio Exp $	*/
+/*	$OpenBSD: if.c,v 1.189 2009/03/15 19:40:41 miod Exp $	*/
 /*	$NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $	*/
 
 /*
@@ -1071,7 +1071,7 @@ if_down(struct ifnet *ifp)
 {
 	struct ifaddr *ifa;
 
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 
 	ifp->if_flags &= ~IFF_UP;
 	microtime(&ifp->if_lastchange);
@@ -1107,7 +1107,7 @@ if_up(struct ifnet *ifp)
 	struct ifaddr *ifa;
 #endif
 
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 
 	ifp->if_flags |= IFF_UP;
 	microtime(&ifp->if_lastchange);
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index d140087c641..2ffc7275205 100644
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pfsync.c,v 1.115 2009/03/01 12:02:39 dlg Exp $	*/
+/*	$OpenBSD: if_pfsync.c,v 1.116 2009/03/15 19:40:41 miod Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff
@@ -1771,7 +1771,7 @@ pfsync_insert_state(struct pf_state *st)
 {
 	struct pfsync_softc *sc = pfsyncif;
 
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 
 	if (ISSET(st->rule.ptr->rule_flag, PFRULE_NOSYNC) ||
 	    st->key[PF_SK_WIRE]->proto == IPPROTO_PFSYNC) {
@@ -1808,7 +1808,7 @@ pfsync_defer(struct pf_state *st, struct mbuf *m)
 	struct pfsync_softc *sc = pfsyncif;
 	struct pfsync_deferral *pd;
 
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 
 	if (sc->sc_deferred >= 128)
 		pfsync_undefer(TAILQ_FIRST(&sc->sc_deferrals), 0);
@@ -1837,7 +1837,7 @@ pfsync_undefer(struct pfsync_deferral *pd, int drop)
 {
 	struct pfsync_softc *sc = pfsyncif;
 
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 
 	TAILQ_REMOVE(&sc->sc_deferrals, pd, pd_entry);
 	sc->sc_deferred--;
@@ -1888,7 +1888,7 @@ pfsync_update_state(struct pf_state *st)
 	struct pfsync_softc *sc = pfsyncif;
 	int sync = 0;
 
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 
 	if (sc == NULL || !ISSET(sc->sc_if.if_flags, IFF_RUNNING))
 		return;
@@ -2010,7 +2010,7 @@ pfsync_delete_state(struct pf_state *st)
 {
 	struct pfsync_softc *sc = pfsyncif;
 
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 
 	if (sc == NULL || !ISSET(sc->sc_if.if_flags, IFF_RUNNING))
 		return;
@@ -2057,7 +2057,7 @@ pfsync_clear_states(u_int32_t creatorid, const char *ifname)
 		struct pfsync_clr clr;
 	} __packed r;
 
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 
 	if (sc == NULL || !ISSET(sc->sc_if.if_flags, IFF_RUNNING))
 		return;
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index c535f9cac30..1caa5c66354 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ppp.c,v 1.52 2008/10/22 23:04:45 mpf Exp $	*/
+/*	$OpenBSD: if_ppp.c,v 1.53 2009/03/15 19:40:41 miod Exp $	*/
 /*	$NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $	*/
 
 /*
@@ -339,7 +339,7 @@ pppdealloc(sc)
 {
     struct mbuf *m;
 
-    splassert(IPL_SOFTNET);
+    splsoftassert(IPL_SOFTNET);
 
     if_down(&sc->sc_if);
     sc->sc_if.if_flags &= ~(IFF_UP|IFF_RUNNING);
@@ -895,7 +895,7 @@ ppp_requeue(sc)
     enum NPmode mode;
     int error;
 
-    splassert(IPL_SOFTNET);
+    splsoftassert(IPL_SOFTNET);
 
     for (mpp = &sc->sc_npqueue; (m = *mpp) != NULL; ) {
 	switch (PPP_PROTOCOL(mtod(m, u_char *))) {
@@ -1107,7 +1107,7 @@ pppintr()
     int s, s2;
     struct mbuf *m;
 
-    splassert(IPL_SOFTNET);
+    splsoftassert(IPL_SOFTNET);
 
     s = splsoftnet();	/* XXX - what's the point of this? see comment above */
     LIST_FOREACH(sc, &ppp_softc_list, sc_list) {
diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c
index 832678aa985..7bbfd31e0de 100644
--- a/sys/net/if_pppoe.c
+++ b/sys/net/if_pppoe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pppoe.c,v 1.29 2008/10/16 12:20:27 canacar Exp $ */
+/* $OpenBSD: if_pppoe.c,v 1.30 2009/03/15 19:40:41 miod Exp $ */
 /* $NetBSD: if_pppoe.c,v 1.51 2003/11/28 08:56:48 keihan Exp $ */
 
 /*
@@ -365,7 +365,7 @@ pppoeintr(void)
 	struct mbuf *m;
 	int s;
 
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 	
 	for (;;) {
 		s = splnet();
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))
diff --git a/sys/net/route.c b/sys/net/route.c
index ef71aca6dba..4cfa782c63a 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.104 2009/02/27 13:15:40 claudio Exp $	*/
+/*	$OpenBSD: route.c,v 1.105 2009/03/15 19:40:41 miod Exp $	*/
 /*	$NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $	*/
 
 /*
@@ -459,7 +459,7 @@ rtredirect(struct sockaddr *dst, struct sockaddr *gateway,
 	struct ifaddr		*ifa;
 	struct ifnet		*ifp = NULL;
 
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 
 	/* verify the gateway is directly reachable */
 	if ((ifa = ifa_ifwithnet(gateway)) == NULL) {
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 959f15b6db9..887b3fda6b0 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in.c,v 1.52 2008/06/04 18:11:35 miod Exp $	*/
+/*	$OpenBSD: in.c,v 1.53 2009/03/15 19:40:41 miod Exp $	*/
 /*	$NetBSD: in.c,v 1.26 1996/02/13 23:41:39 christos Exp $	*/
 
 /*
@@ -703,7 +703,7 @@ in_ifinit(ifp, ia, sin, scrub)
 	 * Is the "ifp" even in a consistent state?
 	 * Be safe for now.
 	 */
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 
 	if (scrub) {
 		ia->ia_ifa.ifa_addr = sintosa(&oldaddr);
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 7193c57f97a..0077d250628 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_pcb.c,v 1.103 2008/10/23 22:22:44 deraadt Exp $	*/
+/*	$OpenBSD: in_pcb.c,v 1.104 2009/03/15 19:40:41 miod Exp $	*/
 /*	$NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $	*/
 
 /*
@@ -574,7 +574,7 @@ in_pcbnotifyall(table, dst, errno, notify)
 	struct inpcb *inp, *oinp;
 	struct in_addr faddr;
 
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 
 #ifdef INET6
 	/*
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index eda7a3a5514..c62be83fb29 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6.c,v 1.80 2009/01/30 10:47:46 mcbride Exp $	*/
+/*	$OpenBSD: in6.c,v 1.81 2009/03/15 19:40:41 miod Exp $	*/
 /*	$KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $	*/
 
 /*
@@ -781,7 +781,7 @@ in6_update_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra,
 	struct in6_multi_mship *imm;
 	struct rtentry *rt;
 
-	splassert(IPL_SOFTNET);
+	splsoftassert(IPL_SOFTNET);
 
 	/* Validate parameters */
 	if (ifp == NULL || ifra == NULL) /* this maybe redundant */
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index 21a8406ee6d..d733f06fc08 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_serv.c,v 1.63 2009/01/27 23:40:14 blambert Exp $	*/
+/*	$OpenBSD: nfs_serv.c,v 1.64 2009/03/15 19:40:41 miod Exp $	*/
 /*     $NetBSD: nfs_serv.c,v 1.34 1997/05/12 23:37:12 fvdl Exp $       */
 
 /*
@@ -1175,7 +1175,7 @@ nfsrvw_coalesce(struct nfsrv_descript *owp, struct nfsrv_descript *nfsd)
         int overlap;
         struct mbuf *mp;
 
-	splassert(IPL_SOFTCLOCK);
+	splsoftassert(IPL_SOFTCLOCK);
 
         LIST_REMOVE(nfsd, nd_hash);
         LIST_REMOVE(nfsd, nd_tq);