Skip to content

Commit

Permalink
scsi: qla2xxx: don't use zero for FC4_PRIORITY_NVME
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Martin Wilck authored and Martin K. Petersen committed Nov 9, 2019
1 parent f5a2b21 commit a10c880
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions drivers/scsi/qla2xxx/qla_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -2480,8 +2480,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
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/qla2xxx/qla_inline.h
Original file line number Diff line number Diff line change
Expand Up @@ -317,5 +317,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;
}

0 comments on commit a10c880

Please sign in to comment.