diff options
| author | Chad Dupuis <chad.dupuis@cavium.com> | 2018-04-25 06:08:59 -0700 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2018-05-08 00:57:10 -0400 |
| commit | 65b7beca42a34b965602db4a1c06aa344cd62bc8 (patch) | |
| tree | bcc6ec0c7f0d1dc6f782b2a875df6d2b5b99acb9 /drivers/scsi/qedf | |
| parent | 4b9b7fabb39b3e9d7682d1bdff0521982fe80fbd (diff) | |
| download | talos-op-linux-65b7beca42a34b965602db4a1c06aa344cd62bc8.tar.gz talos-op-linux-65b7beca42a34b965602db4a1c06aa344cd62bc8.zip | |
scsi: qedf: Honor default_prio module parameter even if DCBX does not converge
Signed-off-by: Chad Dupuis <chad.dupuis@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/qedf')
| -rw-r--r-- | drivers/scsi/qedf/qedf_main.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c index 3f4243f42821..777ab14d2998 100644 --- a/drivers/scsi/qedf/qedf_main.c +++ b/drivers/scsi/qedf/qedf_main.c @@ -3011,7 +3011,14 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) INIT_DELAYED_WORK(&qedf->grcdump_work, qedf_wq_grcdump); qedf->fipvlan_retries = qedf_fipvlan_retries; /* Set a default prio in case DCBX doesn't converge */ - qedf->prio = QEDF_DEFAULT_PRIO; + if (qedf_default_prio > -1) { + /* + * This is the case where we pass a modparam in so we want to + * honor it even if dcbx doesn't converge. + */ + qedf->prio = qedf_default_prio; + } else + qedf->prio = QEDF_DEFAULT_PRIO; /* * Common probe. Takes care of basic hardware init and pci_* |
