diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2014-12-03 09:10:18 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2014-12-03 09:10:18 +0000 |
| commit | c560b9ab87d2dde65c28c7ee2feba471b3842e3b (patch) | |
| tree | db9c5acfb79256be0021be05c890d4a3c915eab3 | |
| parent | c825b68e2211edf4a75387f0e8d75512611b84d7 (diff) | |
wb_init() calls wb_stop() and wb_reset() so remove some redundant calls
to those functions before wb_init() within wb_watchdog() / wb_intr() and
wb_rxeof().
| -rw-r--r-- | sys/dev/pci/if_wb.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c index 40c23fb7469..5c45bca1c21 100644 --- a/sys/dev/pci/if_wb.c +++ b/sys/dev/pci/if_wb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wb.c,v 1.56 2014/07/22 13:12:11 mpi Exp $ */ +/* $OpenBSD: if_wb.c,v 1.57 2014/12/03 09:10:17 brad Exp $ */ /* * Copyright (c) 1997, 1998 @@ -948,7 +948,6 @@ void wb_rxeof(sc) printf("%s: receiver babbling: possible chip " "bug, forcing reset\n", sc->sc_dev.dv_xname); wb_fixmedia(sc); - wb_reset(sc); wb_init(sc); return; } @@ -1160,11 +1159,8 @@ int wb_intr(arg) WB_SETBIT(sc, WB_NETCFG, WB_NETCFG_TX_ON); } - if (status & WB_ISR_BUS_ERR) { - wb_reset(sc); + if (status & WB_ISR_BUS_ERR) wb_init(sc); - } - } /* Re-enable interrupts. */ @@ -1597,8 +1593,6 @@ void wb_watchdog(ifp) printf("%s: no carrier - transceiver cable problem?\n", sc->sc_dev.dv_xname); #endif - wb_stop(sc); - wb_reset(sc); wb_init(sc); if (!IFQ_IS_EMPTY(&ifp->if_snd)) |