diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-05-05 13:39:51 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-05-05 13:39:51 +0000 |
| commit | 69eb3008fd7c3ef1de34f9de181036c0e4610954 (patch) | |
| tree | f1d1e3152a6b2bf3967a9f5726672e4fb083f6c3 /sys/arch/vax | |
| parent | b98401c6946ce4b2b6909f688f4739738d87ffe0 (diff) | |
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.
Diffstat (limited to 'sys/arch/vax')
| -rw-r--r-- | sys/arch/vax/if/if_de.c | 22 | ||||
| -rw-r--r-- | sys/arch/vax/if/if_qe.c | 22 |
2 files changed, 10 insertions, 34 deletions
diff --git a/sys/arch/vax/if/if_de.c b/sys/arch/vax/if/if_de.c index 997d43d9468..9e40f50cddf 100644 --- a/sys/arch/vax/if/if_de.c +++ b/sys/arch/vax/if/if_de.c @@ -71,11 +71,6 @@ #include <netinet/if_ether.h> #endif -#ifdef NS -#include <netns/ns.h> -#include <netns/ns_if.h> -#endif - #ifdef ISO #include <netiso/iso.h> #include <netiso/iso_var.h> @@ -580,6 +575,11 @@ deioctl(ifp, cmd, data) register struct de_softc *ds = de_cd.cd_devs[ifp->if_unit]; int s = splnet(), error = 0; + if ((error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data)) > 0) { + splx(s); + return error; + } + switch (cmd) { case SIOCSIFADDR: @@ -592,18 +592,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_addr); - else - de_setaddr(ina->x_host.c_host,ifp->if_unit); - break; - } -#endif } break; diff --git a/sys/arch/vax/if/if_qe.c b/sys/arch/vax/if/if_qe.c index 6e1eaecd033..ab0e59eabe1 100644 --- a/sys/arch/vax/if/if_qe.c +++ b/sys/arch/vax/if/if_qe.c @@ -162,11 +162,6 @@ #include <netinet/if_ether.h> #endif -#ifdef NS -#include <netns/ns.h> -#include <netns/ns_if.h> -#endif - #ifdef ISO #include <netiso/iso.h> #include <netiso/iso_var.h> @@ -771,6 +766,11 @@ qeioctl(ifp, cmd, data) struct ifaddr *ifa = (struct ifaddr *)data; int s = splnet(), error = 0; + if ((error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data)) > 0) { + splx(s); + return error; + } + switch (cmd) { case SIOCSIFADDR: @@ -782,18 +782,6 @@ qeioctl(ifp, cmd, data) arp_ifinit(&sc->qe_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 *)(sc->qe_addr); - else - qe_setaddr(ina->x_host.c_host, ifp->if_unit); - break; - } -#endif } break; |