summaryrefslogtreecommitdiff
path: root/sys/dev/isa
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2005-06-08 17:03:04 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2005-06-08 17:03:04 +0000
commit450458da5c54b346d37bd11af2c123619d1b5251 (patch)
tree982a4b774f0670ece704a67504425c6287f8c1ce /sys/dev/isa
parent7a5793168be0f07f61e9204f04930140c0697c78 (diff)
remove netns crud.
some drivers actually had hooks for SIOCSIFADDR, most just useless includes "looks good" deraadt miod brad
Diffstat (limited to 'sys/dev/isa')
-rw-r--r--sys/dev/isa/if_ec.c7
-rw-r--r--sys/dev/isa/if_ex.c23
-rw-r--r--sys/dev/isa/if_lc_isa.c7
-rw-r--r--sys/dev/isa/if_ne_isa.c7
-rw-r--r--sys/dev/isa/if_ne_isapnp.c7
-rw-r--r--sys/dev/isa/if_sm_isa.c7
-rw-r--r--sys/dev/isa/if_we.c7
7 files changed, 7 insertions, 58 deletions
diff --git a/sys/dev/isa/if_ec.c b/sys/dev/isa/if_ec.c
index dddb458905d..aab588a6f53 100644
--- a/sys/dev/isa/if_ec.c
+++ b/sys/dev/isa/if_ec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ec.c,v 1.5 2004/05/12 06:35:10 tedu Exp $ */
+/* $OpenBSD: if_ec.c,v 1.6 2005/06/08 17:03:00 henning Exp $ */
/* $NetBSD: if_ec.c,v 1.9 1998/07/05 06:49:12 jonathan Exp $ */
/*-
@@ -85,11 +85,6 @@
#endif
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#if NBPFILTER > 0
#include <net/bpf.h>
#endif
diff --git a/sys/dev/isa/if_ex.c b/sys/dev/isa/if_ex.c
index 7b7ce403b16..ac69f10ac3f 100644
--- a/sys/dev/isa/if_ex.c
+++ b/sys/dev/isa/if_ex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ex.c,v 1.12 2005/04/03 10:29:12 brad Exp $ */
+/* $OpenBSD: if_ex.c,v 1.13 2005/06/08 17:03:00 henning Exp $ */
/*
* Copyright (c) 1997, Donald A. Schmidt
* Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es)
@@ -59,11 +59,6 @@
#include <netipx/ipx_if.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#if NBPFILTER > 0
#include <net/bpf.h>
#endif
@@ -825,22 +820,6 @@ ex_ioctl(ifp, cmd, data)
break;
}
#endif
-#ifdef NS
- case AF_NS:
- {
- register struct ns_addr *ina = &(IA_SNS(ifa)->sns_addr);
-
- if (ns_nullhost(*ina))
- ina->x_host = *(union ns_host *) (sc->arpcom.ac_enaddr);
- else {
- ifp->if_flags &= ~IFF_RUNNING;
- bcopy((caddr_t) ina->x_host.c_host, (caddr_t) sc->arpcom.ac_enaddr,
- sizeof(sc->arpcom.ac_enaddr));
- }
- ex_init(sc);
- break;
- }
-#endif
default:
ex_init(sc);
break;
diff --git a/sys/dev/isa/if_lc_isa.c b/sys/dev/isa/if_lc_isa.c
index 39315c01832..ba758a46e6e 100644
--- a/sys/dev/isa/if_lc_isa.c
+++ b/sys/dev/isa/if_lc_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lc_isa.c,v 1.4 2004/05/12 06:35:11 tedu Exp $ */
+/* $OpenBSD: if_lc_isa.c,v 1.5 2005/06/08 17:03:00 henning Exp $ */
/* $NetBSD: if_lc_isa.c,v 1.10 2001/06/13 10:46:03 wiz Exp $ */
/*-
@@ -58,11 +58,6 @@
#include <netinet/if_ether.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#if NBPFILTER > 0
#include <net/bpf.h>
#endif
diff --git a/sys/dev/isa/if_ne_isa.c b/sys/dev/isa/if_ne_isa.c
index 425dd1f4483..bcf09026b32 100644
--- a/sys/dev/isa/if_ne_isa.c
+++ b/sys/dev/isa/if_ne_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ne_isa.c,v 1.7 2004/05/12 06:35:11 tedu Exp $ */
+/* $OpenBSD: if_ne_isa.c,v 1.8 2005/06/08 17:03:00 henning Exp $ */
/* $NetBSD: if_ne_isa.c,v 1.6 1998/07/05 06:49:13 jonathan Exp $ */
/*-
@@ -69,11 +69,6 @@
#endif
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#if NBPFILTER > 0
#include <net/bpf.h>
#endif
diff --git a/sys/dev/isa/if_ne_isapnp.c b/sys/dev/isa/if_ne_isapnp.c
index 0b00db1bb43..fb54bef7574 100644
--- a/sys/dev/isa/if_ne_isapnp.c
+++ b/sys/dev/isa/if_ne_isapnp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ne_isapnp.c,v 1.6 2004/05/12 06:35:11 tedu Exp $ */
+/* $OpenBSD: if_ne_isapnp.c,v 1.7 2005/06/08 17:03:00 henning Exp $ */
/* $NetBSD: if_ne_isapnp.c,v 1.7 1998/07/23 19:30:45 christos Exp $ */
/*-
@@ -69,11 +69,6 @@
#endif
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#if NBPFILTER > 0
#include <net/bpf.h>
#endif
diff --git a/sys/dev/isa/if_sm_isa.c b/sys/dev/isa/if_sm_isa.c
index c49ec80119d..bbd28ab4f60 100644
--- a/sys/dev/isa/if_sm_isa.c
+++ b/sys/dev/isa/if_sm_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sm_isa.c,v 1.4 2004/05/12 06:35:11 tedu Exp $ */
+/* $OpenBSD: if_sm_isa.c,v 1.5 2005/06/08 17:03:00 henning Exp $ */
/* $NetBSD: if_sm_isa.c,v 1.4 1998/07/05 06:49:14 jonathan Exp $ */
/*-
@@ -69,11 +69,6 @@
#endif
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#if NBPFILTER > 0
#include <net/bpf.h>
#endif
diff --git a/sys/dev/isa/if_we.c b/sys/dev/isa/if_we.c
index 8f02df94de2..0963e3588f9 100644
--- a/sys/dev/isa/if_we.c
+++ b/sys/dev/isa/if_we.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_we.c,v 1.12 2004/05/12 06:35:11 tedu Exp $ */
+/* $OpenBSD: if_we.c,v 1.13 2005/06/08 17:03:00 henning Exp $ */
/* $NetBSD: if_we.c,v 1.11 1998/07/05 06:49:14 jonathan Exp $ */
/*-
@@ -87,11 +87,6 @@
#endif
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#if NBPFILTER > 0
#include <net/bpf.h>
#endif