diff options
-rw-r--r-- | drivers/scsi/qla2xxx/qla_gbl.h | 1 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 3 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 9 |
3 files changed, 4 insertions, 9 deletions
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index 0c1ec14f3072..35266bd5d538 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h | |||
@@ -51,6 +51,7 @@ extern void qla2x00_update_fcports(scsi_qla_host_t *); | |||
51 | 51 | ||
52 | extern int qla2x00_abort_isp(scsi_qla_host_t *); | 52 | extern int qla2x00_abort_isp(scsi_qla_host_t *); |
53 | 53 | ||
54 | extern void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *); | ||
54 | extern void qla2x00_reg_remote_port(scsi_qla_host_t *, fc_port_t *); | 55 | extern void qla2x00_reg_remote_port(scsi_qla_host_t *, fc_port_t *); |
55 | 56 | ||
56 | /* | 57 | /* |
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 4c7caece4ca7..16c889261d94 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
@@ -32,7 +32,6 @@ static int qla2x00_fw_ready(scsi_qla_host_t *); | |||
32 | static int qla2x00_configure_hba(scsi_qla_host_t *); | 32 | static int qla2x00_configure_hba(scsi_qla_host_t *); |
33 | static int qla2x00_configure_loop(scsi_qla_host_t *); | 33 | static int qla2x00_configure_loop(scsi_qla_host_t *); |
34 | static int qla2x00_configure_local_loop(scsi_qla_host_t *); | 34 | static int qla2x00_configure_local_loop(scsi_qla_host_t *); |
35 | static void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *); | ||
36 | static int qla2x00_configure_fabric(scsi_qla_host_t *); | 35 | static int qla2x00_configure_fabric(scsi_qla_host_t *); |
37 | static int qla2x00_find_all_fabric_devs(scsi_qla_host_t *, struct list_head *); | 36 | static int qla2x00_find_all_fabric_devs(scsi_qla_host_t *, struct list_head *); |
38 | static int qla2x00_device_resync(scsi_qla_host_t *); | 37 | static int qla2x00_device_resync(scsi_qla_host_t *); |
@@ -2039,7 +2038,7 @@ qla2x00_probe_for_all_luns(scsi_qla_host_t *ha) | |||
2039 | * Context: | 2038 | * Context: |
2040 | * Kernel context. | 2039 | * Kernel context. |
2041 | */ | 2040 | */ |
2042 | static void | 2041 | void |
2043 | qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) | 2042 | qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport) |
2044 | { | 2043 | { |
2045 | uint16_t index; | 2044 | uint16_t index; |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 089e0f500363..5866a7c706a8 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -2250,13 +2250,8 @@ qla2x00_do_dpc(void *data) | |||
2250 | DEBUG(printk("scsi(%ld): port login OK: logged in ID 0x%x\n", | 2250 | DEBUG(printk("scsi(%ld): port login OK: logged in ID 0x%x\n", |
2251 | ha->host_no, fcport->loop_id)); | 2251 | ha->host_no, fcport->loop_id)); |
2252 | 2252 | ||
2253 | fcport->port_login_retry_count = | 2253 | qla2x00_update_fcport(ha, |
2254 | ha->port_down_retry_count * PORT_RETRY_TIME; | 2254 | fcport); |
2255 | atomic_set(&fcport->state, FCS_ONLINE); | ||
2256 | atomic_set(&fcport->port_down_timer, | ||
2257 | ha->port_down_retry_count * PORT_RETRY_TIME); | ||
2258 | |||
2259 | fcport->login_retry = 0; | ||
2260 | } else if (status == 1) { | 2255 | } else if (status == 1) { |
2261 | set_bit(RELOGIN_NEEDED, &ha->dpc_flags); | 2256 | set_bit(RELOGIN_NEEDED, &ha->dpc_flags); |
2262 | /* retry the login again */ | 2257 | /* retry the login again */ |