mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-17 10:41:26 +00:00
qla2x00t-32gbit: don't use zero for FC4_PRIORITY_NVME
Avoid an uninitialized value (0) for ha->fc4_type_priority being falsely interpreted as NVMe priority. Not strictly needed any more after the previous patch, but makes the fc4_type_priority handling more explicit. Link: https://lore.kernel.org/r/20191107224839.32417-3-martin.wilck@suse.com Tested-by: David Bond <dbond@suse.com> Acked-by: Himanshu Madhani <hmadhani@marvell.com> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Martin Wilck <mwilck@suse.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> [ commit a10c8803d0dbab54370eeac2a07e6540c6215908 upstream ] git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8721 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
@@ -2507,8 +2507,10 @@ typedef struct fc_port {
|
||||
u16 n2n_chip_reset;
|
||||
} fc_port_t;
|
||||
|
||||
#define FC4_PRIORITY_NVME 0
|
||||
#define FC4_PRIORITY_FCP 1
|
||||
enum {
|
||||
FC4_PRIORITY_NVME = 1,
|
||||
FC4_PRIORITY_FCP = 2,
|
||||
};
|
||||
|
||||
#define QLA_FCPORT_SCAN 1
|
||||
#define QLA_FCPORT_FOUND 2
|
||||
|
||||
@@ -325,5 +325,5 @@ qla2xxx_get_fc4_priority(struct scsi_qla_host *vha)
|
||||
((uint8_t *)vha->hw->nvram)[NVRAM_DUAL_FCP_NVME_FLAG_OFFSET];
|
||||
|
||||
|
||||
return ((data >> 6) & BIT_0);
|
||||
return (data >> 6) & BIT_0 ? FC4_PRIORITY_FCP : FC4_PRIORITY_NVME;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user