diff options
Diffstat (limited to 'sys/arch/mac68k/dev')
| -rw-r--r-- | sys/arch/mac68k/dev/if_ae.c | 28 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/if_sn.c | 32 |
2 files changed, 10 insertions, 50 deletions
diff --git a/sys/arch/mac68k/dev/if_ae.c b/sys/arch/mac68k/dev/if_ae.c index 53bb0fb1499..0897e54dfec 100644 --- a/sys/arch/mac68k/dev/if_ae.c +++ b/sys/arch/mac68k/dev/if_ae.c @@ -46,11 +46,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> @@ -1033,6 +1028,11 @@ aeioctl(ifp, cmd, data) s = splnet(); + if ((error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data)) > 0) { + splx(s); + return error; + } + switch (cmd) { case SIOCSIFADDR: @@ -1045,24 +1045,6 @@ aeioctl(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. */ - aeinit(sc); - break; - } -#endif default: aeinit(sc); break; diff --git a/sys/arch/mac68k/dev/if_sn.c b/sys/arch/mac68k/dev/if_sn.c index d2dd319be29..3a6051a1176 100644 --- a/sys/arch/mac68k/dev/if_sn.c +++ b/sys/arch/mac68k/dev/if_sn.c @@ -33,16 +33,6 @@ #include <netinet/if_ether.h> #endif -#ifdef NS -#include <netns/ns.h> -#include <netns/ns_if.h> -#endif - -#ifdef RMP -#include <netrmp/rmp.h> -#include <netrmp/rmp_var.h> -#endif - #include <vm/vm.h> #include "bpfilter.h" @@ -388,6 +378,11 @@ snioctl(ifp, cmd, data) int s = splnet(), err = 0; int temp; + if ((error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data)) > 0) { + splx(s); + return error; + } + switch (cmd) { case SIOCSIFADDR: @@ -400,23 +395,6 @@ snioctl(ifp, cmd, data) arp_ifinit(&sc->sc_ac, 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 *)(sc->sc_enaddr); - } else { - /* XXX - * add an extra i/f address to - * sonic filter - */ - } - } - (void)sninit(ifp->if_unit); - break; -#endif /* NS */ default: (void)sninit(ifp->if_unit); break; |