diff options
| author | <andrew.vasquez@qlogic.com> | 2005-04-17 15:06:53 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic> | 2005-04-18 13:47:46 -0500 |
| commit | bdf796210e01145fd77bbb3ae644d04f982b6c3b (patch) | |
| tree | 92253748a63c51e76a70384d35119e107077b050 /drivers/scsi/qla2xxx/qla_mbx.c | |
| parent | 8482e118afa0cb4321ab3d30b1100d27d63130c0 (diff) | |
[PATCH] qla2xxx: remove lun discovery codes...
Remove internal lun discovery routines and support
structures.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_mbx.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_mbx.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index c04fbcd7523..15f6acaca30 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -858,8 +858,7 @@ qla2x00_abort_command(scsi_qla_host_t *ha, srb_t *sp) DEBUG11(printk("qla2x00_abort_command(%ld): entered.\n", ha->host_no);) - fcport = sp->fclun->fcport; - + fcport = sp->fcport; if (atomic_read(&ha->loop_state) == LOOP_DOWN || atomic_read(&fcport->state) == FCS_DEVICE_LOST) { return 1; @@ -884,7 +883,7 @@ qla2x00_abort_command(scsi_qla_host_t *ha, srb_t *sp) mcp->mb[1] = fcport->loop_id << 8; mcp->mb[2] = (uint16_t)handle; mcp->mb[3] = (uint16_t)(handle >> 16); - mcp->mb[6] = (uint16_t)sp->fclun->lun; + mcp->mb[6] = (uint16_t)sp->cmd->device->lun; mcp->out_mb = MBX_6|MBX_3|MBX_2|MBX_1|MBX_0; mcp->in_mb = MBX_0; mcp->tov = 30; @@ -980,30 +979,22 @@ qla2x00_abort_target(fc_port_t *fcport) * Kernel context. */ int -qla2x00_target_reset(scsi_qla_host_t *ha, uint16_t b, uint16_t t) +qla2x00_target_reset(scsi_qla_host_t *ha, struct fc_port *fcport) { int rval; mbx_cmd_t mc; mbx_cmd_t *mcp = &mc; - os_tgt_t *tgt; DEBUG11(printk("qla2x00_target_reset(%ld): entered.\n", ha->host_no);) - tgt = TGT_Q(ha, t); - if (tgt->fcport == NULL) { - /* no target to abort */ - return 0; - } - if (atomic_read(&tgt->fcport->state) != FCS_ONLINE) { - /* target not online */ + if (atomic_read(&fcport->state) != FCS_ONLINE) return 0; - } mcp->mb[0] = MBC_TARGET_RESET; if (HAS_EXTENDED_IDS(ha)) - mcp->mb[1] = tgt->fcport->loop_id; + mcp->mb[1] = fcport->loop_id; else - mcp->mb[1] = tgt->fcport->loop_id << 8; + mcp->mb[1] = fcport->loop_id << 8; mcp->mb[2] = ha->loop_reset_delay; mcp->out_mb = MBX_2|MBX_1|MBX_0; mcp->in_mb = MBX_0; |