diff options
| -rw-r--r-- | sys/dev/ic/rtl80x9.c | 17 | ||||
| -rw-r--r-- | sys/dev/ic/rtl80x9var.h | 8 |
2 files changed, 4 insertions, 21 deletions
diff --git a/sys/dev/ic/rtl80x9.c b/sys/dev/ic/rtl80x9.c index e80b147430d..72236389abc 100644 --- a/sys/dev/ic/rtl80x9.c +++ b/sys/dev/ic/rtl80x9.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtl80x9.c,v 1.4 2000/06/11 09:26:18 fgsch Exp $ */ +/* $OpenBSD: rtl80x9.c,v 1.5 2000/06/20 09:27:25 fgsch Exp $ */ /* $NetBSD: rtl80x9.c,v 1.1 1998/10/31 00:44:33 thorpej Exp $ */ /*- @@ -48,19 +48,12 @@ #include <sys/device.h> #include <net/if.h> -#ifdef __NetBSD__ -#include <net/if_ether.h> -#endif #include <net/if_media.h> #ifdef INET #include <netinet/in.h> -#ifdef __NetBSD__ -#include <netinet/if_inarp.h> -#else #include <netinet/if_ether.h> #endif -#endif #include <machine/bus.h> #include <machine/intr.h> @@ -93,11 +86,7 @@ rtl80x9_mediastatus(sc, ifmr) struct dp8390_softc *sc; struct ifmediareq *ifmr; { -#ifdef __NetBSD__ - struct ifnet *ifp = &sc->sc_ec.ec_if; -#else struct ifnet *ifp = &sc->sc_arpcom.ac_if; -#endif u_int8_t cr_proto = sc->cr_proto | ((ifp->if_flags & IFF_RUNNING) ? ED_CR_STA : ED_CR_STP); @@ -128,11 +117,7 @@ rtl80x9_init_card(sc) struct dp8390_softc *sc; { struct ifmedia *ifm = &sc->sc_media; -#ifdef __NetBSD__ - struct ifnet *ifp = &sc->sc_ec.ec_if; -#else struct ifnet *ifp = &sc->sc_arpcom.ac_if; -#endif u_int8_t cr_proto = sc->cr_proto | ((ifp->if_flags & IFF_RUNNING) ? ED_CR_STA : ED_CR_STP); u_int8_t reg; diff --git a/sys/dev/ic/rtl80x9var.h b/sys/dev/ic/rtl80x9var.h index b158dc4855b..94fc7242bb6 100644 --- a/sys/dev/ic/rtl80x9var.h +++ b/sys/dev/ic/rtl80x9var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtl80x9var.h,v 1.1 1998/11/06 06:34:36 fgsch Exp $ */ +/* $OpenBSD: rtl80x9var.h,v 1.2 2000/06/20 09:27:25 fgsch Exp $ */ /* $NetBSD: rtl80x9var.h,v 1.1 1998/10/31 00:44:33 thorpej Exp $ */ /*- @@ -51,11 +51,9 @@ #ifdef _KERNEL int rtl80x9_mediachange __P((struct dp8390_softc *)); -void rtl80x9_mediastatus __P((struct dp8390_softc *, - struct ifmediareq *)); +void rtl80x9_mediastatus __P((struct dp8390_softc *, struct ifmediareq *)); void rtl80x9_init_card __P((struct dp8390_softc *)); -void rtl80x9_init_media __P((struct dp8390_softc *, int **, - int *, int *)); +void rtl80x9_init_media __P((struct dp8390_softc *, int **, int *, int *)); #endif /* _KERNEL */ #endif /* _DEV_IC_RTL80x9_VAR_H_ */ |