Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch - Call ip6intr if INET6 is defined.
details: https://anonhg.NetBSD.org/src/rev/e6d9415279af
branches: trunk
changeset: 474110:e6d9415279af
user: itojun <itojun%NetBSD.org@localhost>
date: Mon Jun 28 08:20:40 1999 +0000
description:
- Call ip6intr if INET6 is defined.
- remove "need-flag" for mac68k esp driver, as it is not used in anywhere
and conflicts with IPsec ESP header.
This should be the only MD change in IPv6 support, except kernel config file.
Very sorry if you have any compilation problem with it (I believe it is okay).
If your favorite arch is not included in here, please add a
call to ip6intr() from softintr handle.
diffstat:
sys/arch/alpha/alpha/machdep.c | 14 ++++++++++++--
sys/arch/amiga/amiga/machdep.c | 15 ++++++++++++++-
sys/arch/arm32/arm32/intr.c | 15 ++++++++++++++-
sys/arch/atari/atari/machdep.c | 11 ++++++++++-
sys/arch/bebox/bebox/machdep.c | 6 +++++-
sys/arch/hp300/hp300/intr.c | 7 ++++++-
sys/arch/i386/isa/icu.s | 5 ++++-
sys/arch/mac68k/conf/files.mac68k | 4 ++--
sys/arch/mac68k/mac68k/intr.c | 7 ++++++-
sys/arch/macppc/macppc/machdep.c | 14 +++++++++++++-
sys/arch/mips/mips/trap.c | 15 +++++++++++++--
sys/arch/mvme68k/mvme68k/isr.c | 8 +++++++-
sys/arch/next68k/next68k/isr.c | 9 ++++++++-
sys/arch/ofppc/ofppc/machdep.c | 6 +++++-
sys/arch/pc532/pc532/machdep.c | 12 +++++++++++-
sys/arch/pica/pica/trap.c | 16 +++++++++++++++-
sys/arch/sparc/sparc/intr.c | 13 ++++++++++++-
sys/arch/sparc64/sparc64/intr.c | 13 ++++++++++++-
sys/arch/sun3/sun3/isr.c | 7 ++++++-
sys/arch/vax/vax/intvec.s | 5 ++++-
sys/arch/x68k/x68k/machdep.c | 9 ++++++++-
21 files changed, 187 insertions(+), 24 deletions(-)
diffs (truncated from 624 to 300 lines):
diff -r 7ddd014c2aba -r e6d9415279af sys/arch/alpha/alpha/machdep.c
--- a/sys/arch/alpha/alpha/machdep.c Mon Jun 28 07:59:39 1999 +0000
+++ b/sys/arch/alpha/alpha/machdep.c Mon Jun 28 08:20:40 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.175 1999/05/26 19:16:28 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.176 1999/06/28 08:20:40 itojun Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.175 1999/05/26 19:16:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.176 1999/06/28 08:20:40 itojun Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -139,6 +139,13 @@
#include <netinet/if_inarp.h>
#endif
#endif
+#ifdef INET6
+# ifndef INET
+# include <netinet/in.h>
+# endif
+#include <netinet6/ip6.h>
+#include <netinet6/ip6_var.h>
+#endif
#ifdef NS
#include <netns/ns_var.h>
#endif
@@ -1896,6 +1903,9 @@
#endif
DONETISR(NETISR_IP, ipintr());
#endif
+#ifdef INET6
+ DONETISR(NETISR_IPV6, ip6intr());
+#endif
#ifdef NETATALK
DONETISR(NETISR_ATALK, atintr());
#endif
diff -r 7ddd014c2aba -r e6d9415279af sys/arch/amiga/amiga/machdep.c
--- a/sys/arch/amiga/amiga/machdep.c Mon Jun 28 07:59:39 1999 +0000
+++ b/sys/arch/amiga/amiga/machdep.c Mon Jun 28 08:20:40 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.137 1999/05/26 19:16:29 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.138 1999/06/28 08:20:42 itojun Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -122,6 +122,13 @@
#endif
#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
#ifdef NS
#include <netns/ns_var.h>
#endif
@@ -1048,6 +1055,12 @@
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 -r 7ddd014c2aba -r e6d9415279af sys/arch/arm32/arm32/intr.c
--- a/sys/arch/arm32/arm32/intr.c Mon Jun 28 07:59:39 1999 +0000
+++ b/sys/arch/arm32/arm32/intr.c Mon Jun 28 08:20:40 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.14 1999/03/24 05:50:55 mrg Exp $ */
+/* $NetBSD: intr.c,v 1.15 1999/06/28 08:20:42 itojun Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -66,6 +66,13 @@
#endif /* NARP > 0 */
#include <netinet/ip_var.h>
#endif /* INET */
+#ifdef INET6
+# ifndef INET
+# include <netinet/in.h>
+# endif
+#include <netinet6/ip6.h>
+#include <netinet6/ip6_var.h>
+#endif /* INET6 */
#ifdef NS
#include <netns/ns_var.h>
#endif /* NS */
@@ -208,6 +215,12 @@
ipintr();
}
#endif
+#ifdef INET6
+ if (netisr & (1 << NETISR_IPV6)) {
+ atomic_clear_bit(&netisr, (1 << NETISR_IPV6));
+ ip6intr();
+ }
+#endif
#ifdef NETATALK
if (netisr & (1 << NETISR_ATALK)) {
atomic_clear_bit(&netisr, (1 << NETISR_ATALK));
diff -r 7ddd014c2aba -r e6d9415279af sys/arch/atari/atari/machdep.c
--- a/sys/arch/atari/atari/machdep.c Mon Jun 28 07:59:39 1999 +0000
+++ b/sys/arch/atari/atari/machdep.c Mon Jun 28 08:20:40 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.84 1999/05/26 19:16:30 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.85 1999/06/28 08:20:43 itojun Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -785,6 +785,9 @@
#ifdef INET
void ipintr __P((void));
#endif
+#ifdef INET6
+void ip6intr __P((void));
+#endif
#ifdef NETATALK
void atintr __P((void));
#endif
@@ -820,6 +823,12 @@
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 -r 7ddd014c2aba -r e6d9415279af sys/arch/bebox/bebox/machdep.c
--- a/sys/arch/bebox/bebox/machdep.c Mon Jun 28 07:59:39 1999 +0000
+++ b/sys/arch/bebox/bebox/machdep.c Mon Jun 28 08:20:40 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.39 1999/06/22 02:04:06 sakamoto Exp $ */
+/* $NetBSD: machdep.c,v 1.40 1999/06/28 08:20:43 itojun Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -931,6 +931,10 @@
if (isr & (1 << NETISR_IP))
ipintr();
#endif
+#ifdef INET6
+ if (isr & (1 << NETISR_IPV6))
+ ip6intr();
+#endif
#ifdef IMP
if (isr & (1 << NETISR_IMP))
impintr();
diff -r 7ddd014c2aba -r e6d9415279af sys/arch/hp300/hp300/intr.c
--- a/sys/arch/hp300/hp300/intr.c Mon Jun 28 07:59:39 1999 +0000
+++ b/sys/arch/hp300/hp300/intr.c Mon Jun 28 08:20:40 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.12 1999/03/24 05:50:59 mrg Exp $ */
+/* $NetBSD: intr.c,v 1.13 1999/06/28 08:20:43 itojun Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -293,6 +293,7 @@
void arpintr __P((void));
void atintr __P((void));
void ipintr __P((void));
+void ip6intr __P((void));
void nsintr __P((void));
void clnlintr __P((void));
void ccittintr __P((void));
@@ -320,6 +321,10 @@
if (isr & (1 << NETISR_IP))
ipintr();
#endif
+#ifdef INET6
+ if (isr & (1 << NETISR_IPV6))
+ ip6intr();
+#endif
#ifdef NETATALK
if (isr & (1 << NETISR_ATALK))
atintr();
diff -r 7ddd014c2aba -r e6d9415279af sys/arch/i386/isa/icu.s
--- a/sys/arch/i386/isa/icu.s Mon Jun 28 07:59:39 1999 +0000
+++ b/sys/arch/i386/isa/icu.s Mon Jun 28 08:20:40 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: icu.s,v 1.59 1999/01/26 14:28:05 christos Exp $ */
+/* $NetBSD: icu.s,v 1.60 1999/06/28 08:20:44 itojun Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -169,6 +169,9 @@
#endif
DONET(NETISR_IP, _C_LABEL(ipintr))
#endif
+#ifdef INET6
+ DONET(NETISR_IPV6, _ip6intr)
+#endif
#ifdef IMP
DONET(NETISR_IMP, _C_LABEL(impintr))
#endif
diff -r 7ddd014c2aba -r e6d9415279af sys/arch/mac68k/conf/files.mac68k
--- a/sys/arch/mac68k/conf/files.mac68k Mon Jun 28 07:59:39 1999 +0000
+++ b/sys/arch/mac68k/conf/files.mac68k Mon Jun 28 08:20:40 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.mac68k,v 1.91 1999/06/28 01:56:55 briggs Exp $
+# $NetBSD: files.mac68k,v 1.92 1999/06/28 08:20:44 itojun Exp $
# mac68k-specific configuration info
@@ -109,7 +109,7 @@
device esp: scsi, ncr53c9x
attach esp at obio_norm
-file arch/mac68k/obio/esp.c esp needs-flag
+file arch/mac68k/obio/esp.c esp
device zsc { channel = -1 }
attach zsc at obio_norm
diff -r 7ddd014c2aba -r e6d9415279af sys/arch/mac68k/mac68k/intr.c
--- a/sys/arch/mac68k/mac68k/intr.c Mon Jun 28 07:59:39 1999 +0000
+++ b/sys/arch/mac68k/mac68k/intr.c Mon Jun 28 08:20:40 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.5 1999/06/28 01:56:57 briggs Exp $ */
+/* $NetBSD: intr.c,v 1.6 1999/06/28 08:20:44 itojun Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -283,6 +283,7 @@
void arpintr __P((void));
void atintr __P((void));
void ipintr __P((void));
+void ip6intr __P((void));
void nsintr __P((void));
void clnlintr __P((void));
void ccittintr __P((void));
@@ -310,6 +311,10 @@
if (isr & (1 << NETISR_IP))
ipintr();
#endif
+#ifdef INET6
+ if (isr & (1 << NETISR_IPV6))
+ ip6intr();
+#endif
#ifdef NETATALK
if (isr & (1 << NETISR_ATALK))
atintr();
diff -r 7ddd014c2aba -r e6d9415279af sys/arch/macppc/macppc/machdep.c
--- a/sys/arch/macppc/macppc/machdep.c Mon Jun 28 07:59:39 1999 +0000
+++ b/sys/arch/macppc/macppc/machdep.c Mon Jun 28 08:20:40 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.48 1999/06/14 06:22:50 tsubai Exp $ */
+/* $NetBSD: machdep.c,v 1.49 1999/06/28 08:20:45 itojun Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -72,6 +72,14 @@
#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 <machine/bat.h>
#include <machine/pmap.h>
#include <machine/powerpc.h>
@@ -814,6 +822,10 @@
if (isr & (1 << NETISR_IP))
ipintr();
#endif
+#ifdef INET6
+ if (isr & (1 << NETISR_IPV6))
+ ip6intr();
+#endif
#ifdef IMP
if (isr & (1 << NETISR_IMP))
impintr();
diff -r 7ddd014c2aba -r e6d9415279af sys/arch/mips/mips/trap.c
--- a/sys/arch/mips/mips/trap.c Mon Jun 28 07:59:39 1999 +0000
+++ b/sys/arch/mips/mips/trap.c Mon Jun 28 08:20:40 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.110 1999/05/29 09:38:28 nisimura Exp $ */
+/* $NetBSD: trap.c,v 1.111 1999/06/28 08:20:45 itojun Exp $ */
Home |
Main Index |
Thread Index |
Old Index