[SCSI] bfa: use standards defined timeout for ELS/CT

Use standards defined 2 * RA_TOV as a timeout for ELS Request retries.
And standards defined 3 * RA_TOV as a timeout for FC-CT Request retries.
Also, added a check to send RPSC2 to a Brocade Fabric only.

Signed-off-by: Jing Huang <huangj@brocade.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/scsi/bfa/ns.c b/drivers/scsi/bfa/ns.c
index 2d6d2d6ff8dc..ae0edcc86ed5 100644
--- a/drivers/scsi/bfa/ns.c
+++ b/drivers/scsi/bfa/ns.c
@@ -664,7 +664,7 @@ bfa_fcs_port_ns_send_plogi(void *ns_cbarg, struct bfa_fcxp_s *fcxp_alloced)
 
         bfa_fcxp_send(fcxp, NULL, port->fabric->vf_id, port->lp_tag, BFA_FALSE,
                       FC_CLASS_3, len, &fchs, bfa_fcs_port_ns_plogi_response,
-                      (void *)ns, FC_MAX_PDUSZ, FC_RA_TOV);
+                      (void *)ns, FC_MAX_PDUSZ, FC_ELS_TOV);
         port->stats.ns_plogi_sent++;
 
         bfa_sm_send_event(ns, NSSM_EVENT_PLOGI_SENT);
@@ -791,7 +791,7 @@ bfa_fcs_port_ns_send_rspn_id(void *ns_cbarg, struct bfa_fcxp_s *fcxp_alloced)
 
         bfa_fcxp_send(fcxp, NULL, port->fabric->vf_id, port->lp_tag, BFA_FALSE,
                       FC_CLASS_3, len, &fchs, bfa_fcs_port_ns_rspn_id_response,
-                      (void *)ns, FC_MAX_PDUSZ, FC_RA_TOV);
+                      (void *)ns, FC_MAX_PDUSZ, FC_FCCT_TOV);
 
         port->stats.ns_rspnid_sent++;
 
@@ -865,7 +865,7 @@ bfa_fcs_port_ns_send_rft_id(void *ns_cbarg, struct bfa_fcxp_s *fcxp_alloced)
 
         bfa_fcxp_send(fcxp, NULL, port->fabric->vf_id, port->lp_tag, BFA_FALSE,
                       FC_CLASS_3, len, &fchs, bfa_fcs_port_ns_rft_id_response,
-                      (void *)ns, FC_MAX_PDUSZ, FC_RA_TOV);
+                      (void *)ns, FC_MAX_PDUSZ, FC_FCCT_TOV);
 
         port->stats.ns_rftid_sent++;
         bfa_sm_send_event(ns, NSSM_EVENT_RFTID_SENT);
@@ -943,7 +943,7 @@ bfa_fcs_port_ns_send_rff_id(void *ns_cbarg, struct bfa_fcxp_s *fcxp_alloced)
 
         bfa_fcxp_send(fcxp, NULL, port->fabric->vf_id, port->lp_tag, BFA_FALSE,
                       FC_CLASS_3, len, &fchs, bfa_fcs_port_ns_rff_id_response,
-                      (void *)ns, FC_MAX_PDUSZ, FC_RA_TOV);
+                      (void *)ns, FC_MAX_PDUSZ, FC_FCCT_TOV);
 
         port->stats.ns_rffid_sent++;
         bfa_sm_send_event(ns, NSSM_EVENT_RFFID_SENT);
@@ -1029,7 +1029,7 @@ bfa_fcs_port_ns_send_gid_ft(void *ns_cbarg, struct bfa_fcxp_s *fcxp_alloced)
         bfa_fcxp_send(fcxp, NULL, port->fabric->vf_id, port->lp_tag, BFA_FALSE,
                       FC_CLASS_3, len, &fchs, bfa_fcs_port_ns_gid_ft_response,
                       (void *)ns, bfa_fcxp_get_maxrsp(port->fcs->bfa),
-                      FC_RA_TOV);
+                      FC_FCCT_TOV);
 
         port->stats.ns_gidft_sent++;