[SCSI] bfa: Observed auto D-port mode instead of manual

Observed Auto mode in the HBA side while doing manual D-Port test on the
switch side. Mode is not passed to BFA from firmware when the test is
triggered by switch side. BFA just blindly using Auto mode.

Signed-off-by: Vijaya Mohan Guvva <vmohan@brocade.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/bfa/bfa_svc.c b/drivers/scsi/bfa/bfa_svc.c
index 6c41e57fd752..625225f31081 100644
--- a/drivers/scsi/bfa/bfa_svc.c
+++ b/drivers/scsi/bfa/bfa_svc.c
@@ -6758,7 +6758,7 @@ bfa_dport_scn(struct bfa_dport_s *dport, struct bfi_diag_dport_scn_s *msg)
                 dport->rp_pwwn = msg->info.teststart.pwwn;
                 dport->rp_nwwn = msg->info.teststart.nwwn;
                 dport->lpcnt = cpu_to_be32(msg->info.teststart.numfrm);
-                bfa_dport_result_start(dport, BFA_DPORT_OPMODE_AUTO);
+                bfa_dport_result_start(dport, msg->info.teststart.mode);
                 break;
 
         case BFI_DPORT_SCN_SUBTESTSTART:
diff --git a/drivers/scsi/bfa/bfi.h b/drivers/scsi/bfa/bfi.h
index bf05cc831cbc..9ef91f907dec 100644
--- a/drivers/scsi/bfa/bfi.h
+++ b/drivers/scsi/bfa/bfi.h
@@ -1144,7 +1144,8 @@ struct bfi_diag_dport_scn_teststart_s {
         wwn_t   pwwn;   /* switch port wwn. 8 bytes */
         wwn_t   nwwn;   /* switch node wwn. 8 bytes */
         u8      type;   /* bfa_diag_dport_test_type_e */
-        u8      rsvd[3];
+        u8      mode;   /* bfa_diag_dport_test_opmode */
+        u8      rsvd[2];
         u32     numfrm; /* from switch uint in 1M */
 };