summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2009-11-25 12:42:28 +0000
committerderaadt <deraadt@openbsd.org>2009-11-25 12:42:28 +0000
commit2bab4ed0ae3f8d73344672446e58570ca860adee (patch)
tree72621aab336f1a9746351584a9b6c185c8ffca62
parentOutput the right keys for application and number keypad modes (they were the (diff)
downloadwireguard-openbsd-2bab4ed0ae3f8d73344672446e58570ca860adee.tar.xz
wireguard-openbsd-2bab4ed0ae3f8d73344672446e58570ca860adee.zip
Do not call vr_stop() and vr_reset() before calling vr_init(), because
the latter does that itself. ok claudio
-rw-r--r--sys/dev/pci/if_vr.c7
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))