diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2014-11-18 22:53:57 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2014-11-18 22:53:57 +0000 |
| commit | ce8e5b8193175730882a417c60a970c82e1894f7 (patch) | |
| tree | f8fd57d18974df7add306c249d5686d4809079dc | |
| parent | 0c79230a0584a54b5a7b30d1ae3f95997080fb1b (diff) | |
dc_init() calls dc_stop() and dc_reset() so remove some redundant calls
to those functions before dc_init() within dc_watchdog() and dc_intr().
ok deraadt@
| -rw-r--r-- | sys/dev/ic/dc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c index dfcb5cca5f3..01438d46450 100644 --- a/sys/dev/ic/dc.c +++ b/sys/dev/ic/dc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dc.c,v 1.134 2014/07/22 13:12:11 mpi Exp $ */ +/* $OpenBSD: dc.c,v 1.135 2014/11/18 22:53:56 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -2481,10 +2481,8 @@ dc_intr(void *arg) } } - if (status & DC_ISR_BUS_ERR) { - dc_reset(sc); + if (status & DC_ISR_BUS_ERR) dc_init(sc); - } } /* Re-enable interrupts. */ @@ -2986,8 +2984,6 @@ dc_watchdog(struct ifnet *ifp) ifp->if_oerrors++; printf("%s: watchdog timeout\n", sc->sc_dev.dv_xname); - dc_stop(sc, 0); - dc_reset(sc); dc_init(sc); if (IFQ_IS_EMPTY(&ifp->if_snd) == 0) |