From c44c9cef531b412bc0e19513cee04c216add9976 Mon Sep 17 00:00:00 2001 From: "andrew.vasquez@qlogic.com" Date: Fri, 20 Jan 2006 14:53:25 -0800 Subject: [PATCH] --- yaml --- r: 19115 b: refs/heads/master c: 77427f514f88143bfef41ba8c1e624bc45f42297 h: refs/heads/master i: 19113: 01ba41d1f87d04c9818dcc975e8a5c164d526e6b 19111: 3f17165cef7c32f70ad5e9d84b38a10d02360f27 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_init.c | 26 -------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/[refs] b/[refs] index c780bca2980b..1085763530a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 052c40c83b4ca37be226112049b60097cb9961e1 +refs/heads/master: 77427f514f88143bfef41ba8c1e624bc45f42297 diff --git a/trunk/drivers/scsi/qla2xxx/qla_init.c b/trunk/drivers/scsi/qla2xxx/qla_init.c index 16c889261d94..e67bb0997818 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_init.c +++ b/trunk/drivers/scsi/qla2xxx/qla_init.c @@ -2041,10 +2041,6 @@ qla2x00_probe_for_all_luns(scsi_qla_host_t *ha) void qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) { - uint16_t index; - unsigned long flags; - srb_t *sp; - fcport->ha = ha; fcport->login_retry = 0; fcport->port_login_retry_count = ha->port_down_retry_count * @@ -2053,28 +2049,6 @@ qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) PORT_RETRY_TIME); fcport->flags &= ~FCF_LOGIN_NEEDED; - /* - * Check for outstanding cmd on tape Bypass LUN discovery if active - * command on tape. - */ - if (fcport->flags & FCF_TAPE_PRESENT) { - spin_lock_irqsave(&ha->hardware_lock, flags); - for (index = 1; index < MAX_OUTSTANDING_COMMANDS; index++) { - fc_port_t *sfcp; - - if ((sp = ha->outstanding_cmds[index]) != 0) { - sfcp = sp->fcport; - if (sfcp == fcport) { - atomic_set(&fcport->state, FCS_ONLINE); - spin_unlock_irqrestore( - &ha->hardware_lock, flags); - return; - } - } - } - spin_unlock_irqrestore(&ha->hardware_lock, flags); - } - if (fcport->port_type == FCT_INITIATOR || fcport->port_type == FCT_BROADCAST) fcport->device_type = TYPE_PROCESSOR;