summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/mac68k/dev/if_mc.c25
-rw-r--r--sys/arch/macppc/dev/if_bm.c20
-rw-r--r--sys/arch/sparc/dev/be.c20
-rw-r--r--sys/arch/sparc/dev/hme.c20
-rw-r--r--sys/arch/sparc/dev/if_ie.c25
-rw-r--r--sys/arch/sparc/dev/qe.c20
-rw-r--r--sys/arch/vax/if/if_de.c20
-rw-r--r--sys/arch/vax/vax/machdep.c5
8 files changed, 8 insertions, 147 deletions
diff --git a/sys/arch/mac68k/dev/if_mc.c b/sys/arch/mac68k/dev/if_mc.c
index ddf91a6ab6e..a7682087fe0 100644
--- a/sys/arch/mac68k/dev/if_mc.c
+++ b/sys/arch/mac68k/dev/if_mc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mc.c,v 1.12 2005/06/07 02:29:30 henning Exp $ */
+/* $OpenBSD: if_mc.c,v 1.13 2005/06/08 17:03:02 henning Exp $ */
/* $NetBSD: if_mc.c,v 1.24 2004/10/30 18:08:34 thorpej Exp $ */
/*-
@@ -57,11 +57,6 @@
#include <netinet/ip.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <uvm/uvm_extern.h>
#include "bpfilter.h"
@@ -196,24 +191,6 @@ mcioctl(ifp, cmd, data)
arp_ifinit(&sc->sc_ethercom, ifa);
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 *)LLADDR(ifp->if_sadl);
- else {
- bcopy(ina->x_host.c_host,
- LLADDR(ifp->if_sadl),
- sizeof(sc->sc_enaddr));
- }
- /* Set new address. */
- mcinit(sc);
- break;
- }
-#endif
default:
mcinit(sc);
break;
diff --git a/sys/arch/macppc/dev/if_bm.c b/sys/arch/macppc/dev/if_bm.c
index 29650c10c6b..74af5cc37b0 100644
--- a/sys/arch/macppc/dev/if_bm.c
+++ b/sys/arch/macppc/dev/if_bm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bm.c,v 1.17 2005/01/15 05:24:10 brad Exp $ */
+/* $OpenBSD: if_bm.c,v 1.18 2005/06/08 17:03:02 henning Exp $ */
/* $NetBSD: if_bm.c,v 1.1 1999/01/01 01:27:52 tsubai Exp $ */
/*-
@@ -823,24 +823,6 @@ bmac_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
#endif
break;
#endif
-#ifdef NS
- case AF_NS:
- {
- struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host =
- *(union ns_host *)LLADDR(ifp->if_sadl);
- else {
- bcopy(ina->x_host.c_host,
- LLADDR(ifp->if_sadl),
- sizeof(sc->sc_enaddr));
- }
- /* Set new address. */
- bmac_init(sc);
- break;
- }
-#endif
default:
bmac_init(sc);
break;
diff --git a/sys/arch/sparc/dev/be.c b/sys/arch/sparc/dev/be.c
index 5e14e6d2d9c..8e1b4966bcd 100644
--- a/sys/arch/sparc/dev/be.c
+++ b/sys/arch/sparc/dev/be.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: be.c,v 1.36 2005/01/15 05:24:10 brad Exp $ */
+/* $OpenBSD: be.c,v 1.37 2005/06/08 17:03:02 henning Exp $ */
/*
* Copyright (c) 1998 Theo de Raadt and Jason L. Wright.
@@ -583,24 +583,6 @@ beioctl(ifp, cmd, data)
arp_ifinit(&sc->sc_arpcom, ifa);
break;
#endif /* INET */
-#ifdef NS
- /* XXX - This code is probably wrong. */
- case AF_NS:
- {
- struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host = *(union ns_host *)
- (sc->sc_arpcom.ac_enaddr);
- else
- bcopy(ina->x_host.c_host,
- sc->sc_arpcom.ac_enaddr,
- sizeof(sc->sc_arpcom.ac_enaddr));
- /* Set new address. */
- beinit(sc);
- break;
- }
-#endif /* NS */
default:
beinit(sc);
break;
diff --git a/sys/arch/sparc/dev/hme.c b/sys/arch/sparc/dev/hme.c
index 78db38ed1e1..a0913ab4d9b 100644
--- a/sys/arch/sparc/dev/hme.c
+++ b/sys/arch/sparc/dev/hme.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hme.c,v 1.48 2005/04/25 17:55:50 brad Exp $ */
+/* $OpenBSD: hme.c,v 1.49 2005/06/08 17:03:02 henning Exp $ */
/*
* Copyright (c) 1998 Jason L. Wright (jason@thought.net)
@@ -406,24 +406,6 @@ hmeioctl(ifp, cmd, data)
arp_ifinit(&sc->sc_arpcom, ifa);
break;
#endif /* INET */
-#ifdef NS
- /* XXX - This code is probably wrong. */
- case AF_NS:
- {
- struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host =
- *(union ns_host *)(sc->sc_arpcom.ac_enaddr);
- else
- bcopy(ina->x_host.c_host,
- sc->sc_arpcom.ac_enaddr,
- sizeof(sc->sc_arpcom.ac_enaddr));
- /* Set new address. */
- hmeinit(sc);
- break;
- }
-#endif /* NS */
default:
ifp->if_flags |= IFF_UP;
hmeinit(sc);
diff --git a/sys/arch/sparc/dev/if_ie.c b/sys/arch/sparc/dev/if_ie.c
index c8117b5844b..57fc0eda24b 100644
--- a/sys/arch/sparc/dev/if_ie.c
+++ b/sys/arch/sparc/dev/if_ie.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ie.c,v 1.30 2005/03/23 17:14:43 miod Exp $ */
+/* $OpenBSD: if_ie.c,v 1.31 2005/06/08 17:03:02 henning Exp $ */
/* $NetBSD: if_ie.c,v 1.33 1997/07/29 17:55:38 fair Exp $ */
/*-
@@ -130,11 +130,6 @@ Mode of operation:
#include <netinet/if_ether.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <uvm/uvm_extern.h>
#include <uvm/uvm_map.h>
@@ -1973,24 +1968,6 @@ ieioctl(ifp, cmd, data)
arp_ifinit(&sc->sc_arpcom, ifa);
break;
#endif
-#ifdef NS
- /* XXX - This code is probably wrong. */
- case AF_NS:
- {
- struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host =
- *(union ns_host *)(sc->sc_arpcom.ac_enaddr);
- else
- bcopy(ina->x_host.c_host,
- sc->sc_arpcom.ac_enaddr,
- sizeof(sc->sc_arpcom.ac_enaddr));
- /* Set new address. */
- ieinit(sc);
- break;
- }
-#endif /* NS */
default:
ieinit(sc);
break;
diff --git a/sys/arch/sparc/dev/qe.c b/sys/arch/sparc/dev/qe.c
index 40993385e1d..24a4a6fc3f6 100644
--- a/sys/arch/sparc/dev/qe.c
+++ b/sys/arch/sparc/dev/qe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: qe.c,v 1.26 2005/01/15 05:24:10 brad Exp $ */
+/* $OpenBSD: qe.c,v 1.27 2005/06/08 17:03:02 henning Exp $ */
/*
* Copyright (c) 1998, 2000 Jason L. Wright.
@@ -602,24 +602,6 @@ qeioctl(ifp, cmd, data)
arp_ifinit(&sc->sc_arpcom, ifa);
break;
#endif /* INET */
-#ifdef NS
- /* XXX - This code is probably wrong. */
- case AF_NS:
- {
- struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
-
- if (ns_nullhost(*ina))
- ina->x_host = *(union ns_host *)
- (sc->sc_arpcom.ac_enaddr);
- else
- bcopy(ina->x_host.c_host,
- sc->sc_arpcom.ac_enaddr,
- sizeof(sc->sc_arpcom.ac_enaddr));
- /* Set new address. */
- qeinit(sc);
- break;
- }
-#endif /* NS */
default:
qeinit(sc);
break;
diff --git a/sys/arch/vax/if/if_de.c b/sys/arch/vax/if/if_de.c
index fba8c7ebf4f..d4b65f80983 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.16 2004/12/25 23:02:25 miod Exp $ */
+/* $OpenBSD: if_de.c,v 1.17 2005/06/08 17:03:02 henning Exp $ */
/* $NetBSD: if_de.c,v 1.27 1997/04/19 15:02:29 ragge Exp $ */
/*
@@ -67,11 +67,6 @@
#include <netinet/if_ether.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <machine/cpu.h>
#include <machine/mtpr.h>
@@ -590,19 +585,6 @@ deioctl(ifp, cmd, data)
arp_ifinit(&ds->ds_ac, ifa);
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 *)ds->ds_ac.ac_enaddr;
- else
- de_setaddr(ina->x_host.c_host, ds);
- break;
- }
-#endif
}
break;
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index 5baf596977e..7a7da5b2222 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.71 2004/12/02 19:40:46 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.72 2005/06/08 17:03:03 henning Exp $ */
/* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */
/*
@@ -88,9 +88,6 @@
#ifdef NETATALK
#include <netatalk/at_extern.h>
#endif
-#ifdef NS
-#include <netns/ns_var.h>
-#endif
#include "ppp.h" /* For NPPP */
#include "bridge.h" /* For NBRIDGE */
#if NPPP > 0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 03:06:00 +0000