add general ether_ioctl call in net/if_ethersubr.c,

NS,IPX,X.25 special processing is now handled in there.
reflect this amazing addition in all the ether ifaces.
ppl, pls check the stuff.

1 files changed, 6 insertions, 24 deletions

diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c
index 8f2499c9d18..db1654fb8fb 100644
--- a/sys/dev/isa/if_ed.c
+++ b/sys/dev/isa/if_ed.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ed.c,v 1.12 1996/04/29 14:16:31 hvozda Exp $	*/
+/*	$OpenBSD: if_ed.c,v 1.13 1996/05/05 13:38:19 mickey Exp $	*/
 /*	$NetBSD: if_ed.c,v 1.93 1996/04/11 22:28:55 cgd Exp $	*/
 
 /*
@@ -43,11 +43,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>
 #include <net/bpfdesc.h>
@@ -2211,6 +2206,11 @@ edioctl(ifp, cmd, data)
 		return ENXIO;		/* may be ignored, oh well. */
 	}
 
+	if ((error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data)) > 0) {
+		splx(s);
+		return error;
+	}
+
 	switch (cmd) {
 
 	case SIOCSIFADDR:
@@ -2223,24 +2223,6 @@ edioctl(ifp, cmd, data)
 			arp_ifinit(&sc->sc_arpcom, ifa);
 			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. */
-			edinit(sc);
-			break;
-		    }
-#endif
 		default:
 			edinit(sc);
 			break;