global decl for *intr() routines, plus add INET6

12 files changed, 82 insertions, 102 deletions

diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 3ae349e6df6..07e3d31a074 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.24 1997/07/31 03:07:55 niklas Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.25 1999/01/07 23:15:51 deraadt Exp $	*/
 /*	$NetBSD: machdep.c,v 1.61 1996/12/07 01:54:49 cgd Exp $	*/
 
 /*
@@ -95,29 +95,7 @@
 #include <netinet/if_ether.h>
 #include <netinet/ip_var.h>
 #endif
-#ifdef NS
-#include <netns/ns_var.h>
-#endif
-#ifdef ISO
-#include <netiso/iso.h>
-#include <netiso/clnp.h>
-#endif
-#ifdef CCITT
-#include <netccitt/x25.h>
-#include <netccitt/pk.h>
-#include <netccitt/pk_extern.h>
-#endif
-#ifdef NETATALK
-#include <netatalk/at_extern.h>
-#endif
-#ifdef NATM
-#include <netnatm/natm.h>
-#endif
 #include "ppp.h"
-#if NPPP > 0
-#include <net/ppp_defs.h>
-#include <net/if_ppp.h>
-#endif
 
 #include "le_ioasic.h"			/* for le_iomem creation */
 
@@ -1490,6 +1468,9 @@ netintr()
 	DONETISR(NETISR_ARP, arpintr());
 	DONETISR(NETISR_IP, ipintr());
 #endif
+#ifdef INET6
+	DONETISR(NETISR_IPV6, ipv6intr());
+#endif
 #ifdef NETATALK
 	DONETISR(NETISR_ATALK, atintr());
 #endif
@@ -1505,7 +1486,7 @@ netintr()
 #ifdef NATM
 	DONETISR(NETISR_NATM, natmintr());
 #endif
-#if NPPP > 1
+#if NPPP > 0
 	DONETISR(NETISR_PPP, pppintr());
 #endif
 
diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index a9546d92ffe..db3c42bd11a 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.29 1998/03/01 14:35:42 niklas Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.30 1999/01/07 23:15:54 deraadt Exp $	*/
 /*	$NetBSD: machdep.c,v 1.95 1997/08/27 18:31:17 is Exp $	*/
 
 /*
@@ -109,32 +109,8 @@
 #include "ether.h"
 #include "ppp.h"
 
-#include <net/netisr.h>
 #include <net/if.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#ifdef NETHER
-#include <netinet/if_ether.h>
-#endif
-#include <netinet/ip_var.h>
-#endif 
-#ifdef NS
-#include <netns/ns_var.h>
-#endif
-#ifdef ISO
-#include <netiso/iso.h>
-#include <netiso/clnp.h>
-#endif
-#ifdef NETATALK
-#include <netatalk/at_extern.h>
-#endif
-#if NPPP > 0
-#include <net/ppp_defs.h>
-#include <net/if_ppp.h>
-#endif
-
-
 /* vm_map_t buffer_map; */
 extern vm_offset_t avail_end;
 extern vm_offset_t avail_start;
@@ -1212,6 +1188,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);
diff --git a/sys/arch/arc/arc/trap.c b/sys/arch/arc/arc/trap.c
index dd492895a5b..31f79200047 100644
--- a/sys/arch/arc/arc/trap.c
+++ b/sys/arch/arc/arc/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.20 1998/10/15 21:30:00 imp Exp $	*/
+/*	$OpenBSD: trap.c,v 1.21 1999/01/07 23:15:55 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -240,9 +240,6 @@ extern const struct callback *callv;
 extern u_long intrcnt[];
 extern void MipsSwitchFPState __P((struct proc *, int *));
 extern void MipsFPTrap __P((u_int, u_int, u_int));
-extern void arpintr __P((void));
-extern void ipintr __P((void));
-extern void pppintr __P((void));
 
 u_int trap __P((u_int, u_int, u_int, u_int, struct trap_frame));
 void interrupt __P((u_int, u_int, u_int, u_int, u_int));
@@ -892,6 +889,12 @@ interrupt(statusReg, causeReg, what, pc, args)
 			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);
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);
diff --git a/sys/arch/i386/isa/icu.s b/sys/arch/i386/isa/icu.s
index 555d758e42f..046b436a067 100644
--- a/sys/arch/i386/isa/icu.s
+++ b/sys/arch/i386/isa/icu.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icu.s,v 1.9 1997/07/23 06:58:34 denny Exp $	*/
+/*	$OpenBSD: icu.s,v 1.10 1999/01/07 23:15:58 deraadt Exp $	*/
 /*	$NetBSD: icu.s,v 1.45 1996/01/07 03:59:34 mycroft Exp $	*/
 
 /*-
@@ -157,6 +157,9 @@ IDTVEC(softnet)
 #endif
 	DONET(NETISR_IP, _ipintr)
 #endif
+#ifdef INET6
+	DONET(NETISR_IPV6, _ipv6intr)
+#endif /* INET6 */
 #ifdef NETATALK
 	DONET(NETISR_ATALK, _atintr)
 #endif
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index bea365615be..cb6143d1810 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.53 1998/05/03 07:19:54 gene Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.54 1999/01/07 23:16:00 deraadt Exp $	*/
 /*	$NetBSD: machdep.c,v 1.134 1997/02/14 06:15:30 scottr Exp $	*/
 
 /*
@@ -124,6 +124,8 @@
 #include <machine/bus.h>
 #include <net/netisr.h>
 
+void netintr __P((void));
+
 #define	MAXMEM	64*1024*CLSIZE	/* XXX - from cmap.h */
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
@@ -973,14 +975,6 @@ badladdr(addr)
 	return (0);
 }
 
