scsi: libfc: use configured rport E_D_TOV
authorHannes Reinecke <hare@suse.de>
Thu, 13 Oct 2016 13:10:40 +0000 (15:10 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 8 Nov 2016 22:29:51 +0000 (17:29 -0500)
If fc_rport_error_retry() is attempting to retry the remote
port state we should be waiting for the configured e_d_tov
value rather than the default.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Acked-by: Johannes Thumshirn <jth@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/libfc/fc_rport.c

index bcd1cd3c52855c3d3e5439e19855640de13a6767..bb7e9d9a31790fee8de85c1ba6fa61fdbad638ba 100644 (file)
@@ -662,7 +662,7 @@ static void fc_rport_error(struct fc_rport_priv *rdata, struct fc_frame *fp)
 static void fc_rport_error_retry(struct fc_rport_priv *rdata,
                                 struct fc_frame *fp)
 {
-       unsigned long delay = msecs_to_jiffies(FC_DEF_E_D_TOV);
+       unsigned long delay = msecs_to_jiffies(rdata->e_d_tov);
        struct fc_lport *lport = rdata->local_port;
 
        /* make sure this isn't an FC_EX_CLOSED error, never retry those */