diff options
| author | Martin Reindl <martin@cvs.openbsd.org> | 2006-04-28 10:17:35 +0000 |
|---|---|---|
| committer | Martin Reindl <martin@cvs.openbsd.org> | 2006-04-28 10:17:35 +0000 |
| commit | fb917147167e22ffde75a7c4a63155c5d82f807f (patch) | |
| tree | 721b5d72c174f05de537de8bda21853c316c2858 /sys/dev/pci | |
| parent | 59d199e7a880dd4e426482b97f9238e77451e4ed (diff) | |
backout previous, Brad probably forgot to commit some bits here
found by dhartmei@
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_sis.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c index 256b8feed8d..3bed1502629 100644 --- a/sys/dev/pci/if_sis.c +++ b/sys/dev/pci/if_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sis.c,v 1.67 2006/04/28 06:14:46 brad Exp $ */ +/* $OpenBSD: if_sis.c,v 1.68 2006/04/28 10:17:34 martin Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -1646,10 +1646,6 @@ sis_init(void *xsc) sis_stop(sc); sc->sis_stopped = 0; - /* Configure interrupt holdoff register. */ - if (sc->sis_type == SIS_TYPE_83815 && sc->sis_srr == NS_SRR_16A) - CSR_WRITE_4(sc, NS_IHR, NS_IHR_VALUE); - mii = &sc->sc_mii; /* Set MAC address */ @@ -1889,7 +1885,7 @@ sis_ioctl(struct ifnet *ifp, u_long command, caddr_t data) switch(command) { case SIOCSIFADDR: ifp->if_flags |= IFF_UP; - if (!(ifp->if_flags & IFF_RUNNING)) + if ((ifp->if_flags & IFF_RUNNING) == 0) sis_init(sc); #ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) @@ -1914,14 +1910,13 @@ sis_ioctl(struct ifnet *ifp, u_long command, caddr_t data) (ifp->if_flags ^ sc->sc_if_flags) & IFF_ALLMULTI) { sis_setmulti(sc); } else { - if (!(ifp->if_flags & IFF_RUNNING)) + if ((ifp->if_flags & IFF_RUNNING) == 0) sis_init(sc); } } else { if (ifp->if_flags & IFF_RUNNING) sis_stop(sc); } - sc->sc_if_flags = ifp->if_flags; break; case SIOCSIFMTU: if (ifr->ifr_mtu < ETHERMIN || ifr->ifr_mtu > ETHERMTU) |