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/dev/pci | |
| 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/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_de.c | 33 | ||||
| -rw-r--r-- | sys/dev/pci/if_ep_pci.c | 5 |
2 files changed, 6 insertions, 32 deletions
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index 0eaa370660a..bf310e46f8f 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.6 1996/04/21 22:25:13 deraadt Exp $ */ +/* $OpenBSD: if_de.c,v 1.7 1996/05/05 13:38:58 mickey Exp $ */ /* $NetBSD: if_de.c,v 1.17 1996/04/01 19:37:54 cgd Exp $ */ /*- @@ -76,11 +76,6 @@ #include <netinet/if_ether.h> #endif -#ifdef NS -#include <netns/ns.h> -#include <netns/ns_if.h> -#endif - #include <vm/vm.h> #include <vm/vm_kern.h> #include <vm/vm_param.h> @@ -1942,6 +1937,11 @@ tulip_ioctl( s = splnet(); + if ((error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data)) > 0) { + splx(s); + return error; + } + switch (cmd) { case SIOCSIFADDR: { ifp->if_flags |= IFF_UP; @@ -1955,27 +1955,6 @@ tulip_ioctl( } #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_ac.ac_enaddr); - } else { - ifp->if_flags &= ~IFF_RUNNING; - bcopy((caddr_t)ina->x_host.c_host, - (caddr_t)sc->tulip_ac.ac_enaddr, - sizeof sc->tulip_ac.ac_enaddr); - } - tulip_init(sc); - break; - } -#endif /* NS */ - default: { tulip_init(sc); break; diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c index 9c81c92408d..94f0270528f 100644 --- a/sys/dev/pci/if_ep_pci.c +++ b/sys/dev/pci/if_ep_pci.c @@ -53,11 +53,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> |