summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2004-06-13 21:49:30 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2004-06-13 21:49:30 +0000
commit2dd254afa61a7c0cc5ae920b463d3d4266852804 (patch)
tree7adbebef3be24ba910fd83ee1ba09e1577ae21a8 /sys/net
parent4d62e331dcde739b4067d712dd602c0927ce11b3 (diff)
debranch SMP, have fun
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/netisr_dispatch.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/net/netisr_dispatch.h b/sys/net/netisr_dispatch.h
index 822577ad843..96493b324db 100644
--- a/sys/net/netisr_dispatch.h
+++ b/sys/net/netisr_dispatch.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: netisr_dispatch.h,v 1.3 2001/06/09 06:16:38 angelos Exp $ */
+/* $OpenBSD: netisr_dispatch.h,v 1.4 2004/06/13 21:49:27 niklas Exp $ */
/* $NetBSD: netisr_dispatch.h,v 1.2 2000/07/02 04:40:47 cgd Exp $ */
/*
@@ -16,20 +16,23 @@
* }
*/
-#ifndef _NET_NETISR_DISPATCH_H_
-#define _NET_NETISR_DISPATCH_H_
-
#ifndef _NET_NETISR_H_
#error <net/netisr.h> must be included before <net/netisr_dispatch.h>
#endif
+#ifndef _NET_NETISR_DISPATCH_H_
+#define _NET_NETISR_DISPATCH_H_
+#include "ether.h"
+#include "ppp.h"
+#include "bridge.h"
+#endif
+
/*
* When adding functions to this list, be sure to add headers to provide
* their prototypes in <net/netisr.h> (if necessary).
*/
#ifdef INET
-#include "ether.h"
#if NETHER > 0
DONETISR(NETISR_ARP,arpintr);
#endif
@@ -59,12 +62,9 @@
#ifdef NATM
DONETISR(NETISR_NATM,natmintr);
#endif
-#include "ppp.h"
#if NPPP > 0
DONETISR(NETISR_PPP,pppintr);
#endif
-#include "bridge.h"
#if NBRIDGE > 0
DONETISR(NETISR_BRIDGE,bridgeintr);
#endif
-#endif /* _NET_NETISR_DISPATCH_H_ */