summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/alpha/machdep.c13
-rw-r--r--sys/arch/amiga/amiga/machdep.c5
-rw-r--r--sys/arch/arc/arc/trap.c4
-rw-r--r--sys/arch/arm32/arm32/irqhandler.c3
-rw-r--r--sys/arch/atari/atari/machdep.c6
-rw-r--r--sys/arch/hp300/hp300/intr.c4
-rw-r--r--sys/arch/i386/isa/icu.s4
-rw-r--r--sys/arch/kbus/kbus/intr.c3
-rw-r--r--sys/arch/mac68k/mac68k/machdep.c4
-rw-r--r--sys/arch/mvme68k/mvme68k/machdep.c4
-rw-r--r--sys/arch/mvme88k/mvme88k/machdep.c4
-rw-r--r--sys/arch/pc532/pc532/intr.c5
-rw-r--r--sys/arch/sparc/sparc/intr.c11
-rw-r--r--sys/arch/sun3/sun3/isr.c7
-rw-r--r--sys/arch/vax/vax/machdep.c8
15 files changed, 64 insertions, 21 deletions
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 4281760f068..f5a4d7ffc6e 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.28 1999/05/24 23:08:55 jason Exp $ */
+/* $OpenBSD: machdep.c,v 1.29 1999/12/08 06:50:14 itojun Exp $ */
/* $NetBSD: machdep.c,v 1.61 1996/12/07 01:54:49 cgd Exp $ */
/*
@@ -95,6 +95,15 @@
#include <netinet/if_ether.h>
#include <netinet/ip_var.h>
#endif
+
+#ifdef INET6
+# ifndef INET
+# include <netinet/in.h>
+# endif
+#include <netinet6/ip6.h>
+#include <netinet6/ip6_var.h>
+#endif
+
#include "ppp.h"
#include "bridge.h"
@@ -1474,7 +1483,7 @@ netintr()
DONETISR(NETISR_IP, ipintr());
#endif
#ifdef INET6
- DONETISR(NETISR_IPV6, ipv6intr());
+ DONETISR(NETISR_IPV6, ip6intr());
#endif
#ifdef NETATALK
DONETISR(NETISR_ATALK, atintr());
diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index 7ce67d58b9c..458526fb3e6 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.34 1999/09/03 18:00:28 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.35 1999/12/08 06:50:14 itojun Exp $ */
/* $NetBSD: machdep.c,v 1.95 1997/08/27 18:31:17 is Exp $ */
/*
@@ -108,7 +108,6 @@
#include "ser.h"
#include "ether.h"
#include "ppp.h"
-#include "bridge.h"
#include <net/if.h>
@@ -1205,7 +1204,7 @@ netintr()
#ifdef INET6
if (netisr & (1 << NETISR_IPV6)) {
netisr &= ~(1 << NETISR_IPV6);
- ipv6intr();
+ ip6intr();
}
#endif
#ifdef NETATALK
diff --git a/sys/arch/arc/arc/trap.c b/sys/arch/arc/arc/trap.c
index edb0e8c0fea..6deb34facc8 100644
--- a/sys/arch/arc/arc/trap.c
+++ b/sys/arch/arc/arc/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.22 1999/05/24 23:08:59 jason Exp $ */
+/* $OpenBSD: trap.c,v 1.23 1999/12/08 06:50:15 itojun Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -893,7 +893,7 @@ interrupt(statusReg, causeReg, what, pc, args)
#ifdef INET6
if (netisr & (1 << NETISR_IPV6)) {
netisr &= ~(1 << NETISR_IPV6);
- ipv6intr();
+ ip6intr();
}
#endif
#ifdef NETATALK
diff --git a/sys/arch/arm32/arm32/irqhandler.c b/sys/arch/arm32/arm32/irqhandler.c
index 6f75277f577..7ee69cd3e46 100644
--- a/sys/arch/arm32/arm32/irqhandler.c
+++ b/sys/arch/arm32/arm32/irqhandler.c
@@ -444,6 +444,9 @@ dosoftints()
#endif
ipintr();
#endif
+#ifdef INET6
+ ip6intr();
+#endif
#ifdef IMP
impintr();
#endif
diff --git a/sys/arch/atari/atari/machdep.c b/sys/arch/atari/atari/machdep.c
index 01e18c172ac..2ead98665bd 100644
--- a/sys/arch/atari/atari/machdep.c
+++ b/sys/arch/atari/atari/machdep.c
@@ -1116,6 +1116,12 @@ netintr()
ipintr();
}
#endif
+#ifdef INET6
+ if (netisr & (1 << NETISR_IPV6)) {
+ netisr &= ~(1 << NETISR_IPV6);
+ ip6intr();
+ }
+#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 a73ea086e65..7cd9efa2fcf 100644
--- a/sys/arch/hp300/hp300/intr.c
+++ b/sys/arch/hp300/hp300/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.5 1999/05/24 23:09:00 jason Exp $ */
+/* $OpenBSD: intr.c,v 1.6 1999/12/08 06:50:15 itojun Exp $ */
/* $NetBSD: intr.c,v 1.2 1997/05/01 16:24:26 thorpej Exp $ */
/*-
@@ -297,7 +297,7 @@ netintr()
#ifdef INET6
if (netisr & (1 << NETISR_IPV6)) {
netisr &= ~(1 << NETISR_IPV6);
- ipv6intr();
+ ip6intr();
}
#endif
#ifdef NETATALK
diff --git a/sys/arch/i386/isa/icu.s b/sys/arch/i386/isa/icu.s
index bb65eb051df..90d52454b93 100644
--- a/sys/arch/i386/isa/icu.s
+++ b/sys/arch/i386/isa/icu.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: icu.s,v 1.11 1999/05/24 23:09:01 jason Exp $ */
+/* $OpenBSD: icu.s,v 1.12 1999/12/08 06:50:15 itojun Exp $ */
/* $NetBSD: icu.s,v 1.45 1996/01/07 03:59:34 mycroft Exp $ */
/*-
@@ -158,7 +158,7 @@ IDTVEC(softnet)
DONET(NETISR_IP, _ipintr)
#endif
#ifdef INET6
- DONET(NETISR_IPV6, _ipv6intr)
+ DONET(NETISR_IPV6, _ip6intr)
#endif /* INET6 */
#ifdef NETATALK
DONET(NETISR_ATALK, _atintr)
diff --git a/sys/arch/kbus/kbus/intr.c b/sys/arch/kbus/kbus/intr.c
index bbdef71399e..0770a8215dc 100644
--- a/sys/arch/kbus/kbus/intr.c
+++ b/sys/arch/kbus/kbus/intr.c
@@ -149,6 +149,9 @@ netintr()
DONETISR(NETISR_ARP, arpintr());
DONETISR(NETISR_IP, ipintr());
#endif
+#ifdef INET6
+ DONETISR(NETISR_IPV6, ip6intr());
+#endif
#ifdef NS
DONETISR(NETISR_NS, nsintr());
#endif
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index 98a37234efb..d27edd00388 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.63 1999/09/03 18:01:12 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.64 1999/12/08 06:50:16 itojun Exp $ */
/* $NetBSD: machdep.c,v 1.134 1997/02/14 06:15:30 scottr Exp $ */
/*
@@ -1038,7 +1038,7 @@ netintr()
#ifdef INET6
if (netisr & (1 << NETISR_IPV6)) {
netisr &= ~(1 << NETISR_IPV6);
- ipv6intr();
+ ip6intr();
}
#endif
#ifdef NETATALK
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index 9287013541f..fff1f90c012 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.29 1999/09/27 20:30:32 smurph Exp $ */
+/* $OpenBSD: machdep.c,v 1.30 1999/12/08 06:50:16 itojun Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -872,7 +872,7 @@ netintr()
#ifdef INET6
if (netisr & (1 << NETISR_IPV6)) {
netisr &= ~(1 << NETISR_IPV6);
- ipv6intr();
+ ip6intr();
}
#endif
#ifdef NETATALK
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 247f163b31c..50cf804b303 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.17 1999/09/27 19:13:23 smurph Exp $ */
+/* $OpenBSD: machdep.c,v 1.18 1999/12/08 06:50:16 itojun Exp $ */
/*
* Copyright (c) 1998, 1999 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -1827,7 +1827,7 @@ void netintr()
#ifdef INET6
if (netisr & (1 << NETISR_IPV6)) {
netisr &= ~(1 << NETISR_IPV6);
- ipv6intr();
+ ip6intr();
}
#endif
#ifdef NETATALK
diff --git a/sys/arch/pc532/pc532/intr.c b/sys/arch/pc532/pc532/intr.c
index afe3d85ea4b..5960b18becd 100644
--- a/sys/arch/pc532/pc532/intr.c
+++ b/sys/arch/pc532/pc532/intr.c
@@ -29,7 +29,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: intr.c,v 1.4 1999/05/24 23:09:06 jason Exp $
+ * $Id: intr.c,v 1.5 1999/12/08 06:50:16 itojun Exp $
*/
#define DEFINE_SPLX
@@ -177,6 +177,9 @@ softnet()
#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
diff --git a/sys/arch/sparc/sparc/intr.c b/sys/arch/sparc/sparc/intr.c
index 477f54e4ab8..2ba1aab69c0 100644
--- a/sys/arch/sparc/sparc/intr.c
+++ b/sys/arch/sparc/sparc/intr.c
@@ -66,6 +66,15 @@
#include <netinet/if_ether.h>
#include <netinet/ip_var.h>
#endif
+
+#ifdef INET6
+# ifndef INET
+# include <netinet/in.h>
+# endif
+#include <netinet6/ip6.h>
+#include <netinet6/ip6_var.h>
+#endif
+
#include "ppp.h"
#include "bridge.h"
@@ -135,7 +144,7 @@ soft01intr(fp)
#endif
#ifdef INET6
if (n & (1 << NETISR_IPV6))
- ipv6intr();
+ ip6intr();
#endif
#ifdef NETATALK
if (n & (1 << NETISR_ATALK))
diff --git a/sys/arch/sun3/sun3/isr.c b/sys/arch/sun3/sun3/isr.c
index 10ad3d52620..c052f1697f3 100644
--- a/sys/arch/sun3/sun3/isr.c
+++ b/sys/arch/sun3/sun3/isr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isr.c,v 1.9 1999/05/24 23:09:08 jason Exp $ */
+/* $OpenBSD: isr.c,v 1.10 1999/12/08 06:50:17 itojun Exp $ */
/* $NetBSD: isr.c,v 1.25 1996/11/20 18:57:32 gwr Exp $ */
/*-
@@ -101,6 +101,7 @@ isr_add_custom(level, handler)
*/
void arpintr __P((void));
void ipintr __P((void));
+void ip6intr __P((void));
void atintr __P((void));
void nsintr __P((void));
void clnlintr __P((void));
@@ -126,6 +127,10 @@ netintr()
if (n & (1 << NETISR_IP))
ipintr();
#endif
+#ifdef INET6
+ if (n & (1 << NETISR_IPV6))
+ ip6intr();
+#endif
#ifdef NETATALK
if (n & (1 << NETISR_ATALK))
atintr();
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index f63eaec3d57..c3e616a680f 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.19 1999/05/24 23:09:09 jason Exp $ */
+/* $OpenBSD: machdep.c,v 1.20 1999/12/08 06:50:17 itojun Exp $ */
/* $NetBSD: machdep.c,v 1.45 1997/07/26 10:12:49 ragge Exp $ */
/*
@@ -694,6 +694,12 @@ netintr()
ipintr();
}
#endif
+#ifdef INET6
+ if (netisr & (1 << NETISR_IPV6)) {
+ netisr &= ~(1 << NETISR_IPV6);
+ ip6intr();
+ }
+#endif
#ifdef NETATALK
if (netisr & (1 << NETISR_ATALK)) {
netisr &= ~(1 << NETISR_ATALK);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 01:11:50 +0000