1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/scsi/bfa/rport_ftrs.c b/drivers/scsi/bfa/rport_ftrs.c
index ae7bba67ae2a..f2a9361ce9a4 100644
--- a/drivers/scsi/bfa/rport_ftrs.c
+++ b/drivers/scsi/bfa/rport_ftrs.c
@@ -73,6 +73,7 @@ static void
 bfa_fcs_rpf_sm_uninit(struct bfa_fcs_rpf_s *rpf, enum rpf_event event)
 {
         struct bfa_fcs_rport_s *rport = rpf->rport;
+        struct bfa_fcs_fabric_s *fabric = &rport->fcs->fabric;
 
         bfa_trc(rport->fcs, rport->pwwn);
         bfa_trc(rport->fcs, rport->pid);
@@ -80,12 +81,16 @@ bfa_fcs_rpf_sm_uninit(struct bfa_fcs_rpf_s *rpf, enum rpf_event event)
 
         switch (event) {
         case RPFSM_EVENT_RPORT_ONLINE:
-                if (!BFA_FCS_PID_IS_WKA(rport->pid)) {
+                /* Send RPSC2 to a Brocade fabric only. */
+                if ((!BFA_FCS_PID_IS_WKA(rport->pid)) &&
+                        ((bfa_lps_is_brcd_fabric(rport->port->fabric->lps)) ||
+                        (bfa_fcs_fabric_get_switch_oui(fabric) ==
+                                                BFA_FCS_BRCD_SWITCH_OUI))) {
                         bfa_sm_set_state(rpf, bfa_fcs_rpf_sm_rpsc_sending);
                         rpf->rpsc_retries = 0;
                         bfa_fcs_rpf_send_rpsc2(rpf, NULL);
-                        break;
-                };
+                }
+                break;
 
         case RPFSM_EVENT_RPORT_OFFLINE:
                 break;
@@ -269,6 +274,7 @@ void  bfa_fcs_rpf_rport_offline(struct bfa_fcs_rport_s *rport)
         if (__fcs_min_cfg(rport->port->fcs))
                 return;
 
+        rport->rpf.rpsc_speed = 0;
         bfa_sm_send_event(&rport->rpf, RPFSM_EVENT_RPORT_OFFLINE);
 }
 
@@ -307,7 +313,7 @@ bfa_fcs_rpf_send_rpsc2(void *rpf_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_rpf_rpsc2_response,
-                          rpf, FC_MAX_PDUSZ, FC_RA_TOV);
+                          rpf, FC_MAX_PDUSZ, FC_ELS_TOV);
         rport->stats.rpsc_sent++;
         bfa_sm_send_event(rpf, RPFSM_EVENT_FCXP_SENT);