summaryrefslogtreecommitdiff
path: root/drivers/scsi/qedf
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2019-10-10 04:54:04 +0300
committerMartin K. Petersen <martin.petersen@oracle.com>2019-10-10 04:54:04 +0300
commita3a8d13f625d9f20664515d61d4c9a9452119d21 (patch)
tree8d3bd45b741f10980c141cc35c06143a82e8ea18 /drivers/scsi/qedf
parent27f722ccbe1563629275bb7ee30c0e307f5837a2 (diff)
parentb23f330d5145b92f90cf16f1adc5444ad06764b4 (diff)
downloadlinux-a3a8d13f625d9f20664515d61d4c9a9452119d21.tar.xz
Merge branch '5.4/scsi-fixes' into 5.5/scsi-queue
The qla2xxx driver updates for 5.5 depend on the fixes queued for 5.4. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/qedf')
-rw-r--r--drivers/scsi/qedf/qedf_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index eeea9c03931a..604856e72cfb 100644
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -596,7 +596,7 @@ static void qedf_dcbx_handler(void *dev, struct qed_dcbx_get *get, u32 mib_type)
tmp_prio = get->operational.app_prio.fcoe;
if (qedf_default_prio > -1)
qedf->prio = qedf_default_prio;
- else if (tmp_prio < 0 || tmp_prio > 7) {
+ else if (tmp_prio > 7) {
QEDF_INFO(&(qedf->dbg_ctx), QEDF_LOG_DISC,
"FIP/FCoE prio %d out of range, setting to %d.\n",
tmp_prio, QEDF_DEFAULT_PRIO);