summaryrefslogtreecommitdiff
path: root/sys/net/netisr.h
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2010-12-21 14:56:25 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2010-12-21 14:56:25 +0000
commitb45bcd941aeed9f9b5bca41338e52b47d57e7e43 (patch)
tree5a85ea83bfba94610d95b7c92196ee879e6dc6b6 /sys/net/netisr.h
parent1a7fe0231942d0e57909a2e6458fbcd0d2a5a8e0 (diff)
Convert netisr to a normal soft interrupt instead of hanving MD code
for it. This makes the netisr a real C function which will help further development. No noticable performance change on i386 and amd64. With input from kettenis@ and miod@ additional OKs mikeb@ and henning@
Diffstat (limited to 'sys/net/netisr.h')
-rw-r--r--sys/net/netisr.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index e8788bd2c53..9508a056d35 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: netisr.h,v 1.34 2009/02/16 00:31:25 dlg Exp $ */
+/* $OpenBSD: netisr.h,v 1.35 2010/12/21 14:56:24 claudio Exp $ */
/* $NetBSD: netisr.h,v 1.12 1995/08/12 23:59:24 mycroft Exp $ */
/*
@@ -41,9 +41,6 @@
* The software interrupt level for the network is higher than the software
* level for the clock (so you can enter the network in routines called
* at timeout time).
- *
- * The routine to request a network software interrupt, setsoftnet(),
- * is defined in the machine-specific include files.
*/
/*
@@ -86,11 +83,16 @@ void mplsintr(void);
void pfsyncintr(void);
#include <machine/atomic.h>
+
+extern void *netisr_intr;
#define schednetisr(anisr) \
do { \
atomic_setbits_int(&netisr, (1 << (anisr))); \
- setsoftnet(); \
-} while (0)
+ softintr_schedule(netisr_intr); \
+} while (/* CONSTCOND */0)
+
+void netisr_init(void);
+
#endif
#endif