diff options
| author |   krw <krw@openbsd.org> | 2019-08-20 22:31:28 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2019-08-20 22:31:28 +0000 |
| commit | cc5e21de1cd2eafce04c281739eff6688408d9bc (patch) | |
| tree | bc6f0e612353d37ad8d54f0d69f0a0968565da21 | |
| parent | Enable ipmi(4). (diff) | |
| download | wireguard-openbsd-cc5e21de1cd2eafce04c281739eff6688408d9bc.tar.xz wireguard-openbsd-cc5e21de1cd2eafce04c281739eff6688408d9bc.zip | |
Use the defines DETACH_FORCE and DETACH_QUIET when constructing a value
that will end up in config_detach() flags via scsi_detach_target().
ok jmatthew@ dlg@
| -rw-r--r-- | sys/dev/ic/qla.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/qle.c | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/dev/ic/qla.c b/sys/dev/ic/qla.c index 53c6e9e8226..9ab8a2f4603 100644 --- a/sys/dev/ic/qla.c +++ b/sys/dev/ic/qla.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qla.c,v 1.56 2017/06/05 04:57:37 dlg Exp $ */ +/* $OpenBSD: qla.c,v 1.57 2019/08/20 22:31:28 krw Exp $ */ /* * Copyright (c) 2011 David Gwynne <dlg@openbsd.org> @@ -1776,7 +1776,8 @@ qla_do_update(void *xsc) TAILQ_REMOVE(&detach, port, ports); if (port->flags & QLA_PORT_FLAG_IS_TARGET) { scsi_detach_target(sc->sc_scsibus, - port->loopid, -1); + port->loopid, DETACH_FORCE | + DETACH_QUIET); } sc->sc_targets[port->loopid] = NULL; if (port->location & QLA_LOCATION_FABRIC) @@ -1992,7 +1993,8 @@ qla_do_update(void *xsc) DEVNAME(sc), port->loopid); if (sc->sc_scsibus != NULL) scsi_detach_target(sc->sc_scsibus, - port->loopid, -1); + port->loopid, DETACH_FORCE | + DETACH_QUIET); if (port->location & QLA_LOCATION_FABRIC) qla_fabric_plogo(sc, port); diff --git a/sys/dev/pci/qle.c b/sys/dev/pci/qle.c index aa3fd624327..561673fe271 100644 --- a/sys/dev/pci/qle.c +++ b/sys/dev/pci/qle.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qle.c,v 1.45 2018/07/30 07:34:37 jmatthew Exp $ */ +/* $OpenBSD: qle.c,v 1.46 2019/08/20 22:31:28 krw Exp $ */ /* * Copyright (c) 2013, 2014 Jonathan Matthew <jmatthew@openbsd.org> @@ -2138,7 +2138,8 @@ qle_do_update(void *xsc) TAILQ_REMOVE(&detach, port, ports); if (port->flags & QLE_PORT_FLAG_IS_TARGET) { scsi_detach_target(sc->sc_scsibus, - port->loopid, -1); + port->loopid, DETACH_FORCE | + DETACH_QUIET); sc->sc_targets[port->loopid] = NULL; } if (port->location & QLE_LOCATION_FABRIC) @@ -2367,7 +2368,8 @@ qle_do_update(void *xsc) DEVNAME(sc), port->portid); if (sc->sc_scsibus != NULL) scsi_detach_target(sc->sc_scsibus, - port->loopid, -1); + port->loopid, DETACH_FORCE | + DETACH_QUIET); if (port->location & QLE_LOCATION_FABRIC) qle_fabric_plogo(sc, port); |