diff options
| author | mjacob <mjacob@cvs.openbsd.org> | 2003-03-03 18:35:00 +0000 |
|---|---|---|
| committer | mjacob <mjacob@cvs.openbsd.org> | 2003-03-03 18:35:00 +0000 |
| commit | 4156778f04c7e430ccdff24ac4c0bbce42653105 (patch) | |
| tree | b0c4fda9b060947d40ef3598e3348d7a972b0fe6 /sys/dev/ic | |
| parent | 4c46949a408d12b8aa66ea3c4325343501fa5b59 (diff) | |
In isp_putback_atio, propagate iid && rxid for FC ATIOs.
LINT fixes for printing out the lun for recevied messages.
Spelling fix.
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/isp_target.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/dev/ic/isp_target.c b/sys/dev/ic/isp_target.c index 91050761a6f..a1e8229fb7a 100644 --- a/sys/dev/ic/isp_target.c +++ b/sys/dev/ic/isp_target.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isp_target.c,v 1.9 2002/08/17 17:42:54 mjacob Exp $ */ +/* $OpenBSD: isp_target.c,v 1.10 2003/03/03 18:34:59 mjacob Exp $ */ /* * Machine and OS Independent Target Mode Code for the Qlogic SCSI/FC adapters. * @@ -386,6 +386,8 @@ isp_target_put_atio(struct ispsoftc *isp, void *arg) } else { atun._atio2.at_lun = (u_int8_t) aep->at_lun; } + atun._atio2.at_iid = aep->at_iid; + atun._atio2.at_rxid = aep->at_rxid; atun._atio2.at_status = CT_OK; } else { at_entry_t *aep = arg; @@ -611,28 +613,28 @@ isp_got_msg_fc(struct ispsoftc *isp, int bus, in_fcentry_t *inp) if (inp->in_task_flags & TASK_FLAGS_ABORT_TASK) { isp_prt(isp, ISP_LOGINFO, f1, "ABORT TASK", - inp->in_iid, msg.nt_lun, inp->in_seqid); + inp->in_iid, lun, inp->in_seqid); msg.nt_msg[0] = MSG_ABORT_TAG; } else if (inp->in_task_flags & TASK_FLAGS_CLEAR_TASK_SET) { isp_prt(isp, ISP_LOGINFO, f1, "CLEAR TASK SET", - inp->in_iid, msg.nt_lun, inp->in_seqid); + inp->in_iid, lun, inp->in_seqid); msg.nt_msg[0] = MSG_CLEAR_QUEUE; } else if (inp->in_task_flags & TASK_FLAGS_TARGET_RESET) { isp_prt(isp, ISP_LOGINFO, f1, "TARGET RESET", - inp->in_iid, msg.nt_lun, inp->in_seqid); + inp->in_iid, lun, inp->in_seqid); msg.nt_msg[0] = MSG_BUS_DEV_RESET; } else if (inp->in_task_flags & TASK_FLAGS_CLEAR_ACA) { isp_prt(isp, ISP_LOGINFO, f1, "CLEAR ACA", - inp->in_iid, msg.nt_lun, inp->in_seqid); + inp->in_iid, lun, inp->in_seqid); /* ???? */ msg.nt_msg[0] = MSG_REL_RECOVERY; } else if (inp->in_task_flags & TASK_FLAGS_TERMINATE_TASK) { isp_prt(isp, ISP_LOGINFO, f1, "TERMINATE TASK", - inp->in_iid, msg.nt_lun, inp->in_seqid); + inp->in_iid, lun, inp->in_seqid); msg.nt_msg[0] = MSG_TERM_IO_PROC; } else { isp_prt(isp, ISP_LOGWARN, f2, "task flag", - inp->in_status, msg.nt_lun, inp->in_iid, + inp->in_status, lun, inp->in_iid, inp->in_task_flags, inp->in_seqid); } if (msg.nt_msg[0]) { @@ -763,7 +765,7 @@ isp_handle_atio(struct ispsoftc *isp, at_entry_t *aep) case AT_RESET: /* - * A bus reset came along an blew away this command. Why + * A bus reset came along and blew away this command. Why * they do this in addition the async event code stuff, * I dunno. * |