summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/dp8390.c24
-rw-r--r--sys/dev/ic/fxp.c23
-rw-r--r--sys/dev/ic/gem.c19
-rw-r--r--sys/dev/ic/lemac.c25
-rw-r--r--sys/dev/ic/pdq_ifsubr.c7
-rw-r--r--sys/dev/ic/smc91cxx.c29
-rw-r--r--sys/dev/ic/tropic.c7
7 files changed, 7 insertions, 127 deletions
diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index 46b43b40393..4c13874cc71 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dp8390.c,v 1.27 2005/01/15 05:24:11 brad Exp $ */
+/* $OpenBSD: dp8390.c,v 1.28 2005/06/08 17:02:59 henning Exp $ */
/* $NetBSD: dp8390.c,v 1.13 1998/07/05 06:49:11 jonathan Exp $ */
/*
@@ -38,11 +38,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
@@ -825,23 +820,6 @@ dp8390_ioctl(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 *)LLADDR(ifp->if_sadl);
- else
- bcopy(ina->x_host.c_host, LLADDR(ifp->if_sadl),
- ETHER_ADDR_LEN);
- /* Set new address. */
- dp8390_init(sc);
- break;
- }
-#endif
default:
dp8390_init(sc);
break;
diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c
index f7fd55c2dc0..455f58dd119 100644
--- a/sys/dev/ic/fxp.c
+++ b/sys/dev/ic/fxp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fxp.c,v 1.71 2005/05/27 06:37:21 brad Exp $ */
+/* $OpenBSD: fxp.c,v 1.72 2005/06/08 17:02:59 henning Exp $ */
/* $NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $ */
/*
@@ -66,11 +66,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
@@ -1692,22 +1687,6 @@ fxp_ioctl(ifp, command, data)
arp_ifinit(&sc->sc_arpcom, 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),
- ifp->if_addrlen);
- /* Set new address. */
- fxp_init(sc);
- break;
- }
-#endif
default:
fxp_init(sc);
break;
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index 28dc070f19a..5cfc9ff1806 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gem.c,v 1.40 2005/01/15 05:24:11 brad Exp $ */
+/* $OpenBSD: gem.c,v 1.41 2005/06/08 17:02:59 henning Exp $ */
/* $NetBSD: gem.c,v 1.1 2001/09/16 00:11:43 eeh Exp $ */
/*
@@ -1369,23 +1369,6 @@ gem_ioctl(ifp, cmd, data)
arp_ifinit(&sc->sc_arpcom, ifa);
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 {
- memcpy(LLADDR(ifp->if_sadl),
- ina->x_host.c_host, sizeof(sc->sc_enaddr));
- }
- /* Set new address. */
- gem_init(ifp);
- break;
- }
-#endif
default:
gem_init(ifp);
break;
diff --git a/sys/dev/ic/lemac.c b/sys/dev/ic/lemac.c
index 893302ef04f..cd483b32c74 100644
--- a/sys/dev/ic/lemac.c
+++ b/sys/dev/ic/lemac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lemac.c,v 1.6 2005/01/15 05:24:11 brad Exp $ */
+/* $OpenBSD: lemac.c,v 1.7 2005/06/08 17:03:00 henning Exp $ */
/* $NetBSD: lemac.c,v 1.20 2001/06/13 10:46:02 wiz Exp $ */
/*-
@@ -58,11 +58,6 @@
#include <netinet/if_ether.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <machine/bus.h>
#include <dev/ic/lemacreg.h>
@@ -808,24 +803,6 @@ lemac_ifioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
break;
#endif /* INET */
-#ifdef NS
- /* This magic copied from if_is.c; I don't use XNS,
- * so I have no way of telling if this actually
- * works or not.
- */
- 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((caddr_t)ina->x_host.c_host,
- sc->sc_arpcom.ac_enaddr, ifp->if_addrlen);
- }
- break;
- }
-#endif /* NS */
-
default:
break;
}
diff --git a/sys/dev/ic/pdq_ifsubr.c b/sys/dev/ic/pdq_ifsubr.c
index 86b7a725a20..9f8e0b19d14 100644
--- a/sys/dev/ic/pdq_ifsubr.c
+++ b/sys/dev/ic/pdq_ifsubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pdq_ifsubr.c,v 1.15 2004/09/23 17:45:16 brad Exp $ */
+/* $OpenBSD: pdq_ifsubr.c,v 1.16 2005/06/08 17:03:00 henning Exp $ */
/* $NetBSD: pdq_ifsubr.c,v 1.5 1996/05/20 00:26:21 thorpej Exp $ */
/*-
@@ -77,11 +77,6 @@
#include <i386/isa/isavar.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#include <uvm/uvm_extern.h>
#include "pdqvar.h"
diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c
index cb0b870a4d6..ac991e35036 100644
--- a/sys/dev/ic/smc91cxx.c
+++ b/sys/dev/ic/smc91cxx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smc91cxx.c,v 1.20 2005/06/07 02:29:30 henning Exp $ */
+/* $OpenBSD: smc91cxx.c,v 1.21 2005/06/08 17:03:00 henning Exp $ */
/* $NetBSD: smc91cxx.c,v 1.11 1998/08/08 23:51:41 mycroft Exp $ */
/*-
@@ -108,11 +108,6 @@
#include <netinet/ip.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#if NBPFILTER > 0
#include <net/bpf.h>
#endif
@@ -968,28 +963,6 @@ smc91cxx_ioctl(ifp, cmd, data)
arp_ifinit(&sc->sc_arpcom, ifa);
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),
- ETHER_ADDR_LEN);
- }
-
- /*
- * Set new address. Reset, because the receiver
- * has to be stopped before we can set the new
- * MAC address.
- */
- smc91cxx_reset(sc);
- break;
- }
-#endif
default:
smc91cxx_init(sc);
break;
diff --git a/sys/dev/ic/tropic.c b/sys/dev/ic/tropic.c
index bf927442f5d..a31ad610d79 100644
--- a/sys/dev/ic/tropic.c
+++ b/sys/dev/ic/tropic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tropic.c,v 1.8 2004/05/12 06:35:10 tedu Exp $ */
+/* $OpenBSD: tropic.c,v 1.9 2005/06/08 17:03:00 henning Exp $ */
/* $NetBSD: tropic.c,v 1.6 1999/12/17 08:26:31 fvdl Exp $ */
/*
@@ -64,11 +64,6 @@
#include <net/if_token.h>
#endif
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
#if NBPFILTER > 0
#include <net/bpf.h>
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 07:58:57 +0000