diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-12-13 21:47:10 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-12-13 21:47:10 +0000 |
| commit | d8df31ac6915b01b3aa796c5dc23ba4063d42d29 (patch) | |
| tree | 6a3257216f9af9be5f8b404f0d6e5fe6fcc8ac84 /sys/arch/sparc | |
| parent | 0c9a6d88e767f46f5aadfc2505fbc0f083b127cb (diff) | |
be more careful with media handlings
Diffstat (limited to 'sys/arch/sparc')
| -rw-r--r-- | sys/arch/sparc/dev/if_le.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/arch/sparc/dev/if_le.c b/sys/arch/sparc/dev/if_le.c index effa4c541a3..e18f41f8da2 100644 --- a/sys/arch/sparc/dev/if_le.c +++ b/sys/arch/sparc/dev/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.13 1998/11/11 00:50:31 jason Exp $ */ +/* $OpenBSD: if_le.c,v 1.14 1998/12/13 21:47:09 deraadt Exp $ */ /* $NetBSD: if_le.c,v 1.50 1997/09/09 20:54:48 pk Exp $ */ /*- @@ -105,7 +105,7 @@ myleintr(arg) void *arg; { register struct le_softc *lesc = arg; -static int dodrain=0; + static int dodrain=0; if (lesc->sc_dma->sc_regs->csr & D_ERR_PEND) { dodrain = 1; @@ -213,6 +213,7 @@ lemediachange(ifp) { struct am7990_softc *sc = ifp->if_softc; struct ifmedia *ifm = &sc->sc_ifmedia; + struct le_softc *lesc = (struct le_softc *)sc; if (IFM_TYPE(ifm->ifm_media) != IFM_ETHER) return (EINVAL); @@ -226,14 +227,14 @@ lemediachange(ifp) switch (IFM_SUBTYPE(ifm->ifm_media)) { #if defined(SUN4M) case IFM_10_T: - if (CPU_ISSUN4M) + if (CPU_ISSUN4M && lesc->sc_dma) lesetutp(sc); else return (EOPNOTSUPP); break; case IFM_AUTO: - if (CPU_ISSUN4M) + if (CPU_ISSUN4M && lesc->sc_dma) return (0); else return (EOPNOTSUPP); @@ -242,7 +243,7 @@ lemediachange(ifp) case IFM_10_5: #if defined(SUN4M) - if (CPU_ISSUN4M) + if (CPU_ISSUN4M && lesc->sc_dma) lesetaui(sc); #else return (0); |