summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAlexander Yurchenko <grange@cvs.openbsd.org>2004-09-15 17:46:45 +0000
committerAlexander Yurchenko <grange@cvs.openbsd.org>2004-09-15 17:46:45 +0000
commite6f41cb4ba2b1d5cb9469bf732a520acc80d4f6e (patch)
tree1b18f5f35ad549f725154e16c2c2964dfa00de25 /sys
parente4d268e4cdabae1be0f928460e2988babb403cd5 (diff)
Kill more netiso ghosts.
ok millert@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/vax/if/if_de.c8
-rw-r--r--sys/kern/uipc_domain.c5
-rw-r--r--sys/net/if.c5
-rw-r--r--sys/net/if_enc.c6
-rw-r--r--sys/net/netisr_dispatch.h5
5 files changed, 5 insertions, 24 deletions
diff --git a/sys/arch/vax/if/if_de.c b/sys/arch/vax/if/if_de.c
index a6dbe086e1c..3b4a4ec94d5 100644
--- a/sys/arch/vax/if/if_de.c
+++ b/sys/arch/vax/if/if_de.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_de.c,v 1.14 2004/07/07 23:10:45 deraadt Exp $ */
+/* $OpenBSD: if_de.c,v 1.15 2004/09/15 17:46:43 grange Exp $ */
/* $NetBSD: if_de.c,v 1.27 1997/04/19 15:02:29 ragge Exp $ */
/*
@@ -72,12 +72,6 @@
#include <netns/ns_if.h>
#endif
-#ifdef ISO
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-extern char all_es_snpa[], all_is_snpa[];
-#endif
-
#include <machine/cpu.h>
#include <machine/mtpr.h>
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index 59c9200d653..794b6319c3a 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_domain.c,v 1.17 2004/04/01 23:56:05 tedu Exp $ */
+/* $OpenBSD: uipc_domain.c,v 1.18 2004/09/15 17:46:44 grange Exp $ */
/* $NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $ */
/*
@@ -94,9 +94,6 @@ domaininit()
#ifdef NS
ADDDOMAIN(ns);
#endif
-#ifdef ISO
- ADDDOMAIN(iso);
-#endif
#ifdef CCITT
ADDDOMAIN(ccitt);
#endif
diff --git a/sys/net/if.c b/sys/net/if.c
index 040733bdfa3..641edaedf55 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.90 2004/06/26 17:36:32 markus Exp $ */
+/* $OpenBSD: if.c,v 1.91 2004/09/15 17:46:44 grange Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
@@ -553,9 +553,6 @@ do { \
IF_DETACH_QUEUES(atintrq1);
IF_DETACH_QUEUES(atintrq2);
#endif
-#ifdef ISO
- IF_DETACH_QUEUES(clnlintrq);
-#endif
#ifdef CCITT
IF_DETACH_QUEUES(llcintrq);
#endif
diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c
index 4a7cc72a5c8..4e2c68e2fae 100644
--- a/sys/net/if_enc.c
+++ b/sys/net/if_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_enc.c,v 1.40 2003/05/03 21:15:11 deraadt Exp $ */
+/* $OpenBSD: if_enc.c,v 1.41 2004/09/15 17:46:44 grange Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -62,10 +62,6 @@
#include <netinet6/nd6.h>
#endif /* INET6 */
-#ifdef ISO
-extern struct ifqueue clnlintrq;
-#endif
-
#ifdef NS
extern struct ifqueue nsintrq;
#endif
diff --git a/sys/net/netisr_dispatch.h b/sys/net/netisr_dispatch.h
index 96493b324db..15aee38c30d 100644
--- a/sys/net/netisr_dispatch.h
+++ b/sys/net/netisr_dispatch.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: netisr_dispatch.h,v 1.4 2004/06/13 21:49:27 niklas Exp $ */
+/* $OpenBSD: netisr_dispatch.h,v 1.5 2004/09/15 17:46:44 grange Exp $ */
/* $NetBSD: netisr_dispatch.h,v 1.2 2000/07/02 04:40:47 cgd Exp $ */
/*
@@ -53,9 +53,6 @@
#ifdef NS
DONETISR(NETISR_NS,nsintr);
#endif
-#ifdef ISO
- DONETISR(NETISR_ISO,clnlintr);
-#endif
#ifdef CCITT
DONETISR(NETISR_CCITT,ccittintr);
#endif