diff options
| author |   mikeb <mikeb@openbsd.org> | 2016-12-07 18:33:45 +0000 |
|---|---|---|
| committer | mikeb <mikeb@openbsd.org> | 2016-12-07 18:33:45 +0000 |
| commit | 38e866ffacfcea19390cb726b42961a10e7564e2 (patch) | |
| tree | a488f7fcebade52fee33e224c622375dd30e14ec | |
| parent | Write SSL_copy_session_id(3) manual from scratch. This function is (diff) | |
| download | wireguard-openbsd-38e866ffacfcea19390cb726b42961a10e7564e2.tar.xz wireguard-openbsd-38e866ffacfcea19390cb726b42961a10e7564e2.zip | |
splbio isn't doing us any good here and prevents polling from working
| -rw-r--r-- | sys/dev/pv/xbf.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sys/dev/pv/xbf.c b/sys/dev/pv/xbf.c index 4a086480a92..b5229de38a4 100644 --- a/sys/dev/pv/xbf.c +++ b/sys/dev/pv/xbf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xbf.c,v 1.1 2016/12/07 15:26:43 mikeb Exp $ */ +/* $OpenBSD: xbf.c,v 1.2 2016/12/07 18:33:45 mikeb Exp $ */ /* * Copyright (c) 2016 Mike Belopuhov @@ -348,7 +348,7 @@ void xbf_scsi_cmd(struct scsi_xfer *xs) { struct xbf_softc *sc = xs->sc_link->adapter_softc; - int desc, s; + int desc; switch (xs->cmd->opcode) { case READ_BIG: @@ -394,26 +394,19 @@ xbf_scsi_cmd(struct scsi_xfer *xs) return; } - s = splbio(); desc = xbf_submit_cmd(xs); if (desc < 0) { - splx(s); xbf_scsi_done(xs, XS_DRIVER_STUFFUP); return; } - - if (!ISSET(xs->flags, SCSI_POLL)) { - splx(s); + if (!ISSET(xs->flags, SCSI_POLL)) return; - } if (xbf_poll_cmd(xs, desc, 1000)) { - splx(s); - printf("%s: desc %u timed out\n", sc->sc_dev.dv_xname, desc); + DPRINTF("%s: desc %u timed out\n", sc->sc_dev.dv_xname, desc); xbf_scsi_done(xs, XS_TIMEOUT); return; } - splx(s); } int |