4 files changed, 20 insertions, 58 deletions

diff --git a/sys/arch/arm32/podulebus/if_ea.c b/sys/arch/arm32/podulebus/if_ea.c
index 1104d512f7f..de1d1d3576e 100644
--- a/sys/arch/arm32/podulebus/if_ea.c
+++ b/sys/arch/arm32/podulebus/if_ea.c
@@ -73,11 +73,6 @@
 #include <netinet/if_ether.h>
 #endif
 
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #include "bpfilter.h"
 #if NBPFILTER > 0
 #include <net/bpf.h>
@@ -1445,6 +1440,11 @@ ea_ioctl(ifp, cmd, data)
 
 	s = splimp();
 
+	if ((error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data)) > 0) {
+		splx(s);
+		return error;
+	}
+
 	switch (cmd) {
 
 	case SIOCSIFADDR:
@@ -1459,25 +1459,6 @@ ea_ioctl(ifp, cmd, data)
 			ea_init(sc);
 			break;
 #endif
-#ifdef NS
-		/* XXX - This code is probably wrong. */
-		case AF_NS:
-		    {
-			register 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. */
-			dprintf(("Interface ea is coming up (AF_NS)\n"));
-			ea_init(sc);
-			break;
-		    }
-#endif
 		default:
 			dprintf(("Interface ea is coming up (default)\n"));
 			ea_init(sc);
diff --git a/sys/arch/arm32/podulebus/if_eb.c b/sys/arch/arm32/podulebus/if_eb.c
index a433d38bbf7..5075b955fd9 100644
--- a/sys/arch/arm32/podulebus/if_eb.c
+++ b/sys/arch/arm32/podulebus/if_eb.c
@@ -73,11 +73,6 @@
 #include <netinet/if_ether.h>
 #endif
 
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #include "bpfilter.h"
 #if NBPFILTER > 0
 #include <net/bpf.h>
@@ -1464,6 +1459,11 @@ eb_ioctl(ifp, cmd, data)
 
 	s = splimp();
 
+	if ((error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data)) > 0) {
+		splx(s);
+		return error;
+	}
+
 	switch (cmd) {
 
 	case SIOCSIFADDR:
@@ -1478,25 +1478,6 @@ eb_ioctl(ifp, cmd, data)
 			eb_init(sc);
 			break;
 #endif
-#ifdef NS
-		/* XXX - This code is probably wrong. */
-		case AF_NS:
-		    {
-			register 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. */
-			dprintf(("Interface eb is coming up (AF_NS)\n"));
-			eb_init(sc);
-			break;
-		    }
-#endif
 		default:
 			dprintf(("Interface eb is coming up (default)\n"));
 			eb_init(sc);
diff --git a/sys/arch/arm32/podulebus/if_eh.c b/sys/arch/arm32/podulebus/if_eh.c
index ab476637091..a9b830634b4 100644
--- a/sys/arch/arm32/podulebus/if_eh.c
+++ b/sys/arch/arm32/podulebus/if_eh.c
@@ -89,11 +89,6 @@
 #include <netinet/if_ether.h>
 #endif
 
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 /****************************************************************************/
 /* Some useful definitions **************************************************/
 /****************************************************************************/
@@ -555,6 +550,11 @@ ehioctl(ifp, cmd, data)
 	int s = splimp ();
 	int error = 0;
 
+	if ((error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data)) > 0) {
+		splx(s);
+		return error;
+	}
+
 	switch (cmd) {
 	case SIOCSIFADDR:
 		ifp->if_flags |= IFF_UP;
diff --git a/sys/arch/arm32/podulebus/if_ie.c b/sys/arch/arm32/podulebus/if_ie.c
index ecc8269445d..8ea7517c1de 100644
--- a/sys/arch/arm32/podulebus/if_ie.c
+++ b/sys/arch/arm32/podulebus/if_ie.c
@@ -88,11 +88,6 @@
 #include <netinet/if_ether.h>
 #endif
 
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 /* Import our data structres */
 
 #include "if_iereg.h"
@@ -579,6 +574,11 @@ int ieioctl ( struct ifnet *ifp, u_long cmd, caddr_t data )
 
     s=splimp();
 
+    if ((error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data)) > 0) {
+	splx(s);
+	return error;
+    }
+
     switch ( cmd )
     {
 	case SIOCSIFADDR: