remove netns crud.

some drivers actually had hooks for SIOCSIFADDR, most just useless includes
"looks good" deraadt miod brad

27 files changed, 27 insertions, 438 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
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
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index 08bf4a94b5f..55a66801bad 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.70 2005/05/25 22:14:16 martin Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.71 2005/06/08 17:03:00 henning Exp $	*/
 /*	$NetBSD: if_de.c,v 1.45 1997/06/09 00:34:18 thorpej Exp $	*/
 
 /*-
@@ -73,11 +73,6 @@
 #include <netinet/ip.h>
 #endif
 
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #include <uvm/uvm_extern.h>
 #include <netinet/if_ether.h>
 
@@ -4507,27 +4502,6 @@ tulip_ifioctl(
 	}
 #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->tulip_enaddr);
-	    } else {
-		ifp->if_flags &= ~IFF_RUNNING;
-		bcopy((caddr_t)ina->x_host.c_host,
-		      (caddr_t)sc->tulip_enaddr,
-		      sizeof(sc->tulip_enaddr));
-	    }
-	    tulip_init(sc);
-	    break;
-	}
-#endif /* NS */
-
 	default: {
 	    tulip_init(sc);
 	    break;
diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c
index 75deb7c2649..41d7391843f 100644
--- a/sys/dev/pcmcia/if_ep_pcmcia.c
+++ b/sys/dev/pcmcia/if_ep_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_pcmcia.c,v 1.32 2005/01/27 17:04:55 millert Exp $	*/
+/*	$OpenBSD: if_ep_pcmcia.c,v 1.33 2005/06/08 17:03:01 henning Exp $	*/
 /*	$NetBSD: if_ep_pcmcia.c,v 1.16 1998/08/17 23:20:40 thorpej Exp $  */
 
 /*-
@@ -93,11 +93,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/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c
index 2b38760538e..d57b051518f 100644
--- a/sys/dev/pcmcia/if_sm_pcmcia.c
+++ b/sys/dev/pcmcia/if_sm_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sm_pcmcia.c,v 1.22 2005/01/27 17:04:56 millert Exp $	*/
+/*	$OpenBSD: if_sm_pcmcia.c,v 1.23 2005/06/08 17:03:01 henning Exp $	*/
 /*	$NetBSD: if_sm_pcmcia.c,v 1.11 1998/08/15 20:47:32 thorpej Exp $  */
 
 /*-
@@ -62,11 +62,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/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c
index 14b704daf9e..f66718b6e2f 100644
--- a/sys/dev/pcmcia/if_xe.c
+++ b/sys/dev/pcmcia/if_xe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xe.c,v 1.28 2005/01/27 17:04:56 millert Exp $	*/
+/*	$OpenBSD: if_xe.c,v 1.29 2005/06/08 17:03:01 henning Exp $	*/
 
 /*
  * Copyright (c) 1999 Niklas Hallqvist, Brandon Creighton, Job de Haas
@@ -74,11 +74,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
@@ -1182,9 +1177,6 @@ xe_ether_ioctl(ifp, cmd, data)
 {
 	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct xe_softc *sc = ifp->if_softc;
-#ifdef NS
-	struct ns_addr *ina;
-#endif	/* NS */
 
 	switch (cmd) {
 	case SIOCSIFADDR:
@@ -1198,21 +1190,6 @@ xe_ether_ioctl(ifp, cmd, data)
 			break;
 #endif	/* INET */
 
-#ifdef NS
-		case AF_NS:
-			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, ifp->if_addrlen);
-			/* Set new address. */
-			xe_init(sc);
-			break;
-#endif	/* NS */
-
 		default:
 			xe_init(sc);
 			break;
diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c
index f37d1d09550..09b700c5e92 100644
--- a/sys/dev/sbus/be.c
+++ b/sys/dev/sbus/be.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: be.c,v 1.16 2005/01/15 05:24:12 brad Exp $	*/
+/*	$OpenBSD: be.c,v 1.17 2005/06/08 17:03:01 henning Exp $	*/
 /*	$NetBSD: be.c,v 1.26 2001/03/20 15:39:20 pk Exp $	*/
 
 /*-
@@ -90,11 +90,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
@@ -961,22 +956,6 @@ beioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			arp_ifinit(&sc->sc_arpcom, ifa);
 			break;
 #endif /* INET */
-#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_arpcom.ac_enaddr));
-			/* Set new address. */
-			beinit(sc);
-			break;
-		    }
-#endif /* NS */
 		default:
 			beinit(sc);
 			break;
diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c
index 8e086f1de79..0af3e693729 100644
--- a/sys/dev/sbus/qe.c
+++ b/sys/dev/sbus/qe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qe.c,v 1.16 2005/01/15 05:24:12 brad Exp $	*/
+/*	$OpenBSD: qe.c,v 1.17 2005/06/08 17:03:01 henning Exp $	*/
 /*	$NetBSD: qe.c,v 1.16 2001/03/30 17:30:18 christos Exp $	*/
 
 /*-
@@ -100,11 +100,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
@@ -939,22 +934,6 @@ qeioctl(ifp, cmd, data)
 			arp_ifinit(&sc->sc_arpcom, ifa);
 			break;
 #endif /* INET */
