scsi: qla2xxx: Fix FCP-SCSI FC4 flag passing error

This patch fixes issue where incorrect flag was used for sending
switch commands.

Link: https://lore.kernel.org/r/20200226224022.24518-5-hmadhani@marvell.com
Fixes: e8c72ba51a15 ("[SCSI] qla2xxx: Use GFF_ID to check FCP-SCSI FC4 type before logging into Nx_Ports")
Fixes: a4239945b8ad ("scsi: qla2xxx: Add switch command to simplify fabric discovery")
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 5af49a7ddb22b388726e4f7ea6667af430ba9377..42c3ad27f1cbcdbbabfe12e55beda01a6ea087b7 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -2733,7 +2733,7 @@ qla2x00_gff_id(scsi_qla_host_t *vha, sw_info_t *list)
        for (i = 0; i < ha->max_fibre_devices; i++) {
                /* Set default FC4 Type as UNKNOWN so the default is to
                 * Process this port */
-               list[i].fc4_type = FC4_TYPE_UNKNOWN;
+               list[i].fc4_type = 0;
 
                /* Do not attempt GFF_ID if we are not FWI_2 capable */
                if (!IS_FWI2_CAPABLE(ha))
@@ -3083,7 +3083,7 @@ void qla24xx_handle_gpnid_event(scsi_qla_host_t *vha, struct event_arg *ea)
                            "%s %d %8phC post new sess\n",
                            __func__, __LINE__, ea->port_name);
                        qla24xx_post_newsess_work(vha, &ea->id,
-                           ea->port_name, NULL, NULL, FC4_TYPE_UNKNOWN);
+                           ea->port_name, NULL, NULL, 0);
                }
        }
 }

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index b7d65c099debbf8ab7f11b3b2bcb1b6cfdbe907c..23a9617fe035eb1f873d912ce35eb20a486a494d 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1043,7 +1043,7 @@ static void qla24xx_async_gnl_sp_done(srb_t *sp, int res)
                            __func__, __LINE__, (u8 *)&wwn, id.b24);
                        wwnn = wwn_to_u64(e->node_name);
                        qla24xx_post_newsess_work(vha, &id, (u8 *)&wwn,
-                           (u8 *)&wwnn, NULL, FC4_TYPE_UNKNOWN);
+                           (u8 *)&wwnn, NULL, 0);
                }
        }
 
@@ -5828,7 +5828,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)
                /* Bypass ports whose FCP-4 type is not FCP_SCSI */
                if (ql2xgffidenable &&
                    (!(new_fcport->fc4_type & FS_FC4TYPE_FCP) &&
-                   new_fcport->fc4_type != FC4_TYPE_UNKNOWN))
+                   new_fcport->fc4_type != 0))
                        continue;
 
                spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags);

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index d0dbddcef70fe8dd74d4a09fbd420a8d9f525088..622e7337affc46518ade5581005954c6150f3c6a 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -4739,11 +4739,11 @@ static int qlt_handle_login(struct scsi_qla_host *vha,
                        qla24xx_post_newsess_work(vha, &port_id,
                            iocb->u.isp24.port_name,
                            iocb->u.isp24.u.plogi.node_name,
-                           pla, FC4_TYPE_UNKNOWN);
+                           pla, 0);
                else
                        qla24xx_post_newsess_work(vha, &port_id,
                            iocb->u.isp24.port_name, NULL,
-                           pla, FC4_TYPE_UNKNOWN);
+                           pla, 0);
 
                goto out;
        }