summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstsp <stsp@openbsd.org>2016-03-09 20:35:08 +0000
committerstsp <stsp@openbsd.org>2016-03-09 20:35:08 +0000
commita4d0895a43ece5c9051f5b238e458a4a653ebb1f (patch)
tree9378a11e535e42e868185c5c285c4be058f284d9
parentHook up dev/ic/rtwn.c -- should have been part of rtwn(4) split commit. (diff)
downloadwireguard-openbsd-a4d0895a43ece5c9051f5b238e458a4a653ebb1f.tar.xz
wireguard-openbsd-a4d0895a43ece5c9051f5b238e458a4a653ebb1f.zip
Make rtwn(4) stop the chip during DVACT_QUIESCE rather than DVACT_SUSPEND
because the code that shuts down the firmware tsleep's to avoid system hangs. ok mpi@
-rw-r--r--sys/dev/ic/rtwn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ic/rtwn.c b/sys/dev/ic/rtwn.c
index a98a37bbb59..0753126368b 100644
--- a/sys/dev/ic/rtwn.c
+++ b/sys/dev/ic/rtwn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtwn.c,v 1.1 2016/03/09 18:18:28 stsp Exp $ */
+/* $OpenBSD: rtwn.c,v 1.2 2016/03/09 20:35:08 stsp Exp $ */
/*-
* Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -283,7 +283,7 @@ rtwn_activate(struct rtwn_softc *sc, int act)
struct ifnet *ifp = &sc->sc_ic.ic_if;
switch (act) {
- case DVACT_SUSPEND:
+ case DVACT_QUIESCE: /* rtwn_stop() may sleep */
if (ifp->if_flags & IFF_RUNNING)
rtwn_stop(ifp);
break;