diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-01-07 23:16:09 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-01-07 23:16:09 +0000 |
| commit | 442a311375e09fddb113ba6a49228530c53bb53f (patch) | |
| tree | c86df64571eb4e09abd3f447acb73a410741faf8 /sys/arch/hp300 | |
| parent | 6e5a6e8c80d378850137a3c72be709991fd47faa (diff) | |
global decl for *intr() routines, plus add INET6
Diffstat (limited to 'sys/arch/hp300')
| -rw-r--r-- | sys/arch/hp300/hp300/intr.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/sys/arch/hp300/hp300/intr.c b/sys/arch/hp300/hp300/intr.c index 2b22c14cd80..b9e5cf4cde2 100644 --- a/sys/arch/hp300/hp300/intr.c +++ b/sys/arch/hp300/hp300/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.2 1997/07/06 08:02:00 downsj Exp $ */ +/* $OpenBSD: intr.c,v 1.3 1999/01/07 23:15:57 deraadt Exp $ */ /* $NetBSD: intr.c,v 1.2 1997/05/01 16:24:26 thorpej Exp $ */ /*- @@ -49,6 +49,9 @@ #include <sys/vmmeter.h> #include <net/netisr.h> +#include "ppp.h" + +void netintr __P((void)); #include <machine/cpu.h> #include <machine/intr.h> @@ -277,18 +280,6 @@ intr_dispatch(evec) printf("intr_dispatch: stray level %d interrupt\n", ipl); } -/* - * XXX Why on earth isn't this in a common file?! - */ -void netintr __P((void)); -void arpintr __P((void)); -void atintr __P((void)); -void ipintr __P((void)); -void nsintr __P((void)); -void clnintr __P((void)); -void ccittintr __P((void)); -void pppintr __P((void)); - void netintr() { @@ -302,6 +293,12 @@ netintr() ipintr(); } #endif +#ifdef INET6 + if (netisr & (1 << NETISR_IPV6)) { + netisr &= ~(1 << NETISR_IPV6); + ipv6intr(); + } +#endif #ifdef NETATALK if (netisr & (1 << NETISR_ATALK)) { netisr &= ~(1 << NETISR_ATALK); @@ -326,7 +323,6 @@ netintr() ccittintr(); } #endif -#include "ppp.h" #if NPPP > 0 if (netisr & (1 << NETISR_PPP)) { netisr &= ~(1 << NETISR_PPP); |