qla2xxx: Seed init-cb login timeout from nvram exclusively.

Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Joe Carnuccio 2016-01-27 12:03:29 -05:00 committed by Martin K. Petersen
parent 0a583e4531
commit 9f8d3d5bc5

View File

@ -2844,7 +2844,6 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)
if (nv->login_timeout < 4) if (nv->login_timeout < 4)
nv->login_timeout = 4; nv->login_timeout = 4;
ha->login_timeout = nv->login_timeout; ha->login_timeout = nv->login_timeout;
icb->login_timeout = nv->login_timeout;
/* Set minimum RATOV to 100 tenths of a second. */ /* Set minimum RATOV to 100 tenths of a second. */
ha->r_a_tov = 100; ha->r_a_tov = 100;
@ -5274,7 +5273,6 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
if (le16_to_cpu(nv->login_timeout) < 4) if (le16_to_cpu(nv->login_timeout) < 4)
nv->login_timeout = cpu_to_le16(4); nv->login_timeout = cpu_to_le16(4);
ha->login_timeout = le16_to_cpu(nv->login_timeout); ha->login_timeout = le16_to_cpu(nv->login_timeout);
icb->login_timeout = nv->login_timeout;
/* Set minimum RATOV to 100 tenths of a second. */ /* Set minimum RATOV to 100 tenths of a second. */
ha->r_a_tov = 100; ha->r_a_tov = 100;
@ -6231,7 +6229,6 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
if (le16_to_cpu(nv->login_timeout) < 4) if (le16_to_cpu(nv->login_timeout) < 4)
nv->login_timeout = cpu_to_le16(4); nv->login_timeout = cpu_to_le16(4);
ha->login_timeout = le16_to_cpu(nv->login_timeout); ha->login_timeout = le16_to_cpu(nv->login_timeout);
icb->login_timeout = nv->login_timeout;
/* Set minimum RATOV to 100 tenths of a second. */ /* Set minimum RATOV to 100 tenths of a second. */
ha->r_a_tov = 100; ha->r_a_tov = 100;