-#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_arpcom.ac_enaddr));
-			/* Set new address. */
-			qeinit(sc);
-			break;
-		    }
-#endif /* NS */
 		default:
 			qeinit(sc);
 			break;
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 0bf62fa3875..17db7d88f39 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_aue.c,v 1.38 2005/01/03 22:45:52 brad Exp $ */
+/*	$OpenBSD: if_aue.c,v 1.39 2005/06/08 17:03:01 henning Exp $ */
 /*	$NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -133,11 +133,6 @@
 #endif
 #endif /* defined(__OpenBSD__) */
 
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
@@ -1574,21 +1569,6 @@ aue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 #endif
 			break;
 #endif /* INET */
-#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,
-				       ifp->if_addrlen);
-			break;
-		    }
-#endif /* NS */
 		}
 		break;
 
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index a9a266964d6..a187c737078 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axe.c,v 1.24 2005/03/14 04:08:49 deraadt Exp $	*/
+/*	$OpenBSD: if_axe.c,v 1.25 2005/06/08 17:03:01 henning Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003
@@ -128,11 +128,6 @@
 #endif
 #endif /* defined(__OpenBSD__) */
 
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
@@ -1200,21 +1195,6 @@ axe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			arp_ifinit(&sc->arpcom, ifa);
 			break;
 #endif /* INET */
-#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,
-				       ifp->if_addrlen);
-			break;
-		    }
-#endif /* NS */
 		}
 		break;
 
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index ef462c1e881..16af1784a7d 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cue.c,v 1.24 2005/01/03 22:45:52 brad Exp $ */
+/*	$OpenBSD: if_cue.c,v 1.25 2005/06/08 17:03:02 henning Exp $ */
 /*	$NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -111,11 +111,6 @@
 #endif
 #endif /* defined(__OpenBSD__) */
 
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
@@ -1167,21 +1162,6 @@ cue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 #endif
 			break;
 #endif /* INET */
-#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,
-				       ifp->if_addrlen);
-			break;
-		    }
-#endif /* NS */
 		}
 		break;
 
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index e10cf056e39..c43cdc1c533 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_kue.c,v 1.35 2005/01/15 03:53:36 jsg Exp $ */
+/*	$OpenBSD: if_kue.c,v 1.36 2005/06/08 17:03:02 henning Exp $ */
 /*	$NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -121,11 +121,6 @@
 #endif
 #endif /* defined (__OpenBSD__) */
 
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
@@ -1125,21 +1120,6 @@ kue_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 #endif
 			break;
 #endif /* INET */
-#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,
-				       ifp->if_addrlen);
-			break;
-		    }
-#endif /* NS */
 		}
 		break;
 
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 4ef3b5654c7..9f89b62f3b5 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_udav.c,v 1.9 2005/01/03 22:45:52 brad Exp $ */
+/*	$OpenBSD: if_udav.c,v 1.10 2005/06/08 17:03:02 henning Exp $ */
 /*	$NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
 /*
@@ -79,11 +79,6 @@
 #include <netinet/if_ether.h>
 #endif
 
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
@@ -1236,20 +1231,6 @@ udav_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			arp_ifinit(&sc->sc_ac, ifa);
 			break;
 #endif /* INET */
-#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, ifp->if_addrlen);
-			break;
-		}
-#endif /* NS */
 		}
 		break;
 
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index c9e3849621a..95baee4b0a4 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upl.c,v 1.17 2004/11/10 10:14:48 grange Exp $ */
+/*	$OpenBSD: if_upl.c,v 1.18 2005/06/08 17:03:02 henning Exp $ */
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -92,11 +92,6 @@
 #error upl without INET?
 #endif
 
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
@@ -898,21 +893,6 @@ upl_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		case AF_INET:
 			break;
 #endif /* INET */
-#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,
-				       ifp->if_addrlen);
-			break;
-		    }
-#endif /* NS */
 		}
 		break;
 
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index cb0e0d4f08c..2318151e4c4 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_url.c,v 1.21 2005/03/03 07:16:53 itojun Exp $ */
+/*	$OpenBSD: if_url.c,v 1.22 2005/06/08 17:03:02 henning Exp $ */
 /*	$NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002
@@ -94,11 +94,6 @@
 #endif
 #endif /* defined(__OpenBSD__) */
 
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/mii/urlphyreg.h>
@@ -1150,21 +1145,6 @@ url_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			arp_ifinit(&sc->sc_ac, ifa);
 			break;
 #endif /* INET */
-#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,
-				       ifp->if_addrlen);
-			break;
-		    }
-#endif /* NS */
 		}
 		break;