diff options
| author | Justin T. Gibbs <gibbs@FreeBSD.org> | 1998-10-15 23:17:58 +0000 |
|---|---|---|
| committer | Justin T. Gibbs <gibbs@FreeBSD.org> | 1998-10-15 23:17:58 +0000 |
| commit | 0a42741c4a960bb4b6221028c31d109a319eed6d (patch) | |
| tree | 12619f19e076851803a097b4fbada21db6a71fb0 /sys/dev/buslogic | |
| parent | bb1f2fe47f8248f26e0cf4758179842440b1a009 (diff) | |
Notes
Diffstat (limited to 'sys/dev/buslogic')
| -rw-r--r-- | sys/dev/buslogic/bt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c index 0087453dddef..ad34914d20fd 100644 --- a/sys/dev/buslogic/bt.c +++ b/sys/dev/buslogic/bt.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bt.c,v 1.4 1998/09/20 05:08:15 gibbs Exp $ + * $Id: bt.c,v 1.5 1998/10/09 21:38:34 gibbs Exp $ */ /* @@ -1013,7 +1013,8 @@ btaction(struct cam_sim *sim, union ccb *ccb) return; } hccb->sense_len = csio->sense_len; - if ((ccbh->flags & CAM_TAG_ACTION_VALID) != 0) { + if ((ccbh->flags & CAM_TAG_ACTION_VALID) != 0 + && ccb->csio.tag_action != CAM_TAG_ACTION_NONE) { hccb->tag_enable = TRUE; hccb->tag_type = (ccb->csio.tag_action & 0x3); } else { @@ -2119,7 +2120,7 @@ bttimeout(void *arg) if ((bccb->flags & BCCB_DEVICE_RESET) != 0 || bt->cur_outbox->action_code != BMBO_FREE - || ((ccb->ccb_h.flags & CAM_TAG_ACTION_VALID) != 0 + || ((bccb->hccb.tag_enable == TRUE) && (bt->firmware_ver[0] < '5'))) { /* * Try a full host adapter/SCSI bus reset. |