diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-11-25 12:42:29 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-11-25 12:42:29 +0000 |
| commit | cd7412a1a41573204c7f2a84e4467e34e489145c (patch) | |
| tree | c8e9bcad214881a4526337ccf1a2bcf63c5c6f4b /sys/dev | |
| parent | 674e626b074b00e33480e10b0663f7a62a5bcfaa (diff) | |
Do not call vr_stop() and vr_reset() before calling vr_init(), because
the latter does that itself.
ok claudio
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_vr.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index 234ee7b1220..c53c735b8fb 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.100 2009/08/13 14:24:47 jasper Exp $ */ +/* $OpenBSD: if_vr.c,v 1.101 2009/11/25 12:42:28 deraadt Exp $ */ /* * Copyright (c) 1997, 1998 @@ -1019,8 +1019,6 @@ vr_tick(void *xsc) s = splnet(); if (sc->vr_flags & VR_F_RESTART) { printf("%s: restarting\n", sc->sc_dev.dv_xname); - vr_stop(sc); - vr_reset(sc); vr_init(sc); sc->vr_flags &= ~VR_F_RESTART; } @@ -1467,9 +1465,6 @@ vr_watchdog(struct ifnet *ifp) ifp->if_oerrors++; printf("%s: watchdog timeout\n", sc->sc_dev.dv_xname); - - vr_stop(sc); - vr_reset(sc); vr_init(sc); if (!IFQ_IS_EMPTY(&ifp->if_snd)) |