summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2001-11-19 00:48:02 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2001-11-19 00:48:02 +0000
commit43a1aa2397664153c8b8dfb1ef917ce4946696a6 (patch)
treee85bae43f6447608cc2859ab04dd7bd83ae622a8 /sys/arch
parentf9485328b72bde91b4bdbc4b5c786b35be968076 (diff)
Use netisr_dispatch instead of handcoded list.
In this instance it actually is completely identical, but had ATM been added, or something else added to netisr_dispatch, this would have been incorrect. Currently generated asm code is identical.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/macppc/macppc/machdep.c50
1 files changed, 6 insertions, 44 deletions
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index b5749119721..5783956e11c 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.14 2001/11/13 14:31:52 drahn Exp $ */
+/* $OpenBSD: machdep.c,v 1.15 2001/11/19 00:48:01 drahn Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -862,49 +862,11 @@ void
softnet(isr)
int isr;
{
-#ifdef INET
-#include "ether.h"
-#if NETHER > 0
- if (isr & (1 << NETISR_ARP))
- arpintr();
-#endif
- if (isr & (1 << NETISR_IP))
- ipintr();
-#endif
-#ifdef INET6
- if (isr & (1 << NETISR_IPV6))
- ip6intr();
-#endif
-#ifdef NETATALK
- if (isr & (1 << NETISR_ATALK))
- atintr();
-#endif
-#ifdef IMP
- if (isr & (1 << NETISR_IMP))
- impintr();
-#endif
-#ifdef NS
- if (isr & (1 << NETISR_NS))
- nsintr();
-#endif
-#ifdef ISO
- if (isr & (1 << NETISR_ISO))
- clnlintr();
-#endif
-#ifdef CCITT
- if (isr & (1 << NETISR_CCITT))
- ccittintr();
-#endif
-#include "ppp.h"
-#if NPPP > 0
- if (isr & (1 << NETISR_PPP))
- pppintr();
-#endif
-#include "bridge.h"
-#if NBRIDGE > 0
- if (isr & (1 << NETISR_BRIDGE))
- bridgeintr();
-#endif
+#define DONETISR(flag, func) \
+ if (isr & (1 << flag))\
+ func();
+
+#include <net/netisr_dispatch.h>
}
void