-void arpintr __P((void));
-void ipintr __P((void));
-void atintr __P((void));
-void nsintr __P((void));
-void clnlintr __P((void));
-void pppintr __P((void));
-void netintr __P((void));
-
 void
 netintr()
 {
@@ -996,6 +990,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);
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index f3cc2011518..03613846387 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.23 1998/03/01 00:37:42 niklas Exp $ */
+/*	$OpenBSD: machdep.c,v 1.24 1999/01/07 23:16:01 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -855,6 +855,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);
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 177280deeda..07784538ac6 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1544,6 +1544,12 @@ void 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);
diff --git a/sys/arch/pmax/pmax/trap.c b/sys/arch/pmax/pmax/trap.c
index adb1b44517c..7a8e14e05d2 100644
--- a/sys/arch/pmax/pmax/trap.c
+++ b/sys/arch/pmax/pmax/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.17 1998/10/15 21:30:17 imp Exp $	*/
+/*	$OpenBSD: trap.c,v 1.18 1999/01/07 23:16:05 deraadt Exp $	*/
 /*	$NetBSD: trap.c,v 1.50 1996/10/13 21:37:49 jonathan Exp $	*/
 
 /*
@@ -79,13 +79,6 @@
 #include <sys/syslog.h>
 #include <miscfs/procfs/procfs.h>
 
-/* all this to get prototypes for ipintr() and arpintr() */
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <netinet/ip_var.h>
-
 #include "ppp.h"
 
 struct	proc *machFPCurProcPtr;		/* pointer to last proc to use FP */
@@ -1061,6 +1054,12 @@ interrupt(statusReg, causeReg, pc /* XXX what, args */ )
 			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);
diff --git a/sys/arch/powerpc/powerpc/machdep.c b/sys/arch/powerpc/powerpc/machdep.c
index 6f2f9c68bd0..30a6b4ad9ac 100644
--- a/sys/arch/powerpc/powerpc/machdep.c
+++ b/sys/arch/powerpc/powerpc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.20 1998/10/09 02:13:56 rahnds Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.21 1999/01/07 23:16:06 deraadt Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -687,6 +687,10 @@ softnet(isr)
 	if (isr & (1 << NETISR_IP))
 		ipintr();
 #endif
+#ifdef INET6
+	if (isr & (1 << NETISR_IPV6))
+		ipv6intr();
+#endif
 #ifdef NETATALK
 	if (isr & (1 << NETISR_ATALK))
 		atintr();
diff --git a/sys/arch/sparc/sparc/intr.c b/sys/arch/sparc/sparc/intr.c
index 7ca610c248e..9cbdbb17b6f 100644
--- a/sys/arch/sparc/sparc/intr.c
+++ b/sys/arch/sparc/sparc/intr.c
@@ -66,21 +66,7 @@
 #include <netinet/if_ether.h>
 #include <netinet/ip_var.h>
 #endif
-#ifdef NS
-#include <netns/ns_var.h>
-#endif
-#ifdef ISO
-#include <netiso/iso.h>
-#include <netiso/clnp.h>
-#endif
-#ifdef NETATALK
-#include <netatalk/at_extern.h>
-#endif
 #include "ppp.h"
-#if NPPP > 0
-#include <net/ppp_defs.h>
-#include <net/if_ppp.h>
-#endif
 
 void	strayintr __P((struct clockframe *));
 int	soft01intr __P((void *));
@@ -146,6 +132,10 @@ soft01intr(fp)
 			if (n & (1 << NETISR_IP))
 				ipintr();
 #endif
+#ifdef INET6
+			if (n & (1 << NETISR_IPV6))
+				ipv6intr();
+#endif
 #ifdef NETATALK
 			if (n & (1 << NETISR_ATALK))
 				atintr();
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index 7a4a5a6db99..609b43e2069 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netisr.h,v 1.11 1999/01/07 06:13:35 deraadt Exp $	*/
+/*	$OpenBSD: netisr.h,v 1.12 1999/01/07 23:15:49 deraadt Exp $	*/
 /*	$NetBSD: netisr.h,v 1.12 1995/08/12 23:59:24 mycroft Exp $	*/
 
 /*
@@ -71,6 +71,16 @@
 #ifdef _KERNEL
 int	netisr;				/* scheduling bits for network */
 
+void	arpintr __P((void));
+void	ipintr __P((void));
+void	ipv6intr __P((void));
+void	atintr __P((void));
+void	nsintr __P((void));
+void	clnlintr __P((void));
+void	natmintr __P((void));
+void	pppintr __P((void));
+void	ccittintr __P((void));
+
 #include <dev/rndvar.h>
 #define	schednetisr(anisr)	\
 	{ netisr |= 1<<(anisr); add_net_randomness(anisr); setsoftnet(); }