[SCSI] libfc fcoe: increase ELS and CT timeouts

The FC-LS spec. says ELS timeouts should be 2 x R_A_TOV.
The FC-GS spec. says CT timeouts should be 3 x R_A_TOV.

We've been using E_D_TOV for both of those.

Change for all ELS and CT requests except FLOGI, which we
leave at 2 seconds (using E_D_TOV).  One could argue that
R_A_TOV is locally determined until after FLOGI succeeds.

This does change FLOGI for vports which becomes FDISC.
This does not change the REC/SRR timeout which is 2 seconds.

Signed-off-by: Joe Eykholt <jeykholt@cisco.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c
index 7b790ad15a9..9b0a5192a96 100644
--- a/drivers/scsi/libfc/fc_disc.c
+++ b/drivers/scsi/libfc/fc_disc.c
@@ -370,7 +370,7 @@ static void fc_disc_gpn_ft_req(struct fc_disc *disc)
         if (lport->tt.elsct_send(lport, 0, fp,
                                  FC_NS_GPN_FT,
                                  fc_disc_gpn_ft_resp,
-                                 disc, lport->e_d_tov))
+                                 disc, 3 * lport->r_a_tov))
                 return;
 err:
         fc_disc_error(disc, NULL);
@@ -654,7 +654,8 @@ static int fc_disc_gpn_id_req(struct fc_lport *lport,
         if (!fp)
                 return -ENOMEM;
         if (!lport->tt.elsct_send(lport, rdata->ids.port_id, fp, FC_NS_GPN_ID,
-                                  fc_disc_gpn_id_resp, rdata, lport->e_d_tov))
+                                  fc_disc_gpn_id_resp, rdata,
+                                  3 * lport->r_a_tov))
                 return -ENOMEM;
         kref_get(&rdata->kref);
         return 0;